diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java new file mode 100644 index 0000000..ce12696 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -0,0 +1,222 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPipeLineDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgPipeLineManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgPipeLine") +public class PgPipeLineRs { + + private static Logger logger = LoggerFactory.getLogger(PgPipeLineRs.class); + + private PgPipeLineManager pgPipeLineManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPipeLineManager(PgPipeLineManager pgPipeLineManager) { + this.pgPipeLineManager = pgPipeLineManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管线信息 + */ + @POST + @Path("getPipeLineByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String lineCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgPipeLineDto pgPipeLineDto=null; + try { + PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineCode(lineCode); + pgPipeLineDto=new PgPipeLineDto(pgPipeLine); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgPipeLineDto); + return resultMap; + } + + /** + * 新增管线 + */ + @POST + @Path("addPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPipeLine pgPipeLine=new PgPipeLine(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管线 + */ + @POST + @Path("editPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeLine(@FormParam("id") String id, + @FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgPipeLine pgPipeLine = pgPipeLineManager.get(id); + + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管线 + */ + @POST + @Path("deletePipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeLine(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPipeLine pgPipeLine=pgPipeLineManager.get(id); + if(pgPipeLine==null) { + msg = "不存在该管线信息"; + result="false"; + } + else + { + pgPipeLine.setActive(0); + pgPipeLineManager.save(pgPipeLine); + msg="管线删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管线删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java new file mode 100644 index 0000000..ce12696 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -0,0 +1,222 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPipeLineDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgPipeLineManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgPipeLine") +public class PgPipeLineRs { + + private static Logger logger = LoggerFactory.getLogger(PgPipeLineRs.class); + + private PgPipeLineManager pgPipeLineManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPipeLineManager(PgPipeLineManager pgPipeLineManager) { + this.pgPipeLineManager = pgPipeLineManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管线信息 + */ + @POST + @Path("getPipeLineByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String lineCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgPipeLineDto pgPipeLineDto=null; + try { + PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineCode(lineCode); + pgPipeLineDto=new PgPipeLineDto(pgPipeLine); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgPipeLineDto); + return resultMap; + } + + /** + * 新增管线 + */ + @POST + @Path("addPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPipeLine pgPipeLine=new PgPipeLine(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管线 + */ + @POST + @Path("editPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeLine(@FormParam("id") String id, + @FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgPipeLine pgPipeLine = pgPipeLineManager.get(id); + + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管线 + */ + @POST + @Path("deletePipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeLine(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPipeLine pgPipeLine=pgPipeLineManager.get(id); + if(pgPipeLine==null) { + msg = "不存在该管线信息"; + result="false"; + } + else + { + pgPipeLine.setActive(0); + pgPipeLineManager.save(pgPipeLine); + msg="管线删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管线删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java new file mode 100644 index 0000000..4ca31a3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java @@ -0,0 +1,68 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.manager.PgSenseDevManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/3. + */ +@Component +@Path("pgSenseDev") +public class PgSenseDevRs { + private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); + + private PgSenseDevManager pgSenseDevManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { + this.pgSenseDevManager = pgSenseDevManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 查询监测数据 + */ + @POST + @Path("getSenseDataByRegion") + @Produces(MediaType.APPLICATION_JSON) + public Map getSenseData(@FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + Map resultMap = new HashMap(); + + + + + + return resultMap; + } + + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java new file mode 100644 index 0000000..ce12696 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -0,0 +1,222 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPipeLineDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgPipeLineManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgPipeLine") +public class PgPipeLineRs { + + private static Logger logger = LoggerFactory.getLogger(PgPipeLineRs.class); + + private PgPipeLineManager pgPipeLineManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPipeLineManager(PgPipeLineManager pgPipeLineManager) { + this.pgPipeLineManager = pgPipeLineManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管线信息 + */ + @POST + @Path("getPipeLineByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String lineCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgPipeLineDto pgPipeLineDto=null; + try { + PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineCode(lineCode); + pgPipeLineDto=new PgPipeLineDto(pgPipeLine); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgPipeLineDto); + return resultMap; + } + + /** + * 新增管线 + */ + @POST + @Path("addPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPipeLine pgPipeLine=new PgPipeLine(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管线 + */ + @POST + @Path("editPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeLine(@FormParam("id") String id, + @FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgPipeLine pgPipeLine = pgPipeLineManager.get(id); + + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管线 + */ + @POST + @Path("deletePipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeLine(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPipeLine pgPipeLine=pgPipeLineManager.get(id); + if(pgPipeLine==null) { + msg = "不存在该管线信息"; + result="false"; + } + else + { + pgPipeLine.setActive(0); + pgPipeLineManager.save(pgPipeLine); + msg="管线删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管线删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java new file mode 100644 index 0000000..4ca31a3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java @@ -0,0 +1,68 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.manager.PgSenseDevManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/3. + */ +@Component +@Path("pgSenseDev") +public class PgSenseDevRs { + private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); + + private PgSenseDevManager pgSenseDevManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { + this.pgSenseDevManager = pgSenseDevManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 查询监测数据 + */ + @POST + @Path("getSenseDataByRegion") + @Produces(MediaType.APPLICATION_JSON) + public Map getSenseData(@FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + Map resultMap = new HashMap(); + + + + + + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java new file mode 100644 index 0000000..a8a0e2d --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -0,0 +1,216 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgTexture; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgTextureDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgTextureManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/7. + */ +@Component +@Path("pgTexture") +public class PgTextureRs { + + private static Logger logger = LoggerFactory.getLogger(PgTextureRs.class); + + private PgTextureManager pgTextureManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgTextureManager(PgTextureManager pgTextureManager) { + this.pgTextureManager = pgTextureManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管廊部件信息 + */ + @POST + @Path("getPgTextureByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgTexture(String textureCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgTextureDto pgTextureDto=null; + try { + PgTexture pgTexture = pgTextureManager.getPgTextureByCode(textureCode); + pgTextureDto=new PgTextureDto(pgTexture); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgTextureDto); + return resultMap; + } + + /** + * 新增管廊部件 + */ + @POST + @Path("addTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgTexture pgTexture = new PgTexture(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setPgPartitionId(pgPartition); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管廊部件 + */ + @POST + @Path("editTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map editTexture(@FormParam("id") String id, + @FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgTexture pgTexture=pgTextureManager.get(id); + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管廊部件 + */ + @POST + @Path("deleteTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteTexture(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgTexture pgTexture=pgTextureManager.get(id); + if(pgTexture==null) { + msg = "不存在该部件信息"; + result="false"; + } + else + { + pgTexture.setActive(0); + pgTextureManager.save(pgTexture); + msg="部件删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="部件删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java new file mode 100644 index 0000000..ce12696 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -0,0 +1,222 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPipeLineDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgPipeLineManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgPipeLine") +public class PgPipeLineRs { + + private static Logger logger = LoggerFactory.getLogger(PgPipeLineRs.class); + + private PgPipeLineManager pgPipeLineManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPipeLineManager(PgPipeLineManager pgPipeLineManager) { + this.pgPipeLineManager = pgPipeLineManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管线信息 + */ + @POST + @Path("getPipeLineByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String lineCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgPipeLineDto pgPipeLineDto=null; + try { + PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineCode(lineCode); + pgPipeLineDto=new PgPipeLineDto(pgPipeLine); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgPipeLineDto); + return resultMap; + } + + /** + * 新增管线 + */ + @POST + @Path("addPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPipeLine pgPipeLine=new PgPipeLine(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管线 + */ + @POST + @Path("editPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeLine(@FormParam("id") String id, + @FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgPipeLine pgPipeLine = pgPipeLineManager.get(id); + + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管线 + */ + @POST + @Path("deletePipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeLine(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPipeLine pgPipeLine=pgPipeLineManager.get(id); + if(pgPipeLine==null) { + msg = "不存在该管线信息"; + result="false"; + } + else + { + pgPipeLine.setActive(0); + pgPipeLineManager.save(pgPipeLine); + msg="管线删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管线删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java new file mode 100644 index 0000000..4ca31a3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java @@ -0,0 +1,68 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.manager.PgSenseDevManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/3. + */ +@Component +@Path("pgSenseDev") +public class PgSenseDevRs { + private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); + + private PgSenseDevManager pgSenseDevManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { + this.pgSenseDevManager = pgSenseDevManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 查询监测数据 + */ + @POST + @Path("getSenseDataByRegion") + @Produces(MediaType.APPLICATION_JSON) + public Map getSenseData(@FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + Map resultMap = new HashMap(); + + + + + + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java new file mode 100644 index 0000000..a8a0e2d --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -0,0 +1,216 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgTexture; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgTextureDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgTextureManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/7. + */ +@Component +@Path("pgTexture") +public class PgTextureRs { + + private static Logger logger = LoggerFactory.getLogger(PgTextureRs.class); + + private PgTextureManager pgTextureManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgTextureManager(PgTextureManager pgTextureManager) { + this.pgTextureManager = pgTextureManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管廊部件信息 + */ + @POST + @Path("getPgTextureByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgTexture(String textureCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgTextureDto pgTextureDto=null; + try { + PgTexture pgTexture = pgTextureManager.getPgTextureByCode(textureCode); + pgTextureDto=new PgTextureDto(pgTexture); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgTextureDto); + return resultMap; + } + + /** + * 新增管廊部件 + */ + @POST + @Path("addTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgTexture pgTexture = new PgTexture(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setPgPartitionId(pgPartition); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管廊部件 + */ + @POST + @Path("editTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map editTexture(@FormParam("id") String id, + @FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgTexture pgTexture=pgTextureManager.get(id); + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管廊部件 + */ + @POST + @Path("deleteTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteTexture(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgTexture pgTexture=pgTextureManager.get(id); + if(pgTexture==null) { + msg = "不存在该部件信息"; + result="false"; + } + else + { + pgTexture.setActive(0); + pgTextureManager.save(pgTexture); + msg="部件删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="部件删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java new file mode 100644 index 0000000..d390ad0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -0,0 +1,161 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pipeGallery") +public class PipeGalleryRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 获取管廊信息 + */ + @POST + @Path("getPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map getPipeGallery() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pipeGalleryDtoList = new ArrayList(); + try { + pipeGalleryDtoList = pipeGalleryManager.getPIpeGalleryDtoList(); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pipeGalleryDtoList); + return resultMap; + } + + /** + * 新增管廊 + */ + @POST + @Path("addPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map addPipeGallery(@FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PipeGallery pipeGallery = new PipeGallery(); + try { + pipeGallery.setPgCode(pgCode); + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /* + *编辑管廊信息 + */ + @POST + @Path("editPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeGallery(@FormParam("id") String id, + @FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PipeGallery pipeGallery = pipeGalleryManager.get(id); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + pipeGallery.setPgName(pgName); + pipeGallery.setPgCode(pgCode); + pipeGallery.setActive(1); + + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除管廊信息 + */ + @POST + @Path("deletePipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeGallery(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PipeGallery pipeGallery=pipeGalleryManager.get(id); + if(pipeGallery==null) { + msg = "不存在该管廊信息"; + result="false"; + } + else + { + pipeGallery.setActive(0); + pipeGalleryManager.save(pipeGallery); + msg="管廊删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管廊删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + +} \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java new file mode 100644 index 0000000..ce12696 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -0,0 +1,222 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPipeLineDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgPipeLineManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgPipeLine") +public class PgPipeLineRs { + + private static Logger logger = LoggerFactory.getLogger(PgPipeLineRs.class); + + private PgPipeLineManager pgPipeLineManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPipeLineManager(PgPipeLineManager pgPipeLineManager) { + this.pgPipeLineManager = pgPipeLineManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管线信息 + */ + @POST + @Path("getPipeLineByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String lineCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgPipeLineDto pgPipeLineDto=null; + try { + PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineCode(lineCode); + pgPipeLineDto=new PgPipeLineDto(pgPipeLine); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgPipeLineDto); + return resultMap; + } + + /** + * 新增管线 + */ + @POST + @Path("addPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPipeLine pgPipeLine=new PgPipeLine(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管线 + */ + @POST + @Path("editPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeLine(@FormParam("id") String id, + @FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgPipeLine pgPipeLine = pgPipeLineManager.get(id); + + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管线 + */ + @POST + @Path("deletePipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeLine(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPipeLine pgPipeLine=pgPipeLineManager.get(id); + if(pgPipeLine==null) { + msg = "不存在该管线信息"; + result="false"; + } + else + { + pgPipeLine.setActive(0); + pgPipeLineManager.save(pgPipeLine); + msg="管线删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管线删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java new file mode 100644 index 0000000..4ca31a3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java @@ -0,0 +1,68 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.manager.PgSenseDevManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/3. + */ +@Component +@Path("pgSenseDev") +public class PgSenseDevRs { + private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); + + private PgSenseDevManager pgSenseDevManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { + this.pgSenseDevManager = pgSenseDevManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 查询监测数据 + */ + @POST + @Path("getSenseDataByRegion") + @Produces(MediaType.APPLICATION_JSON) + public Map getSenseData(@FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + Map resultMap = new HashMap(); + + + + + + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java new file mode 100644 index 0000000..a8a0e2d --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -0,0 +1,216 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgTexture; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgTextureDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgTextureManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/7. + */ +@Component +@Path("pgTexture") +public class PgTextureRs { + + private static Logger logger = LoggerFactory.getLogger(PgTextureRs.class); + + private PgTextureManager pgTextureManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgTextureManager(PgTextureManager pgTextureManager) { + this.pgTextureManager = pgTextureManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管廊部件信息 + */ + @POST + @Path("getPgTextureByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgTexture(String textureCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgTextureDto pgTextureDto=null; + try { + PgTexture pgTexture = pgTextureManager.getPgTextureByCode(textureCode); + pgTextureDto=new PgTextureDto(pgTexture); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgTextureDto); + return resultMap; + } + + /** + * 新增管廊部件 + */ + @POST + @Path("addTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgTexture pgTexture = new PgTexture(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setPgPartitionId(pgPartition); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管廊部件 + */ + @POST + @Path("editTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map editTexture(@FormParam("id") String id, + @FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgTexture pgTexture=pgTextureManager.get(id); + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管廊部件 + */ + @POST + @Path("deleteTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteTexture(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgTexture pgTexture=pgTextureManager.get(id); + if(pgTexture==null) { + msg = "不存在该部件信息"; + result="false"; + } + else + { + pgTexture.setActive(0); + pgTextureManager.save(pgTexture); + msg="部件删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="部件删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java new file mode 100644 index 0000000..d390ad0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -0,0 +1,161 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pipeGallery") +public class PipeGalleryRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 获取管廊信息 + */ + @POST + @Path("getPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map getPipeGallery() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pipeGalleryDtoList = new ArrayList(); + try { + pipeGalleryDtoList = pipeGalleryManager.getPIpeGalleryDtoList(); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pipeGalleryDtoList); + return resultMap; + } + + /** + * 新增管廊 + */ + @POST + @Path("addPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map addPipeGallery(@FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PipeGallery pipeGallery = new PipeGallery(); + try { + pipeGallery.setPgCode(pgCode); + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /* + *编辑管廊信息 + */ + @POST + @Path("editPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeGallery(@FormParam("id") String id, + @FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PipeGallery pipeGallery = pipeGalleryManager.get(id); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + pipeGallery.setPgName(pgName); + pipeGallery.setPgCode(pgCode); + pipeGallery.setActive(1); + + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除管廊信息 + */ + @POST + @Path("deletePipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeGallery(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PipeGallery pipeGallery=pipeGalleryManager.get(id); + if(pipeGallery==null) { + msg = "不存在该管廊信息"; + result="false"; + } + else + { + pipeGallery.setActive(0); + pipeGalleryManager.save(pipeGallery); + msg="管廊删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管廊删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java new file mode 100644 index 0000000..40cb69f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java @@ -0,0 +1,158 @@ +package com.casic.PgInterface.rsFiles.web; + +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Controller +@RequestMapping("rs/pgReservePlan") +public class PgReserveController { + + private static Logger logger = LoggerFactory.getLogger(PgReservePlan.class); + + private PgReservePlanManager pgReservePlanManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + //新增预案文档 + @RequestMapping("addReservePlan") + @ResponseBody + public Map addReservePlan(@RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType, + @RequestParam(value = "planFiels",required =false) List planFiels) + throws Exception { + Map resultMap = new HashMap(); + PgReservePlan pgReservePlan = new PgReservePlan(); + String result = ""; + String msg = ""; + + try { + if (planFiels.size() == 0) + pgReservePlan.setPlanFiel(""); + else { + pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiels, "reservePlan")); + } + + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + result = "true"; + msg = "保存成功"; + logger.info("保存成功"); + pgReservePlanManager.save(pgReservePlan); + } catch (Exception ex) { + result = "false"; + msg = "保存失败"; + ex.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + //编辑预案文档 + @RequestMapping("editReservePlan") + @ResponseBody + public Map editReservePlan(@FormParam("id") String id, + @RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgReservePlan pgReservePlan = pgReservePlanManager.get(id); + if (pgReservePlan == null) { + result = "false"; + msg = "不存在该预案信息"; + } else { + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + pgReservePlanManager.save(pgReservePlan); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + //删除预案文档 + @RequestMapping("deleteReservePlan") + @ResponseBody + public Map deleteReservePlan(@FormParam("id") String id)throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try{ + + PgReservePlan pgReservePlan=pgReservePlanManager.get(id); + if(pgReservePlan==null) + { + result="false"; + msg="不存在该预案信息"; + } + else{ + pgReservePlan.setActive(0); + pgReservePlanManager.save(pgReservePlan); + result="true"; + msg="删除成功"; + } + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案删除失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + + } + + +} \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java new file mode 100644 index 0000000..ce12696 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -0,0 +1,222 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPipeLineDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgPipeLineManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgPipeLine") +public class PgPipeLineRs { + + private static Logger logger = LoggerFactory.getLogger(PgPipeLineRs.class); + + private PgPipeLineManager pgPipeLineManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPipeLineManager(PgPipeLineManager pgPipeLineManager) { + this.pgPipeLineManager = pgPipeLineManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管线信息 + */ + @POST + @Path("getPipeLineByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String lineCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgPipeLineDto pgPipeLineDto=null; + try { + PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineCode(lineCode); + pgPipeLineDto=new PgPipeLineDto(pgPipeLine); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgPipeLineDto); + return resultMap; + } + + /** + * 新增管线 + */ + @POST + @Path("addPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPipeLine pgPipeLine=new PgPipeLine(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管线 + */ + @POST + @Path("editPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeLine(@FormParam("id") String id, + @FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgPipeLine pgPipeLine = pgPipeLineManager.get(id); + + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管线 + */ + @POST + @Path("deletePipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeLine(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPipeLine pgPipeLine=pgPipeLineManager.get(id); + if(pgPipeLine==null) { + msg = "不存在该管线信息"; + result="false"; + } + else + { + pgPipeLine.setActive(0); + pgPipeLineManager.save(pgPipeLine); + msg="管线删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管线删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java new file mode 100644 index 0000000..4ca31a3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java @@ -0,0 +1,68 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.manager.PgSenseDevManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/3. + */ +@Component +@Path("pgSenseDev") +public class PgSenseDevRs { + private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); + + private PgSenseDevManager pgSenseDevManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { + this.pgSenseDevManager = pgSenseDevManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 查询监测数据 + */ + @POST + @Path("getSenseDataByRegion") + @Produces(MediaType.APPLICATION_JSON) + public Map getSenseData(@FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + Map resultMap = new HashMap(); + + + + + + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java new file mode 100644 index 0000000..a8a0e2d --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -0,0 +1,216 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgTexture; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgTextureDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgTextureManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/7. + */ +@Component +@Path("pgTexture") +public class PgTextureRs { + + private static Logger logger = LoggerFactory.getLogger(PgTextureRs.class); + + private PgTextureManager pgTextureManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgTextureManager(PgTextureManager pgTextureManager) { + this.pgTextureManager = pgTextureManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管廊部件信息 + */ + @POST + @Path("getPgTextureByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgTexture(String textureCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgTextureDto pgTextureDto=null; + try { + PgTexture pgTexture = pgTextureManager.getPgTextureByCode(textureCode); + pgTextureDto=new PgTextureDto(pgTexture); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgTextureDto); + return resultMap; + } + + /** + * 新增管廊部件 + */ + @POST + @Path("addTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgTexture pgTexture = new PgTexture(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setPgPartitionId(pgPartition); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管廊部件 + */ + @POST + @Path("editTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map editTexture(@FormParam("id") String id, + @FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgTexture pgTexture=pgTextureManager.get(id); + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管廊部件 + */ + @POST + @Path("deleteTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteTexture(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgTexture pgTexture=pgTextureManager.get(id); + if(pgTexture==null) { + msg = "不存在该部件信息"; + result="false"; + } + else + { + pgTexture.setActive(0); + pgTextureManager.save(pgTexture); + msg="部件删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="部件删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java new file mode 100644 index 0000000..d390ad0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -0,0 +1,161 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pipeGallery") +public class PipeGalleryRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 获取管廊信息 + */ + @POST + @Path("getPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map getPipeGallery() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pipeGalleryDtoList = new ArrayList(); + try { + pipeGalleryDtoList = pipeGalleryManager.getPIpeGalleryDtoList(); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pipeGalleryDtoList); + return resultMap; + } + + /** + * 新增管廊 + */ + @POST + @Path("addPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map addPipeGallery(@FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PipeGallery pipeGallery = new PipeGallery(); + try { + pipeGallery.setPgCode(pgCode); + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /* + *编辑管廊信息 + */ + @POST + @Path("editPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeGallery(@FormParam("id") String id, + @FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PipeGallery pipeGallery = pipeGalleryManager.get(id); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + pipeGallery.setPgName(pgName); + pipeGallery.setPgCode(pgCode); + pipeGallery.setActive(1); + + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除管廊信息 + */ + @POST + @Path("deletePipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeGallery(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PipeGallery pipeGallery=pipeGalleryManager.get(id); + if(pipeGallery==null) { + msg = "不存在该管廊信息"; + result="false"; + } + else + { + pipeGallery.setActive(0); + pipeGalleryManager.save(pipeGallery); + msg="管廊删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管廊删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java new file mode 100644 index 0000000..40cb69f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java @@ -0,0 +1,158 @@ +package com.casic.PgInterface.rsFiles.web; + +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Controller +@RequestMapping("rs/pgReservePlan") +public class PgReserveController { + + private static Logger logger = LoggerFactory.getLogger(PgReservePlan.class); + + private PgReservePlanManager pgReservePlanManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + //新增预案文档 + @RequestMapping("addReservePlan") + @ResponseBody + public Map addReservePlan(@RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType, + @RequestParam(value = "planFiels",required =false) List planFiels) + throws Exception { + Map resultMap = new HashMap(); + PgReservePlan pgReservePlan = new PgReservePlan(); + String result = ""; + String msg = ""; + + try { + if (planFiels.size() == 0) + pgReservePlan.setPlanFiel(""); + else { + pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiels, "reservePlan")); + } + + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + result = "true"; + msg = "保存成功"; + logger.info("保存成功"); + pgReservePlanManager.save(pgReservePlan); + } catch (Exception ex) { + result = "false"; + msg = "保存失败"; + ex.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + //编辑预案文档 + @RequestMapping("editReservePlan") + @ResponseBody + public Map editReservePlan(@FormParam("id") String id, + @RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgReservePlan pgReservePlan = pgReservePlanManager.get(id); + if (pgReservePlan == null) { + result = "false"; + msg = "不存在该预案信息"; + } else { + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + pgReservePlanManager.save(pgReservePlan); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + //删除预案文档 + @RequestMapping("deleteReservePlan") + @ResponseBody + public Map deleteReservePlan(@FormParam("id") String id)throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try{ + + PgReservePlan pgReservePlan=pgReservePlanManager.get(id); + if(pgReservePlan==null) + { + result="false"; + msg="不存在该预案信息"; + } + else{ + pgReservePlan.setActive(0); + pgReservePlanManager.save(pgReservePlan); + result="true"; + msg="删除成功"; + } + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案删除失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + + } + + +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d1d2169..2240b4b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ # ============================================================================ # application # ============================================================================ -application.domain.packages=com.casic.BRinterface +application.domain.packages=com.casic.PgInterface application.i18n.packages=org.springframework.security.messages,\ com.mossle.core.messages,\ com.mossle.user.messages,\ @@ -17,8 +17,8 @@ # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver db.default.url=jdbc:oracle:thin:@127.0.0.1:1521:szdb -db.default.username=scott -db.default.password=SZDB +db.default.username=PG +db.default.password=PG # ============================================================================ diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java new file mode 100644 index 0000000..ce12696 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -0,0 +1,222 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPipeLineDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgPipeLineManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgPipeLine") +public class PgPipeLineRs { + + private static Logger logger = LoggerFactory.getLogger(PgPipeLineRs.class); + + private PgPipeLineManager pgPipeLineManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPipeLineManager(PgPipeLineManager pgPipeLineManager) { + this.pgPipeLineManager = pgPipeLineManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管线信息 + */ + @POST + @Path("getPipeLineByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String lineCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgPipeLineDto pgPipeLineDto=null; + try { + PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineCode(lineCode); + pgPipeLineDto=new PgPipeLineDto(pgPipeLine); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgPipeLineDto); + return resultMap; + } + + /** + * 新增管线 + */ + @POST + @Path("addPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPipeLine pgPipeLine=new PgPipeLine(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管线 + */ + @POST + @Path("editPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeLine(@FormParam("id") String id, + @FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgPipeLine pgPipeLine = pgPipeLineManager.get(id); + + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管线 + */ + @POST + @Path("deletePipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeLine(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPipeLine pgPipeLine=pgPipeLineManager.get(id); + if(pgPipeLine==null) { + msg = "不存在该管线信息"; + result="false"; + } + else + { + pgPipeLine.setActive(0); + pgPipeLineManager.save(pgPipeLine); + msg="管线删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管线删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java new file mode 100644 index 0000000..4ca31a3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java @@ -0,0 +1,68 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.manager.PgSenseDevManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/3. + */ +@Component +@Path("pgSenseDev") +public class PgSenseDevRs { + private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); + + private PgSenseDevManager pgSenseDevManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { + this.pgSenseDevManager = pgSenseDevManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 查询监测数据 + */ + @POST + @Path("getSenseDataByRegion") + @Produces(MediaType.APPLICATION_JSON) + public Map getSenseData(@FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + Map resultMap = new HashMap(); + + + + + + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java new file mode 100644 index 0000000..a8a0e2d --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -0,0 +1,216 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgTexture; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgTextureDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgTextureManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/7. + */ +@Component +@Path("pgTexture") +public class PgTextureRs { + + private static Logger logger = LoggerFactory.getLogger(PgTextureRs.class); + + private PgTextureManager pgTextureManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgTextureManager(PgTextureManager pgTextureManager) { + this.pgTextureManager = pgTextureManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管廊部件信息 + */ + @POST + @Path("getPgTextureByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgTexture(String textureCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgTextureDto pgTextureDto=null; + try { + PgTexture pgTexture = pgTextureManager.getPgTextureByCode(textureCode); + pgTextureDto=new PgTextureDto(pgTexture); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgTextureDto); + return resultMap; + } + + /** + * 新增管廊部件 + */ + @POST + @Path("addTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgTexture pgTexture = new PgTexture(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setPgPartitionId(pgPartition); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管廊部件 + */ + @POST + @Path("editTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map editTexture(@FormParam("id") String id, + @FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgTexture pgTexture=pgTextureManager.get(id); + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管廊部件 + */ + @POST + @Path("deleteTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteTexture(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgTexture pgTexture=pgTextureManager.get(id); + if(pgTexture==null) { + msg = "不存在该部件信息"; + result="false"; + } + else + { + pgTexture.setActive(0); + pgTextureManager.save(pgTexture); + msg="部件删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="部件删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java new file mode 100644 index 0000000..d390ad0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -0,0 +1,161 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pipeGallery") +public class PipeGalleryRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 获取管廊信息 + */ + @POST + @Path("getPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map getPipeGallery() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pipeGalleryDtoList = new ArrayList(); + try { + pipeGalleryDtoList = pipeGalleryManager.getPIpeGalleryDtoList(); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pipeGalleryDtoList); + return resultMap; + } + + /** + * 新增管廊 + */ + @POST + @Path("addPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map addPipeGallery(@FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PipeGallery pipeGallery = new PipeGallery(); + try { + pipeGallery.setPgCode(pgCode); + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /* + *编辑管廊信息 + */ + @POST + @Path("editPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeGallery(@FormParam("id") String id, + @FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PipeGallery pipeGallery = pipeGalleryManager.get(id); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + pipeGallery.setPgName(pgName); + pipeGallery.setPgCode(pgCode); + pipeGallery.setActive(1); + + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除管廊信息 + */ + @POST + @Path("deletePipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeGallery(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PipeGallery pipeGallery=pipeGalleryManager.get(id); + if(pipeGallery==null) { + msg = "不存在该管廊信息"; + result="false"; + } + else + { + pipeGallery.setActive(0); + pipeGalleryManager.save(pipeGallery); + msg="管廊删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管廊删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java new file mode 100644 index 0000000..40cb69f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java @@ -0,0 +1,158 @@ +package com.casic.PgInterface.rsFiles.web; + +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Controller +@RequestMapping("rs/pgReservePlan") +public class PgReserveController { + + private static Logger logger = LoggerFactory.getLogger(PgReservePlan.class); + + private PgReservePlanManager pgReservePlanManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + //新增预案文档 + @RequestMapping("addReservePlan") + @ResponseBody + public Map addReservePlan(@RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType, + @RequestParam(value = "planFiels",required =false) List planFiels) + throws Exception { + Map resultMap = new HashMap(); + PgReservePlan pgReservePlan = new PgReservePlan(); + String result = ""; + String msg = ""; + + try { + if (planFiels.size() == 0) + pgReservePlan.setPlanFiel(""); + else { + pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiels, "reservePlan")); + } + + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + result = "true"; + msg = "保存成功"; + logger.info("保存成功"); + pgReservePlanManager.save(pgReservePlan); + } catch (Exception ex) { + result = "false"; + msg = "保存失败"; + ex.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + //编辑预案文档 + @RequestMapping("editReservePlan") + @ResponseBody + public Map editReservePlan(@FormParam("id") String id, + @RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgReservePlan pgReservePlan = pgReservePlanManager.get(id); + if (pgReservePlan == null) { + result = "false"; + msg = "不存在该预案信息"; + } else { + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + pgReservePlanManager.save(pgReservePlan); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + //删除预案文档 + @RequestMapping("deleteReservePlan") + @ResponseBody + public Map deleteReservePlan(@FormParam("id") String id)throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try{ + + PgReservePlan pgReservePlan=pgReservePlanManager.get(id); + if(pgReservePlan==null) + { + result="false"; + msg="不存在该预案信息"; + } + else{ + pgReservePlan.setActive(0); + pgReservePlanManager.save(pgReservePlan); + result="true"; + msg="删除成功"; + } + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案删除失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + + } + + +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d1d2169..2240b4b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ # ============================================================================ # application # ============================================================================ -application.domain.packages=com.casic.BRinterface +application.domain.packages=com.casic.PgInterface application.i18n.packages=org.springframework.security.messages,\ com.mossle.core.messages,\ com.mossle.user.messages,\ @@ -17,8 +17,8 @@ # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver db.default.url=jdbc:oracle:thin:@127.0.0.1:1521:szdb -db.default.username=scott -db.default.password=SZDB +db.default.username=PG +db.default.password=PG # ============================================================================ diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml index 6e3e366..2cb05ce 100644 --- a/src/main/resources/spring/applicationContext.xml +++ b/src/main/resources/spring/applicationContext.xml @@ -14,7 +14,6 @@ - @@ -35,4 +34,4 @@ - + \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java new file mode 100644 index 0000000..ce12696 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -0,0 +1,222 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPipeLineDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgPipeLineManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgPipeLine") +public class PgPipeLineRs { + + private static Logger logger = LoggerFactory.getLogger(PgPipeLineRs.class); + + private PgPipeLineManager pgPipeLineManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPipeLineManager(PgPipeLineManager pgPipeLineManager) { + this.pgPipeLineManager = pgPipeLineManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管线信息 + */ + @POST + @Path("getPipeLineByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String lineCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgPipeLineDto pgPipeLineDto=null; + try { + PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineCode(lineCode); + pgPipeLineDto=new PgPipeLineDto(pgPipeLine); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgPipeLineDto); + return resultMap; + } + + /** + * 新增管线 + */ + @POST + @Path("addPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPipeLine pgPipeLine=new PgPipeLine(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管线 + */ + @POST + @Path("editPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeLine(@FormParam("id") String id, + @FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgPipeLine pgPipeLine = pgPipeLineManager.get(id); + + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管线 + */ + @POST + @Path("deletePipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeLine(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPipeLine pgPipeLine=pgPipeLineManager.get(id); + if(pgPipeLine==null) { + msg = "不存在该管线信息"; + result="false"; + } + else + { + pgPipeLine.setActive(0); + pgPipeLineManager.save(pgPipeLine); + msg="管线删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管线删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java new file mode 100644 index 0000000..4ca31a3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java @@ -0,0 +1,68 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.manager.PgSenseDevManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/3. + */ +@Component +@Path("pgSenseDev") +public class PgSenseDevRs { + private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); + + private PgSenseDevManager pgSenseDevManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { + this.pgSenseDevManager = pgSenseDevManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 查询监测数据 + */ + @POST + @Path("getSenseDataByRegion") + @Produces(MediaType.APPLICATION_JSON) + public Map getSenseData(@FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + Map resultMap = new HashMap(); + + + + + + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java new file mode 100644 index 0000000..a8a0e2d --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -0,0 +1,216 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgTexture; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgTextureDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgTextureManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/7. + */ +@Component +@Path("pgTexture") +public class PgTextureRs { + + private static Logger logger = LoggerFactory.getLogger(PgTextureRs.class); + + private PgTextureManager pgTextureManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgTextureManager(PgTextureManager pgTextureManager) { + this.pgTextureManager = pgTextureManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管廊部件信息 + */ + @POST + @Path("getPgTextureByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgTexture(String textureCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgTextureDto pgTextureDto=null; + try { + PgTexture pgTexture = pgTextureManager.getPgTextureByCode(textureCode); + pgTextureDto=new PgTextureDto(pgTexture); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgTextureDto); + return resultMap; + } + + /** + * 新增管廊部件 + */ + @POST + @Path("addTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgTexture pgTexture = new PgTexture(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setPgPartitionId(pgPartition); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管廊部件 + */ + @POST + @Path("editTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map editTexture(@FormParam("id") String id, + @FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgTexture pgTexture=pgTextureManager.get(id); + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管廊部件 + */ + @POST + @Path("deleteTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteTexture(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgTexture pgTexture=pgTextureManager.get(id); + if(pgTexture==null) { + msg = "不存在该部件信息"; + result="false"; + } + else + { + pgTexture.setActive(0); + pgTextureManager.save(pgTexture); + msg="部件删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="部件删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java new file mode 100644 index 0000000..d390ad0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -0,0 +1,161 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pipeGallery") +public class PipeGalleryRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 获取管廊信息 + */ + @POST + @Path("getPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map getPipeGallery() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pipeGalleryDtoList = new ArrayList(); + try { + pipeGalleryDtoList = pipeGalleryManager.getPIpeGalleryDtoList(); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pipeGalleryDtoList); + return resultMap; + } + + /** + * 新增管廊 + */ + @POST + @Path("addPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map addPipeGallery(@FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PipeGallery pipeGallery = new PipeGallery(); + try { + pipeGallery.setPgCode(pgCode); + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /* + *编辑管廊信息 + */ + @POST + @Path("editPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeGallery(@FormParam("id") String id, + @FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PipeGallery pipeGallery = pipeGalleryManager.get(id); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + pipeGallery.setPgName(pgName); + pipeGallery.setPgCode(pgCode); + pipeGallery.setActive(1); + + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除管廊信息 + */ + @POST + @Path("deletePipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeGallery(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PipeGallery pipeGallery=pipeGalleryManager.get(id); + if(pipeGallery==null) { + msg = "不存在该管廊信息"; + result="false"; + } + else + { + pipeGallery.setActive(0); + pipeGalleryManager.save(pipeGallery); + msg="管廊删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管廊删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java new file mode 100644 index 0000000..40cb69f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java @@ -0,0 +1,158 @@ +package com.casic.PgInterface.rsFiles.web; + +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Controller +@RequestMapping("rs/pgReservePlan") +public class PgReserveController { + + private static Logger logger = LoggerFactory.getLogger(PgReservePlan.class); + + private PgReservePlanManager pgReservePlanManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + //新增预案文档 + @RequestMapping("addReservePlan") + @ResponseBody + public Map addReservePlan(@RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType, + @RequestParam(value = "planFiels",required =false) List planFiels) + throws Exception { + Map resultMap = new HashMap(); + PgReservePlan pgReservePlan = new PgReservePlan(); + String result = ""; + String msg = ""; + + try { + if (planFiels.size() == 0) + pgReservePlan.setPlanFiel(""); + else { + pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiels, "reservePlan")); + } + + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + result = "true"; + msg = "保存成功"; + logger.info("保存成功"); + pgReservePlanManager.save(pgReservePlan); + } catch (Exception ex) { + result = "false"; + msg = "保存失败"; + ex.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + //编辑预案文档 + @RequestMapping("editReservePlan") + @ResponseBody + public Map editReservePlan(@FormParam("id") String id, + @RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgReservePlan pgReservePlan = pgReservePlanManager.get(id); + if (pgReservePlan == null) { + result = "false"; + msg = "不存在该预案信息"; + } else { + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + pgReservePlanManager.save(pgReservePlan); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + //删除预案文档 + @RequestMapping("deleteReservePlan") + @ResponseBody + public Map deleteReservePlan(@FormParam("id") String id)throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try{ + + PgReservePlan pgReservePlan=pgReservePlanManager.get(id); + if(pgReservePlan==null) + { + result="false"; + msg="不存在该预案信息"; + } + else{ + pgReservePlan.setActive(0); + pgReservePlanManager.save(pgReservePlan); + result="true"; + msg="删除成功"; + } + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案删除失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + + } + + +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d1d2169..2240b4b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ # ============================================================================ # application # ============================================================================ -application.domain.packages=com.casic.BRinterface +application.domain.packages=com.casic.PgInterface application.i18n.packages=org.springframework.security.messages,\ com.mossle.core.messages,\ com.mossle.user.messages,\ @@ -17,8 +17,8 @@ # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver db.default.url=jdbc:oracle:thin:@127.0.0.1:1521:szdb -db.default.username=scott -db.default.password=SZDB +db.default.username=PG +db.default.password=PG # ============================================================================ diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml index 6e3e366..2cb05ce 100644 --- a/src/main/resources/spring/applicationContext.xml +++ b/src/main/resources/spring/applicationContext.xml @@ -14,7 +14,6 @@ - @@ -35,4 +34,4 @@ - + \ No newline at end of file diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" index 48ca5e5..3bb93da 100644 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..ba1d483 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +PgInterface \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml new file mode 100644 index 0000000..afd734a --- /dev/null +++ b/.idea/artifacts/PgInterface.xml @@ -0,0 +1,75 @@ + + + $PROJECT_DIR$/../out/artifacts/PgInterface + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c0d0a --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 0000000..b8d93d8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 0000000..30ff5cb --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml new file mode 100644 index 0000000..a8b0d9c --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml new file mode 100644 index 0000000..1c76d0b --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml new file mode 100644 index 0000000..75edced --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_java_sizeof_0_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml new file mode 100644 index 0000000..c693e24 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml new file mode 100644 index 0000000..0119075 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_4_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml new file mode 100644 index 0000000..5a0115e --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml new file mode 100644 index 0000000..01f92e7 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml new file mode 100644 index 0000000..aecf125 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml new file mode 100644 index 0000000..3284dbc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml new file mode 100644 index 0000000..6b034cd --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_4_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml new file mode 100644 index 0000000..4e05e59 --- /dev/null +++ b/.idea/libraries/Maven__com_github_springtestdbunit_spring_test_dbunit_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000..d7b5038 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml new file mode 100644 index 0000000..675dc28 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_2_jdk5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml new file mode 100644 index 0000000..8ddab78 --- /dev/null +++ b/.idea/libraries/Maven__com_oracle_ojdbc6_11_1_0_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml new file mode 100644 index 0000000..3807eb2 --- /dev/null +++ b/.idea/libraries/Maven__com_thoughtworks_paranamer_paranamer_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml new file mode 100644 index 0000000..9c245b9 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml new file mode 100644 index 0000000..a66d039 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 0000000..3caee7e --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 0000000..49c39ce --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml new file mode 100644 index 0000000..18d3b23 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 0000000..bc2aad0 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 0000000..ab20721 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 0000000..14681ee --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 0000000..180d587 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml new file mode 100644 index 0000000..3189055 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 0000000..63d10f6 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml new file mode 100644 index 0000000..4b5f67f --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..f329893 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_jstl_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 0000000..940ce73 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml new file mode 100644 index 0000000..c890167 --- /dev/null +++ b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_7.xml b/.idea/libraries/Maven__junit_junit_4_7.xml new file mode 100644 index 0000000..4402995 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml new file mode 100644 index 0000000..99ef141 --- /dev/null +++ b/.idea/libraries/Maven__ma_glasnost_orika_orika_core_1_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml new file mode 100644 index 0000000..004138c --- /dev/null +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_32.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml new file mode 100644 index 0000000..83cba3e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml new file mode 100644 index 0000000..a0ffd89 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml new file mode 100644 index 0000000..2ab4145 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_commons_compiler_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml new file mode 100644 index 0000000..824e44b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_janino_janino_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml new file mode 100644 index 0000000..5f67e77 --- /dev/null +++ b/.idea/libraries/Maven__org_dbunit_dbunit_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml new file mode 100644 index 0000000..2ab51a7 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000..acdf443 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml new file mode 100644 index 0000000..9ed6d29 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_4_0_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml new file mode 100644 index 0000000..d63bd65 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_4_3_6_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml new file mode 100644 index 0000000..482b520 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml new file mode 100644 index 0000000..6492b2b --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml new file mode 100644 index 0000000..f1307ae --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_18_2_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml new file mode 100644 index 0000000..d3cd089 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_jandex_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml new file mode 100644 index 0000000..815ab4d --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_1_3_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml new file mode 100644 index 0000000..715be29 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_annotations_1_2_0_Beta1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml new file mode 100644 index 0000000..2ab9129 --- /dev/null +++ b/.idea/libraries/Maven__org_jboss_spec_javax_transaction_jboss_transaction_api_1_2_spec_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml new file mode 100644 index 0000000..eacee9b --- /dev/null +++ b/.idea/libraries/Maven__org_lazyluke_log4jdbc_remix_0_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml new file mode 100644 index 0000000..5f7f780 --- /dev/null +++ b/.idea/libraries/Maven__org_mockito_mockito_core_1_9_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000..c79fa27 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml new file mode 100644 index 0000000..282edcb --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml new file mode 100644 index 0000000..72cee56 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml new file mode 100644 index 0000000..e9c1f9e --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml new file mode 100644 index 0000000..6f1fe68 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml new file mode 100644 index 0000000..1b6467b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml new file mode 100644 index 0000000..5a9c094 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml new file mode 100644 index 0000000..10452ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml new file mode 100644 index 0000000..aba9fc0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..9afd907 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml new file mode 100644 index 0000000..afc1cf1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml new file mode 100644 index 0000000..120bd5a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml new file mode 100644 index 0000000..251036d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml new file mode 100644 index 0000000..2bbc281 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml new file mode 100644 index 0000000..ab720e1 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_4_0_6_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6b913be --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c0fedb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PgInterface.iml b/PgInterface.iml index 0f71cd3..1bbc2a6 100644 --- a/PgInterface.iml +++ b/PgInterface.iml @@ -13,12 +13,14 @@ + + - + diff --git a/pom.xml b/pom.xml index 4bfa75a..82c87f8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - com.casic.BRinterface - BRinterface + com.casic.PgInterface + PgInterface pom 1.0-SNAPSHOT - BRinterface + PgInterface http://maven.apache.org diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java index 61c459b..80625c7 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgLocation.java @@ -6,22 +6,22 @@ import org.hibernate.annotations.NotFoundAction; import javax.persistence.*; -import javax.xml.crypto.Data; import java.io.Serializable; +import java.util.Date; /** * Created by yxw on 2017/11/2. */ @Entity @Table(name = "PG_LOCATION") -@SequenceGenerator(name = "SEQ_PG_LOCATION", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOCATION_ID", sequenceName = "SEQ_PG_LOCATION_ID",allocationSize=1,initialValue=1) public class PgLocation implements Serializable { private static final long serialVersionUID = 1L; private long id; private PgDevice pgDeviceId;//设备 private PgPatroler pgPatrolerId;//人员信息 - private Data intoTime;//进入时间 - private Data outTime;//预计出去时间 + private Date intoTime;//进入时间 + private Date outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @Id @@ -35,20 +35,22 @@ } @Column(name = "INTO_TIME") - public Data getIntoTime() { + public Date getIntoTime() { return intoTime; } - public void setIntoTime(Data intoTime) { + public void setIntoTime(Date intoTime) { this.intoTime = intoTime; } + @Column(name = "OUT_TIME") - public Data getOutTime() { + + public Date getOutTime() { return outTime; } - public void setOutTime(Data outTime) { + public void setOutTime(Date outTime) { this.outTime = outTime; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java index c113ab7..074ec6e 100644 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java @@ -13,7 +13,7 @@ */ @Entity @Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) public class PgSenseDev implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 0f2ab84..dd0f849 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -10,7 +10,7 @@ */ public class PgLocationDto implements Serializable { - private long id; + private String id; private String intoTime;//进入时间 private String outTime;//预计出去时间 private String position;//当前位置，暂定；未拿到具体数据格式 @@ -19,11 +19,11 @@ private String department;//部门 private String post;//职务 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLocation.getId())); this.setUserName(pgLocation.getPgPatrolerId().getUserName()); this.setDepartment(pgLocation.getPgPatrolerId().getDepartment()); this.setPost(pgLocation.getPgPatrolerId().getPost()); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java index 515488f..80320ec 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java @@ -10,7 +10,7 @@ */ public class PgSenseDevDto implements Serializable { - private long id; + private String id; private String deviceName;//设备 private String upTime;//上传时间 private String temperature;//温度 @@ -19,11 +19,11 @@ private String ch4;//甲烷 private String co;//一氧化碳 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -87,6 +87,7 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgSenseDev.getId())); this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); this.setUpTime(sdf.format(pgSenseDev.getUpTime())); this.setTemperature(pgSenseDev.getTemperature()); diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java index 2d4df34..a99981e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgLocationManager { + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java index 63cbf97..c43129e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java @@ -1,7 +1,11 @@ package com.casic.PgInterface.devData.manager; +import org.springframework.stereotype.Service; + /** * Created by yxw on 2017/11/2. */ +@Service public class PgSenseDevManager { + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java index d95b1e2..f91f82e 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java @@ -13,15 +13,15 @@ */ @Entity @Table(name = "PG_ALARM") -@SequenceGenerator(name = "SEQ_PG_ALARM", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_ALARM_ID", sequenceName = "SEQ_PG_ALARM_ID", allocationSize = 1, initialValue = 1) public class PgAlarm implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String alarmType;//报警类型 private String alarmValue;//报警值 private Date alarmDate;//报警时间 private String description;//描述 + private PgAlarmType alarmTypeId;//报警类型 private PgDevice alarmDevId;//报警设备 private PgPatroler patrolerId;//责任人 private int active;//状态位 @@ -36,15 +36,6 @@ this.id = id; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; - } - - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; - } - @Column(name = "ALARM_VALUE") public String getAlarmValue() { return alarmValue; @@ -74,6 +65,17 @@ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getAlarmTypeId() { + return alarmTypeId; + } + + public void setAlarmTypeId(PgAlarmType alarmTypeId) { + this.alarmTypeId = alarmTypeId; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "ALARMDEVID") public PgDevice getAlarmDevId() { return alarmDevId; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java new file mode 100644 index 0000000..8ed5759 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java @@ -0,0 +1,69 @@ +package com.casic.PgInterface.devTable.domain; + +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Entity +@Table(name = "PG_ALARM_TYPE") +@SequenceGenerator(name = "SEQ_PG_ALARM__TYPE_ID", sequenceName = "SEQ_PG_ALARM__TYPE_ID", allocationSize = 1, initialValue = 1) +public class PgAlarmType implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String alarmType;//报警类型 + private int active;//标志位 + private List alarmList; + private List reservePlanList; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "ALARM_TYPE") + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId") + public List getAlarmList() { + return alarmList; + } + + public void setAlarmList(List alarmList) { + this.alarmList = alarmList; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgAlarmTypeId") + public List getReservePlanList() { + return reservePlanList; + } + + public void setReservePlanList(List reservePlanList) { + this.reservePlanList = reservePlanList; + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index a8a9d52..1d71ab2 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -14,7 +14,7 @@ */ @Entity @Table(name = "PG_DEVICE") -@SequenceGenerator(name = "SEQ_PG_DEVICE", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_DEVICE_ID", sequenceName = "SEQ_PG_DEVICE_ID", allocationSize = 1, initialValue = 1) public class PgDevice implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java index 132f066..626e3a4 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PARTITION") -@SequenceGenerator(name = "SEQ_PG_PARTITION", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PARTITION_ID", sequenceName = "SEQ_PG_PARTITION_ID", allocationSize = 1, initialValue = 1) public class PgPartition implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java index 2eb1d52..13729ec 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_PIPELINE") -@SequenceGenerator(name = "SEQ_PG_PIPELINE", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPELINE_ID", sequenceName = "SEQ_PG_PIPELINE_ID", allocationSize = 1, initialValue = 1) public class PgPipeLine implements Serializable { private static final long serialVersionUID = 1L; private long id; @@ -23,6 +23,7 @@ private String layerNum;//所在层数 private String diameter;//管径 private PgPartition pgPartitionId;//所在管廊信息 + private int active;//状态位 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_PIPELINE_ID") @@ -88,6 +89,15 @@ this.diameter = diameter; } + @Column(name = "ACTIVE") + public int getActive() { + return active; + } + + public void setActive(int active) { + this.active = active; + } + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "PARID") diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java index 824a430..53d59bf 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgTexture.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_TEXTURE") -@SequenceGenerator(name = "SEQ_PG_TEXTURE", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_TEXTURE_ID", sequenceName = "SEQ_PG_TEXTURE_ID", allocationSize = 1, initialValue = 1) public class PgTexture implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java index 1de7044..c9a3564 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java @@ -9,7 +9,7 @@ */ @Entity @Table(name = "PG_PIPE_GALLERY") -@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) +@SequenceGenerator(name = "SEQ_PG_PIPE_GALLERY_ID", sequenceName = "SEQ_PG_PIPE_GALLERY_ID", allocationSize = 1, initialValue = 1) public class PipeGallery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index a8b9fe5..c8a4c18 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -10,6 +10,7 @@ */ public class PgAlarmDto implements Serializable { + private String id; private String alarmType;//报警类型 private String alarmValue;//报警值 private String alarmDate;//报警时间 @@ -20,6 +21,15 @@ private String phoneNumber;//联系电话 private String active;//状态 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getAlarmType() { return alarmType; } @@ -96,7 +106,8 @@ { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setAlarmType(pgAlarm.getAlarmType()); + this.setId(String.valueOf(pgAlarm.getId())); + this.setAlarmType(pgAlarm.getAlarmTypeId().getAlarmType()); this.setAlarmValue(pgAlarm.getAlarmValue()); this.setAlarmDate(sdf.format(pgAlarm.getAlarmDate())); this.setDescription(pgAlarm.getDescription()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java new file mode 100644 index 0000000..09dfd24 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -0,0 +1,48 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; + +import java.io.Serializable; + +/** + * Created by yxw on 2017/11/8. + */ + +public class PgAlarmTypeDto implements Serializable { + + private String id; + private String alarmType;//报警类型 + private String active;//标志位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAlarmType() { + return alarmType; + } + + public void setAlarmType(String alarmType) { + this.alarmType = alarmType; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public PgAlarmTypeDto (PgAlarmType pgAlarmType) + { + this.setId(String.valueOf(pgAlarmType.getId())); + this.setAlarmType(pgAlarmType.getAlarmType()); + this.setActive(String.valueOf(pgAlarmType.getActive())); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 43faaf8..22a8e69 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -10,7 +10,7 @@ */ public class PgDeviceDto implements Serializable { - private long id; + private String id; private String devCode;//设备唯一编号 private String devName;//设备名称 private String brand;//品牌 @@ -20,11 +20,11 @@ private String pipeGallery;//仓位 private String partition;//分区 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -95,6 +95,8 @@ public PgDeviceDto(PgDevice pgDevice) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgDevice.getId())); this.setDevCode(pgDevice.getDevCode()); this.setDevName(pgDevice.getDevName()); this.setBrand(pgDevice.getBrand()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index bbf6eb2..c606f00 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -9,11 +9,21 @@ */ public class PgPartitionDto implements Serializable { + private String id; private String parCode;//分区唯一编号 private String parName;//分区名称 private String pipeGallery;//管廊仓 private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + public String getParCode() { return parCode; } @@ -48,6 +58,7 @@ public PgPartitionDto(PgPartition pgPartition) { + this.setId(String.valueOf(pgPartition.getId())); this.setParCode(pgPartition.getParCode()); this.setParName(pgPartition.getParName()); this.setPipeGallery(pgPartition.getPipeGalleryId().getPgName()); diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index 8c3f83d..1609d7d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -10,6 +10,7 @@ */ public class PgPipeLineDto implements Serializable { + private String id; private String lineCode;//管线唯一编号 private String lineType;//管线类型 private String ownerUnit;//权属单位 @@ -18,6 +19,15 @@ private String diameter;//管径 private String pipeGallery;//仓位 private String partition;//分区 + private String active;//状态位 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public String getLineCode() { return lineCode; @@ -83,10 +93,19 @@ this.partition = partition; } + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + public PgPipeLineDto(PgPipeLine pgPipeLine) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgPipeLine.getId())); this.setLineCode(pgPipeLine.getLineCode()); this.setLineType(pgPipeLine.getLineType()); this.setOwnerUnit(pgPipeLine.getOwnerUnit()); @@ -95,5 +114,6 @@ this.setDiameter(pgPipeLine.getDiameter()); this.setPipeGallery(pgPipeLine.getPgPartitionId().getPipeGalleryId().getPgName()); this.setPartition(pgPipeLine.getPgPartitionId().getParName()); + this.setActive(String.valueOf(pgPipeLine.getActive())); } } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java deleted file mode 100644 index cb1b6f1..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgTexttureDto.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.casic.PgInterface.devTable.dto; - -import com.casic.PgInterface.devTable.domain.PgTexture; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgTexttureDto implements Serializable { - - private String textureCode;//管廊构件唯一编号 - private String textureName;//名称 - private String textureMaterial;//材质 - private String layerNum;//所在层数 - private String ownerUnit;//权属单位 - private String buildDate;//建设年代 - private String active;//状态位 - private String pipeGallery;//仓位 - private String partition;//分区 - - public String getTextureCode() { - return textureCode; - } - - public void setTextureCode(String textureCode) { - this.textureCode = textureCode; - } - - public String getTextureName() { - return textureName; - } - - public void setTextureName(String textureName) { - this.textureName = textureName; - } - - public String getTextureMaterial() { - return textureMaterial; - } - - public void setTextureMaterial(String textureMaterial) { - this.textureMaterial = textureMaterial; - } - - public String getLayerNum() { - return layerNum; - } - - public void setLayerNum(String layerNum) { - this.layerNum = layerNum; - } - - public String getOwnerUnit() { - return ownerUnit; - } - - public void setOwnerUnit(String ownerUnit) { - this.ownerUnit = ownerUnit; - } - - public String getBuildDate() { - return buildDate; - } - - public void setBuildDate(String buildDate) { - this.buildDate = buildDate; - } - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public String getPipeGallery() { - return pipeGallery; - } - - public void setPipeGallery(String pipeGallery) { - this.pipeGallery = pipeGallery; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - public PgTexttureDto(PgTexture pgTexture) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - this.setTextureCode(pgTexture.getTextureCode()); - this.setTextureName(pgTexture.getTextureName()); - this.setTextureMaterial(pgTexture.getTextureMaterial()); - this.setLayerNum(pgTexture.getLayerNum()); - this.setOwnerUnit(pgTexture.getOwnerUnit()); - this.setBuildDate(sdf.format(pgTexture.getBuildDate())); - this.setActive(String.valueOf(pgTexture.getActive())); - this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); - this.setPartition(pgTexture.getPgPartitionId().getParName()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java new file mode 100644 index 0000000..cf299e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgTextureDto.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.devTable.dto; + +import com.casic.PgInterface.devTable.domain.PgTexture; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/10/30. + */ +public class PgTextureDto implements Serializable { + + private String id; + private String textureCode;//管廊构件唯一编号 + private String textureName;//名称 + private String textureMaterial;//材质 + private String layerNum;//所在层数 + private String ownerUnit;//权属单位 + private String buildDate;//建设年代 + private String active;//状态位 + private String pipeGallery;//仓位 + private String partition;//分区 + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTextureCode() { + return textureCode; + } + + public void setTextureCode(String textureCode) { + this.textureCode = textureCode; + } + + public String getTextureName() { + return textureName; + } + + public void setTextureName(String textureName) { + this.textureName = textureName; + } + + public String getTextureMaterial() { + return textureMaterial; + } + + public void setTextureMaterial(String textureMaterial) { + this.textureMaterial = textureMaterial; + } + + public String getLayerNum() { + return layerNum; + } + + public void setLayerNum(String layerNum) { + this.layerNum = layerNum; + } + + public String getOwnerUnit() { + return ownerUnit; + } + + public void setOwnerUnit(String ownerUnit) { + this.ownerUnit = ownerUnit; + } + + public String getBuildDate() { + return buildDate; + } + + public void setBuildDate(String buildDate) { + this.buildDate = buildDate; + } + + public String getActive() { + return active; + } + + public void setActive(String active) { + this.active = active; + } + + public String getPipeGallery() { + return pipeGallery; + } + + public void setPipeGallery(String pipeGallery) { + this.pipeGallery = pipeGallery; + } + + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + public PgTextureDto(PgTexture pgTexture) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTexture.getId())); + this.setTextureCode(pgTexture.getTextureCode()); + this.setTextureName(pgTexture.getTextureName()); + this.setTextureMaterial(pgTexture.getTextureMaterial()); + this.setLayerNum(pgTexture.getLayerNum()); + this.setOwnerUnit(pgTexture.getOwnerUnit()); + this.setBuildDate(sdf.format(pgTexture.getBuildDate())); + this.setActive(String.valueOf(pgTexture.getActive())); + this.setPipeGallery(pgTexture.getPgPartitionId().getPipeGalleryId().getPgName()); + this.setPartition(pgTexture.getPgPartitionId().getParName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index f04665a..17b2517 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -9,16 +9,16 @@ */ public class PipeGalleryDto implements Serializable { - private long id; + private String id; private String pgCode;//管廊唯一编号 private String pgName;//管廊名称 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -48,6 +48,7 @@ public PipeGalleryDto(PipeGallery pipeGallery) { + this.setId(String.valueOf(pipeGallery.getId())); this.setPgCode(pipeGallery.getPgCode()); this.setPgName(pipeGallery.getPgName()); this.setActive(String.valueOf(pipeGallery.getActive())); diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java deleted file mode 100644 index 493da68..0000000 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlamrManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.devTable.manager; - -/** - * Created by yxw on 2017/10/30. - */ -public class PgAlamrManager { -} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java new file mode 100644 index 0000000..7cef94e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java @@ -0,0 +1,36 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/10/30. + */ +@Service +public class PgAlarmManager extends HibernateEntityDao { + + //获取当前报警消息列表 + public List getAllAlarm() { + Criteria criteria = createCriteria(PgAlarm.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmList = criteria.list(); + List pgAlarmDtoList = new ArrayList(); + for (PgAlarm pgAlarm : pgAlarmList) { + pgAlarmDtoList.add(new PgAlarmDto(pgAlarm)); + } + + return pgAlarmDtoList; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java new file mode 100644 index 0000000..10408fe --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java @@ -0,0 +1,50 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgAlarmTypeManager extends HibernateEntityDao { + + //获取当前报警类型列表 + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + List pgAlarmTypeDtoList = new ArrayList(); + for (PgAlarmType pgAlarmType : pgAlarmTypeList) { + pgAlarmTypeDtoList.add(new PgAlarmTypeDto(pgAlarmType)); + } + + return pgAlarmTypeDtoList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("alarmType", alarmType)); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + if (pgAlarmTypeList == null || pgAlarmTypeList.size() == 0) + return null; + else + return pgAlarmTypeList.get(0); + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java index 466d98d..4b13707 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java @@ -6,31 +6,44 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/10/30. */ +@Service public class PgDeviceManager extends HibernateEntityDao { - //获取当前人员列表 + //获取当前设备列表 //TODO LIST getAllDevice public List getAllDevice() { Criteria criteria = createCriteria(PgDevice.class); - criteria.add(Restrictions.eq("active",1)); + criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); - List pgDeviceList=criteria.list(); + List pgDeviceList = criteria.list(); List pgDeviceDtoList = new ArrayList(); - for (PgDevice pgDevice : pgDeviceList){ + for (PgDevice pgDevice : pgDeviceList) { pgDeviceDtoList.add(new PgDeviceDto(pgDevice)); } return pgDeviceDtoList; } + public PgDevice getDeviceBydevCode(String devCode) { + Criteria criteria=createCriteria(PgDevice.class); + criteria.add(Restrictions.eq("devCode",devCode)); + + List pgDeviceList=criteria.list(); + if(pgDeviceList.size()==0) + return null; + else + return pgDeviceList.get(0); + } } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java new file mode 100644 index 0000000..bc247ea --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java @@ -0,0 +1,61 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PgPartitionManager extends HibernateEntityDao { + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + public PgPartition getPartitionByParName(String parName,PipeGallery pipeGallery) { + if(pipeGallery==null) + return null; + Criteria criteria = getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("parName", parName)); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + //TODO LIST:为空判断 pgPartitionList==null? + if (pgPartitionList != null && pgPartitionList.size() > 0) + return pgPartitionList.get(0); + else + return null; + } + + public List getPartitionByPG(String pgName){ + PipeGallery pipeGallery=pipeGalleryManager.getPipeGalleryByPPgName(pgName); + + Criteria criteria=getSession().createCriteria(PgPartition.class); + criteria.add(Restrictions.eq("pipeGalleryId",pipeGallery)); + + List pgPartitionList = criteria.list(); + + List pgPartitionDtoList=new ArrayList(); + for(PgPartition pgPartition:pgPartitionList) + { + pgPartitionDtoList.add(new PgPartitionDto(pgPartition)); + } + + return pgPartitionDtoList; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java index 9dd444d..00a11c9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java @@ -1,7 +1,29 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineManager { +@Service +public class PgPipeLineManager extends HibernateEntityDao { + + public PgPipeLine getPipeLineBylineCode(String lineCode) { + Criteria criteria=createCriteria(PgPipeLine.class); + criteria.add(Restrictions.eq("lineCode", lineCode)); + + List pgPipeLineList =criteria.list(); + if(pgPipeLineList.size()==0) + return null; + else + return pgPipeLineList.get(0); + } + + } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java index 97b69c3..07bdf4b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgTextureManager.java @@ -1,7 +1,33 @@ package com.casic.PgInterface.devTable.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PgTexture; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * Created by yxw on 2017/10/30. */ -public class PgTextureManager { -} +@Service +public class PgTextureManager extends HibernateEntityDao { + + public PgTexture getPgTextureByCode(String textureCode) { + Criteria criteria = getSession().createCriteria(PgTexture.class); + criteria.add(Restrictions.eq("textureCode", textureCode)); + criteria.add(Restrictions.eq("active",1)); + + List pgTextureList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pgTextureList == null || pgTextureList.size() == 0) + return null; + else + return pgTextureList.get(0); + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java new file mode 100644 index 0000000..b2b2a3c --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java @@ -0,0 +1,51 @@ +package com.casic.PgInterface.devTable.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Created by yxw on 2017/11/4. + */ +@Service +public class PipeGalleryManager extends HibernateEntityDao { + + public PipeGallery getPipeGalleryByPPgName(String pgName) { + Criteria criteria = getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("pgName", pgName)); + criteria.add(Restrictions.eq("active",1)); + + List pipeGalleryList = criteria.list(); + + //TODO LIST:为空判断 pipeGalleryList==null? + if (pipeGalleryList != null && pipeGalleryList.size() > 0) + return pipeGalleryList.get(0); + else + return null; + } + + public List getPIpeGalleryDtoList() + { + Criteria criteria=getSession().createCriteria(PipeGallery.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pipeGalleryList=new ArrayList(); + if(pipeGalleryList.size()==0||pipeGalleryList==null) + return null; + List pipeGalleryDtoList=new ArrayList(); + for(PipeGallery pipeGallery:pipeGalleryList) { + pipeGalleryDtoList.add(new PipeGalleryDto(pipeGallery)); + } + return pipeGalleryDtoList; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java index f841371..8a5ae58 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java @@ -12,7 +12,7 @@ */ @Entity @Table(name = "PG_LOG") -@SequenceGenerator(name = "SEQ_PG_LOG", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_LOG_ID", sequenceName = "SEQ_PG_LOG_ID",allocationSize=1,initialValue=1) public class PgLog implements Serializable { private static final long serialVersionUID = 1L; private long id; diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java index 04c3f29..4661e1f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgPatroler.java @@ -11,7 +11,7 @@ */ @Entity @Table(name = "PG_PATROL") -@SequenceGenerator(name = "SEQ_PG_PATROL", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_PATROL_ID", sequenceName = "SEQ_PG_PATROL_ID",allocationSize=1,initialValue=1) public class PgPatroler implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 5f241f2..0e98ded 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -10,17 +10,17 @@ */ public class PgLogDto implements Serializable { - private long id; + private String id; private String operate;//操作 private String operateTime;//时间 private String userName;//操作人员 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -59,6 +59,7 @@ public PgLogDto(PgLog pgLog) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + this.setId(String.valueOf(pgLog.getId())); this.setOperate(pgLog.getOperate()); this.setUserName(pgLog.getPatrolerId().getUserName()); this.setOperateTime(sdf.format(pgLog.getOperateTime())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java index ed54c13..22bec22 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolerDto.java @@ -9,7 +9,7 @@ */ public class PgPatrolerDto implements Serializable { - private long id; + private String id; private String userName;//用户名 private String password;//密码 private String department;//部门 @@ -17,11 +17,11 @@ private String phoneNumber;//电话 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } @@ -75,6 +75,7 @@ public PgPatrolerDto(PgPatroler pgPatroler) { + this.setId(String.valueOf(pgPatroler.getId())); this.setUserName(pgPatroler.getUserName()); this.setPassword(pgPatroler.getPassword()); this.setDepartment(pgPatroler.getDepartment()); diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java index 64c816d..f4e48c6 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java @@ -1,7 +1,68 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgLogManager { +@Service +public class PgLogManager extends HibernateEntityDao { + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + //获取当前设备列表 + //TODO LIST getAllLOgs + public List getAllLogs(String userName,String startTime,String endTime) { + + try { + Criteria criteria = createCriteria(PgLog.class); + if (StringUtils.isNotBlank(userName)) { + criteria.add(Restrictions.eq("patrolerId", pgPatrolerManager.getPatrolerByuserName(userName))); + } + + if (StringUtils.isNotBlank(startTime)) { + criteria.add(Restrictions.ge("operateTime", DateUtils.sdf4.parse(startTime))); + } + if (StringUtils.isNotBlank(endTime)) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endTime)); + calendar.add(Calendar.DATE, 1); + criteria.add(Restrictions.le("time", calendar.getTime())); + } + + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgLogList = criteria.list(); + List pgLogDtoList = new ArrayList(); + for (PgLog pgLog : pgLogList) { + pgLogDtoList.add(new PgLogDto(pgLog)); + } + + return pgLogDtoList; + }catch(Exception e) + { + return null; + } + } + + } diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java index 5dd0818..865f2e8 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolerManager.java @@ -1,7 +1,62 @@ package com.casic.PgInterface.patroler.manager; +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + /** * Created by yxw on 2017/11/2. */ -public class PgPatrolerManager { +@Service +public class PgPatrolerManager extends HibernateEntityDao { + + //获取当前人员列表 + //TODO LIST List getAll() + public List getAllPatroler() { + + Criteria criteria = createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active",1)); + criteria.addOrder(Order.desc("id")); + + List pgPatrolerList=criteria.list(); + List pgPatrolerDtoList = new ArrayList(); + for (PgPatroler pgPatroler : pgPatrolerList){ + pgPatrolerDtoList.add(new PgPatrolerDto(pgPatroler)); + } + + return pgPatrolerDtoList; + } + + //查询人员是否存在 + public boolean userNameIsExits(String userName) + { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.add(Restrictions.eq("userName", userName)); + if (getCount(criteria) > 0) { + return true; + } + return false; + } + + public PgPatroler getPatrolerByuserName(String userName) { + Criteria criteria = getSession().createCriteria(PgPatroler.class); + criteria.add(Restrictions.eq("userName", userName)); + criteria.add(Restrictions.eq("active",1)); + List pgPatrolers = criteria.list(); + + //TODO LIST:为空判断 patrolers==null? + if (pgPatrolers != null && pgPatrolers.size() > 0) + return pgPatrolers.get(0); + else + return null; + } + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java index fbe3890..8a15d78 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java @@ -1,5 +1,9 @@ package com.casic.PgInterface.reservePlan.domain; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import javax.persistence.*; import java.io.Serializable; @@ -8,16 +12,16 @@ */ @Entity @Table(name = "PG_RESERVE_PLAN") -@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) +@SequenceGenerator(name = "SEQ_PG_RESERVE_PLAN_ID", sequenceName = "SEQ_PG_RESERVE_PLAN_ID",allocationSize=1,initialValue=1) public class PgReservePlan implements Serializable { private static final long serialVersionUID = 1L; private long id; - private String palnName;//预案名称 + private String planName;//预案名称 private String planType;//预案类型 - private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private int active;//状态位 + private PgAlarmType pgAlarmTypeId;//报警类型 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_RESERVE_PLAN_ID") @@ -30,12 +34,12 @@ } @Column(name = "PLAN_NAME") - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } @Column(name = "PLAN_TYPE") @@ -47,13 +51,15 @@ this.planType = planType; } - @Column(name = "ALARM_TYPE") - public String getAlarmType() { - return alarmType; + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "ALARMTYPEID") + public PgAlarmType getPgAlarmTypeId() { + return pgAlarmTypeId; } - public void setAlarmType(String alarmType) { - this.alarmType = alarmType; + public void setPgAlarmTypeId(PgAlarmType pgAlarmTypeId) { + this.pgAlarmTypeId = pgAlarmTypeId; } @Column(name = "RESUNIT") @@ -82,4 +88,6 @@ public void setActive(int active) { this.active = active; } + + } diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 1132aa5..bac1984 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -9,28 +9,28 @@ */ public class PgReservePlanDto implements Serializable { - private long id; - private String palnName;//预案名称 + private String id; + private String planName;//预案名称 private String planType;//预案类型 private String alarmType;//报警类型 private String resUnit;//责任单位 private String planFiel;//预案文档 private String active;//状态位 - public long getId() { + public String getId() { return id; } - public void setId(long id) { + public void setId(String id) { this.id = id; } - public String getPalnName() { - return palnName; + public String getPlanName() { + return planName; } - public void setPalnName(String palnName) { - this.palnName = palnName; + public void setPlanName(String planName) { + this.planName = planName; } public String getPlanType() { @@ -75,9 +75,9 @@ public PgReservePlanDto(PgReservePlan pgReservePlan) { - this.setPalnName(pgReservePlan.getPalnName()); + this.setPlanName(pgReservePlan.getPlanName()); this.setPlanType(pgReservePlan.getPlanType()); - this.setAlarmType(pgReservePlan.getAlarmType()); + this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType()); this.setResUnit(pgReservePlan.getResUnit()); this.setPlanFiel(pgReservePlan.getPlanFiel()); this.setActive(String.valueOf(pgReservePlan.getActive())); diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java deleted file mode 100644 index 7365b90..0000000 --- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReserveManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.casic.PgInterface.reservePlan.manager; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgReserveManager { -} diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java new file mode 100644 index 0000000..bd8136f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java @@ -0,0 +1,62 @@ +package com.casic.PgInterface.reservePlan.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.sun.org.apache.xml.internal.security.utils.Base64; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import org.springframework.web.multipart.MultipartFile; +import sun.misc.BASE64Decoder; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.FileOutputStream; +import java.util.List; + +/** + * Created by yxw on 2017/11/8. + */ +@Service +public class PgReservePlanManager extends HibernateEntityDao { + + public String saveFiles(List files,String fileType){ + String [] fileNames = new String[files.size()]; + String [] fileBuffers = new String[files.size()]; + try { + for (int i = 0; i < files.size(); i++) { + fileNames[i] = files.get(i).getOriginalFilename(); + byte[] fis = files.get(i).getBytes(); + fileBuffers[i] = new String(Base64.encode(fis, Base64.BASE64DEFAULTLENGTH)); + } + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String strDirPath = request.getSession().getServletContext().getRealPath(""); + + FileOutputStream fos = null; + String image_toDir = strDirPath + "\\"+fileType;//存储路径 + String imageName = ""; + for (int i = 0; i < fileBuffers.length; i++) { + if (fileBuffers[i] != null && fileNames[i] != null) { + imageName += fileType+"/"+fileNames[i] + ","; + byte[] buffer = new BASE64Decoder().decodeBuffer(fileBuffers[i]);//对android传过来的图片字符串进行解码 + File destDir = new File(image_toDir); + if (!destDir.exists()) + destDir.mkdirs(); + File imageFile = new File(destDir, fileNames[i]); + fos = new FileOutputStream(imageFile);//保存图片 + fos.write(buffer); + fos.flush(); + fos.close(); + } + } + return imageName.substring(0,imageName.length()-1); + } + catch(Exception ex) + { + ex.printStackTrace(); + return ""; + } + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java new file mode 100644 index 0000000..c93e491 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -0,0 +1,168 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarm; +import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.manager.PgAlarmManager; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgAlarm") +public class PgAlarmRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + private PgAlarmManager pgAlarmManager; + + private PgPatrolerManager pgPatrolerManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { + this.pgAlarmManager = pgAlarmManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警信息 + */ + @POST + @Path("getAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmDtoList=new ArrayList(); + try { + pgAlarmDtoList = pgAlarmManager.getAllAlarm(); + if(pgAlarmDtoList.size()==0) + msg="没有报警信息"; + else + msg="报警信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmDtoList); + return resultMap; + } + + /** + * 消除报警信息 + */ + @POST + @Path("clearAlarmInfo") + @Produces(MediaType.APPLICATION_JSON) + public Map clearAlarmList(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarm pgAlarm=new PgAlarm(); + pgAlarm=pgAlarmManager.get(id); + if(pgAlarm==null) { + msg = "不存在该报警信息"; + result="false"; + } + else + { + pgAlarm.setActive(0); + pgAlarmManager.save(pgAlarm); + msg="报警信息清除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警信息清除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + /** + * 新增报警 + */ + @POST + @Path("addAlarm") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("alarmTypeId") String alarmTypeId, + @FormParam("alarmValue") String alarmValue, + @FormParam("alarmDate") String alarmDate, + @FormParam("description") String description, + @FormParam("devCode") String devCode, + @FormParam("userName") String userName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + PgAlarm pgAlarm = new PgAlarm(); + if (!pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "不存在该用户!"; + } else { + pgAlarm.setAlarmTypeId(pgAlarmTypeManager.get(alarmTypeId)); + pgAlarm.setAlarmValue(alarmValue); + pgAlarm.setAlarmDate(sdf.parse(alarmDate)); + pgAlarm.setDescription(description); + pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); + pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + + logger.info("成功保存"); + pgAlarmManager.save(pgAlarm); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java new file mode 100644 index 0000000..02c81aa --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTypeDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgAlarmType") +public class PgAlarmTypeRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + /** + * 获取报警类型 + */ + @POST + @Path("getAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgAlarmTypeDtoList=new ArrayList(); + try { + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + if(pgAlarmTypeDtoList.size()==0) + msg="没有报警类型信息"; + else + msg="报警类型信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgAlarmTypeDtoList); + return resultMap; + } + + /** + * 新增报警类型 + */ + @POST + @Path("addAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarmType(@FormParam("alarmType") String alarmType)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgAlarmType pgAlarmType = new PgAlarmType(); + pgAlarmType.setAlarmType(alarmType); + pgAlarmType.setActive(1); + logger.info("成功保存"); + + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + /** + * 编辑报警类型 + */ + @POST + @Path("editAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map editAlarmType(@FormParam("id") String id, + @FormParam("alarmType") String alarmType)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try{ + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + pgAlarmType.setAlarmType(alarmType); + pgAlarmTypeManager.save(alarmType); + result = "true"; + msg = "编辑成功"; + } + catch(Exception e) + { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + + resultMap.put("result",result); + resultMap.put("msg",msg); + + return resultMap; + } + + + /** + * 删除报警类型 + */ + @POST + @Path("deleteAlarmType") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteAlarmType(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgAlarmType pgAlarmType=pgAlarmTypeManager.get(id); + if(pgAlarmType==null) { + msg = "不存在该报警类型信息"; + result="false"; + } + else + { + pgAlarmType.setActive(0); + pgAlarmTypeManager.save(pgAlarmType); + msg="报警类型删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="报警类型删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 0900b63..8b81073 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -1,16 +1,23 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import javax.ws.rs.FormParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -20,23 +27,60 @@ * Created by yxw on 2017/11/2. */ @Component -@Path("PgDeviceResource") +@Path("pgDevice") public class PgDeviceRs { private static Logger logger = LoggerFactory.getLogger(PgDeviceRs.class); private PgDeviceManager pgDeviceManager; + private PgPartitionManager pgPartitionManager; + + private PipeGalleryManager pipeGalleryManager; + @Resource public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { this.pgDeviceManager = pgDeviceManager; } + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + /** - * 显示人员列表 + * 获取设备信息 */ @POST - @Path("getPgDeviceResource") + @Path("getPgDeviceByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String devCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgDeviceDto pgDeviceDto=null; + try { + PgDevice pgDevice = pgDeviceManager.getDeviceBydevCode(devCode); + pgDeviceDto=new PgDeviceDto(pgDevice); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgDeviceDto); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgDevice") @Produces(MediaType.APPLICATION_JSON) public Map getDeviceList()throws Exception { Map resultMap = new HashMap(); @@ -57,5 +101,142 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgDevice pgDevice = new PgDevice(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + pgDevice.setActive(1); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑设备信息 + */ + @POST + @Path("editDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("devCode") String devCode, + @FormParam("devName") String devName, + @FormParam("brand") String brand, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("installDate") String installDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgDevice pgDevice = pgDeviceManager.get(id); + pgDevice.setDevCode(devCode); + pgDevice.setDevName(devName); + pgDevice.setBrand(brand); + pgDevice.setOwnerUnit(ownerUnit); + pgDevice.setInstallDate(sdf.parse(installDate)); + pgDevice.setPgPartitionId(pgPartition); + + pgDeviceManager.save(pgDevice); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deleteDevice") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgDevice pgDevice=pgDeviceManager.get(id); + if(pgDevice==null) { + msg = "不存在该设备信息"; + result="false"; + } + else + { + pgDevice.setActive(0); + pgDeviceManager.save(pgDevice); + msg="设备删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java new file mode 100644 index 0000000..66d0822 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.patroler.domain.PgLog; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgLogDto; +import com.casic.PgInterface.patroler.manager.PgLogManager; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgLog") +public class PgLogRs { + + private static Logger logger = LoggerFactory.getLogger(PgLogRs.class); + + private PgLogManager pgLogManager; + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgLogManager(PgLogManager pgLogManager) { + this.pgLogManager = pgLogManager; + } + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 新增日志 + */ + @POST + @Path("addLog") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("userName") String userName, + @FormParam("operate") String operate, + @FormParam("operateTime") String operateTime) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgLog pgLog=new PgLog(); + try { + PgPatroler pgPatroler = new PgPatroler(); + pgPatroler = pgPatrolerManager.getPatrolerByuserName(userName); + + pgLog.setPatrolerId(pgPatroler); + pgLog.setOperate(operate); + pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setActive(1); + + pgLogManager.save(pgLog); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 显示设备列表 + */ + @POST + @Path("getPgLog") + @Produces(MediaType.APPLICATION_JSON) + public Map getLogList(@FormParam("userName") String userName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime) + throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgLogDtoList = new ArrayList(); + try { + pgLogDtoList = pgLogManager.getAllLogs(userName, startTime, endTime); + if (pgLogDtoList == null || pgLogDtoList.size() == 0) + msg = "没有找到日志信息"; + else + msg = "日志信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "日志信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgLogDtoList); + return resultMap; + } + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java new file mode 100644 index 0000000..4774573 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java @@ -0,0 +1,189 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPartitionDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pgPartition") +public class PgPartitionRs { + + private static Logger logger = LoggerFactory.getLogger(PgPartitionRs.class); + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 新增分区 + */ + @POST + @Path("addPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map addAlarm(@FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPartition pgPartition = new PgPartition(); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGalleryManager.getPipeGalleryByPPgName(pgName)); + pgPartition.setActive(1); + + logger.info("成功保存"); + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + *获取管廊仓下的分区列表 + */ + @POST + @Path("getPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map getPartitionList(@FormParam("pgName") String pgName)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPartitionDtoList=new ArrayList(); + try { + pgPartitionDtoList=pgPartitionManager.getPartitionByPG(pgName); + if(pgPartitionDtoList.size()==0) + msg="没有分区信息"; + else + msg="分区信息获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="分区信息获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPartitionDtoList); + return resultMap; + } + + private String parCode;//分区唯一编号 + private String parName;//分区名称 + private PipeGallery pipeGalleryId;//管廊仓 + private int active;//状态位 + + + @POST + @Path("editPartition") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("parCode") String parCode, + @FormParam("parName") String parName, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PgPartition partition=new PgPartition(); + + try { + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + PgPartition pgPartition=pgPartitionManager.get(id); + pgPartition.setParCode(parCode); + pgPartition.setParName(parName); + pgPartition.setPipeGalleryId(pipeGallery); + pgPartition.setActive(1); + + pgPartitionManager.save(pgPartition); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + + /** + * 删除分区信息 + */ + @POST + @Path("deletePartition") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePartition(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPartition pgPartition=pgPartitionManager.get(id); + if(pgPartition==null) { + msg = "不存在该分区信息"; + result="false"; + } + else + { + pgPartition.setActive(0); + pgPartitionManager.save(pgPartition); + msg="设备分区成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备分区失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java new file mode 100644 index 0000000..1610c07 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolerRs.java @@ -0,0 +1,179 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.patroler.domain.PgPatroler; +import com.casic.PgInterface.patroler.dto.PgPatrolerDto; +import com.casic.PgInterface.patroler.manager.PgPatrolerManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/4. + */ +@Component +@Path("pgPatroler") +public class PgPatrolerRs { + + private static Logger logger = LoggerFactory.getLogger(PgPatrolerRs.class); + + private PgPatrolerManager pgPatrolerManager; + + @Resource + public void setPgPatrolerManager(PgPatrolerManager pgPatrolerManager) { + this.pgPatrolerManager = pgPatrolerManager; + } + + /** + * 显示人员列表 + */ + @POST + @Path("getPatrolerList") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolerList()throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgPatrolerDtoList=new ArrayList(); + try { + pgPatrolerDtoList = pgPatrolerManager.getAllPatroler(); + if(pgPatrolerDtoList.size()==0) + msg="没有找到人员信息"; + else + msg="获取成功"; + }catch(Exception e){ + e.printStackTrace(); + msg="获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgPatrolerDtoList); + return resultMap; + } + + /** + * 新增人员 + */ + @POST + @Path("addPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map addPatroler(@FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgPatroler pgPatroler = new PgPatroler(); + if (pgPatrolerManager.userNameIsExits(userName)) { + result = "false"; + msg = "用户名已经存在!"; + } else { + pgPatroler.setUserName(userName); + String pass = StringUtils.getMD5(password); + pgPatroler.setPassword(pass); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatroler.setActive(1); + logger.info("成功保存"); + + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + /** + * 编辑人员 + */ + @POST + @Path("editPatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map editPartition(@FormParam("id") String id, + @FormParam("userName") String userName, + @FormParam("password") String password, + @FormParam("department") String department, + @FormParam("post") String post, + @FormParam("phoneNumber") String phoneNumber) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try { + PgPatroler pgPatroler = pgPatrolerManager.get(id); + pgPatroler.setUserName(userName); + pgPatroler.setPassword(password); + pgPatroler.setDepartment(department); + pgPatroler.setPost(post); + pgPatroler.setPhoneNumber(phoneNumber); + pgPatrolerManager.save(pgPatroler); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除设备信息 + */ + @POST + @Path("deletePatroler") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteDevice(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPatroler pgPatroler=pgPatrolerManager.get(id); + if(pgPatroler==null) { + msg = "不存在该人员信息"; + result="false"; + } + else + { + pgPatroler.setActive(0); + pgPatrolerManager.save(pgPatroler); + msg="设备人员成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备人员失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java new file mode 100644 index 0000000..ce12696 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java @@ -0,0 +1,222 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgPipeLine; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgPipeLineDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgPipeLineManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Component +@Path("pgPipeLine") +public class PgPipeLineRs { + + private static Logger logger = LoggerFactory.getLogger(PgPipeLineRs.class); + + private PgPipeLineManager pgPipeLineManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgPipeLineManager(PgPipeLineManager pgPipeLineManager) { + this.pgPipeLineManager = pgPipeLineManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管线信息 + */ + @POST + @Path("getPipeLineByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgDevice(String lineCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgPipeLineDto pgPipeLineDto=null; + try { + PgPipeLine pgPipeLine = pgPipeLineManager.getPipeLineBylineCode(lineCode); + pgPipeLineDto=new PgPipeLineDto(pgPipeLine); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgPipeLineDto); + return resultMap; + } + + /** + * 新增管线 + */ + @POST + @Path("addPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgPipeLine pgPipeLine=new PgPipeLine(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } + else { + try { + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "保存成功"; + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管线 + */ + @POST + @Path("editPipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeLine(@FormParam("id") String id, + @FormParam("lineCode") String lineCode, + @FormParam("lineType") String lineType, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("enterDate") String enterDate, + @FormParam("layerNum") String layerNum, + @FormParam("diameter") String diameter, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgPipeLine pgPipeLine = pgPipeLineManager.get(id); + + pgPipeLine.setLineCode(lineCode); + pgPipeLine.setLineType(lineType); + pgPipeLine.setOwnerUnit(ownerUnit); + pgPipeLine.setEnterDate(sdf.parse(enterDate)); + pgPipeLine.setLayerNum(layerNum); + pgPipeLine.setDiameter(diameter); + pgPipeLine.setPgPartitionId(pgPartition); + pgPipeLine.setActive(1); + + pgPipeLineManager.save(pgPipeLine); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管线 + */ + @POST + @Path("deletePipeLine") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeLine(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgPipeLine pgPipeLine=pgPipeLineManager.get(id); + if(pgPipeLine==null) { + msg = "不存在该管线信息"; + result="false"; + } + else + { + pgPipeLine.setActive(0); + pgPipeLineManager.save(pgPipeLine); + msg="管线删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管线删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java new file mode 100644 index 0000000..4ca31a3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java @@ -0,0 +1,68 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.manager.PgSenseDevManager; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/3. + */ +@Component +@Path("pgSenseDev") +public class PgSenseDevRs { + private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); + + private PgSenseDevManager pgSenseDevManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { + this.pgSenseDevManager = pgSenseDevManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 查询监测数据 + */ + @POST + @Path("getSenseDataByRegion") + @Produces(MediaType.APPLICATION_JSON) + public Map getSenseData(@FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + Map resultMap = new HashMap(); + + + + + + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java new file mode 100644 index 0000000..a8a0e2d --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTextureRs.java @@ -0,0 +1,216 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PgPartition; +import com.casic.PgInterface.devTable.domain.PgTexture; +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PgTextureDto; +import com.casic.PgInterface.devTable.manager.PgPartitionManager; +import com.casic.PgInterface.devTable.manager.PgTextureManager; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.text.SimpleDateFormat; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by yxw on 2017/11/7. + */ +@Component +@Path("pgTexture") +public class PgTextureRs { + + private static Logger logger = LoggerFactory.getLogger(PgTextureRs.class); + + private PgTextureManager pgTextureManager; + + private PipeGalleryManager pipeGalleryManager; + + private PgPartitionManager pgPartitionManager; + + @Resource + public void setPgTextureManager(PgTextureManager pgTextureManager) { + this.pgTextureManager = pgTextureManager; + } + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + @Resource + public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { + this.pgPartitionManager = pgPartitionManager; + } + + /** + * 获取管廊部件信息 + */ + @POST + @Path("getPgTextureByCode") + @Produces(MediaType.APPLICATION_JSON) + public Map getPgTexture(String textureCode) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + PgTextureDto pgTextureDto=null; + try { + PgTexture pgTexture = pgTextureManager.getPgTextureByCode(textureCode); + pgTextureDto=new PgTextureDto(pgTexture); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pgTextureDto); + return resultMap; + } + + /** + * 新增管廊部件 + */ + @POST + @Path("addTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map addLog(@FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) + throws Exception { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PgTexture pgTexture = new PgTexture(); + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setPgPartitionId(pgPartition); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + resultMap.put("success", result); + resultMap.put("msg", msg); + } + return resultMap; + } + + /** + * 编辑管廊部件 + */ + @POST + @Path("editTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map editTexture(@FormParam("id") String id, + @FormParam("textureCode") String textureCode, + @FormParam("textureName") String textureName, + @FormParam("textureMaterial") String textureMaterial, + @FormParam("layerNum") String layerNum, + @FormParam("ownerUnit") String ownerUnit, + @FormParam("buildDate") String buildDate, + @FormParam("pgName") String pgName, + @FormParam("parName") String parName) throws Exception { + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + PipeGallery pipeGallery = pipeGalleryManager.getPipeGalleryByPPgName(pgName); + PgPartition pgPartition = pgPartitionManager.getPartitionByParName(parName, pipeGallery); + if (pgPartition == null) { + result = "false"; + msg = "不存在管廊仓和分区信息"; + } else { + try { + PgTexture pgTexture=pgTextureManager.get(id); + pgTexture.setTextureCode(textureCode); + pgTexture.setTextureName(textureName); + pgTexture.setTextureMaterial(textureMaterial); + pgTexture.setLayerNum(layerNum); + pgTexture.setOwnerUnit(ownerUnit); + pgTexture.setBuildDate(sdf.parse(buildDate)); + pgTexture.setActive(1); + + pgTextureManager.save(pgTexture); + result = "true"; + msg = "编辑成功"; + + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + } + return resultMap; + } + + /** + * 删除管廊部件 + */ + @POST + @Path("deleteTexture") + @Produces(MediaType.APPLICATION_JSON) + public Map deleteTexture(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PgTexture pgTexture=pgTextureManager.get(id); + if(pgTexture==null) { + msg = "不存在该部件信息"; + result="false"; + } + else + { + pgTexture.setActive(0); + pgTextureManager.save(pgTexture); + msg="部件删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="部件删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java new file mode 100644 index 0000000..d390ad0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java @@ -0,0 +1,161 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.domain.PipeGallery; +import com.casic.PgInterface.devTable.dto.PipeGalleryDto; +import com.casic.PgInterface.devTable.manager.PipeGalleryManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/6. + */ +@Component +@Path("pipeGallery") +public class PipeGalleryRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PipeGalleryManager pipeGalleryManager; + + @Resource + public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { + this.pipeGalleryManager = pipeGalleryManager; + } + + /** + * 获取管廊信息 + */ + @POST + @Path("getPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map getPipeGallery() throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pipeGalleryDtoList = new ArrayList(); + try { + pipeGalleryDtoList = pipeGalleryManager.getPIpeGalleryDtoList(); + msg = "获取成功"; + } catch (Exception e) { + msg = "获取失败"; + e.printStackTrace(); + } + resultMap.put("msg", msg); + resultMap.put("result", pipeGalleryDtoList); + return resultMap; + } + + /** + * 新增管廊 + */ + @POST + @Path("addPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map addPipeGallery(@FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + PipeGallery pipeGallery = new PipeGallery(); + try { + pipeGallery.setPgCode(pgCode); + pipeGallery.setPgName(pgName); + pipeGallery.setActive(1); + logger.info("成功保存"); + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "保存成功"; + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + /* + *编辑管廊信息 + */ + @POST + @Path("editPipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map editPipeGallery(@FormParam("id") String id, + @FormParam("pgCode") String pgCode, + @FormParam("pgName") String pgName) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PipeGallery pipeGallery = pipeGalleryManager.get(id); + if (pipeGallery == null) { + result = "false"; + msg = "不存在该管廊信息"; + } else { + pipeGallery.setPgName(pgName); + pipeGallery.setPgCode(pgCode); + pipeGallery.setActive(1); + + pipeGalleryManager.save(pipeGallery); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + /** + * 删除管廊信息 + */ + @POST + @Path("deletePipeGallery") + @Produces(MediaType.APPLICATION_JSON) + public Map deletePipeGallery(@FormParam("id") String id)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try { + PipeGallery pipeGallery=pipeGalleryManager.get(id); + if(pipeGallery==null) { + msg = "不存在该管廊信息"; + result="false"; + } + else + { + pipeGallery.setActive(0); + pipeGalleryManager.save(pipeGallery); + msg="管廊删除成功"; + result="true"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="管廊删除失败"; + result="false"; + } + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java new file mode 100644 index 0000000..40cb69f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rsFiles/web/PgReserveController.java @@ -0,0 +1,158 @@ +package com.casic.PgInterface.rsFiles.web; + +import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; +import com.casic.PgInterface.reservePlan.domain.PgReservePlan; +import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/8. + */ +@Controller +@RequestMapping("rs/pgReservePlan") +public class PgReserveController { + + private static Logger logger = LoggerFactory.getLogger(PgReservePlan.class); + + private PgReservePlanManager pgReservePlanManager; + + private PgAlarmTypeManager pgAlarmTypeManager; + + @Resource + public void setPgReservePlanManager(PgReservePlanManager pgReservePlanManager) { + this.pgReservePlanManager = pgReservePlanManager; + } + + @Resource + public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) { + this.pgAlarmTypeManager = pgAlarmTypeManager; + } + + //新增预案文档 + @RequestMapping("addReservePlan") + @ResponseBody + public Map addReservePlan(@RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType, + @RequestParam(value = "planFiels",required =false) List planFiels) + throws Exception { + Map resultMap = new HashMap(); + PgReservePlan pgReservePlan = new PgReservePlan(); + String result = ""; + String msg = ""; + + try { + if (planFiels.size() == 0) + pgReservePlan.setPlanFiel(""); + else { + pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiels, "reservePlan")); + } + + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + result = "true"; + msg = "保存成功"; + logger.info("保存成功"); + pgReservePlanManager.save(pgReservePlan); + } catch (Exception ex) { + result = "false"; + msg = "保存失败"; + ex.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + return resultMap; + } + + //编辑预案文档 + @RequestMapping("editReservePlan") + @ResponseBody + public Map editReservePlan(@FormParam("id") String id, + @RequestParam(value = "planName",required = true) String planName, + @RequestParam(value = "planType",required =false) String planType, + @RequestParam(value ="resUnit",required =false) String resUnit, + @RequestParam(value ="alarmType",required =false) String alarmType) throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + PgReservePlan pgReservePlan = pgReservePlanManager.get(id); + if (pgReservePlan == null) { + result = "false"; + msg = "不存在该预案信息"; + } else { + pgReservePlan.setPlanName(planName); + pgReservePlan.setPlanType(planType); + pgReservePlan.setResUnit(resUnit); + pgReservePlan.setPgAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)); + pgReservePlan.setActive(1); + + pgReservePlanManager.save(pgReservePlan); + result = "true"; + msg = "编辑成功"; + } + } catch (Exception e) { + result = "false"; + msg = "编辑失败"; + e.printStackTrace(); + } + return resultMap; + } + + //删除预案文档 + @RequestMapping("deleteReservePlan") + @ResponseBody + public Map deleteReservePlan(@FormParam("id") String id)throws Exception{ + Map resultMap = new HashMap(); + String msg=""; + String result="false"; + + try{ + + PgReservePlan pgReservePlan=pgReservePlanManager.get(id); + if(pgReservePlan==null) + { + result="false"; + msg="不存在该预案信息"; + } + else{ + pgReservePlan.setActive(0); + pgReservePlanManager.save(pgReservePlan); + result="true"; + msg="删除成功"; + } + } + catch(Exception e) + { + e.printStackTrace(); + msg="预案删除失败"; + result="false"; + } + + resultMap.put("msg",msg); + resultMap.put("result",result); + return resultMap; + + } + + +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d1d2169..2240b4b 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ # ============================================================================ # application # ============================================================================ -application.domain.packages=com.casic.BRinterface +application.domain.packages=com.casic.PgInterface application.i18n.packages=org.springframework.security.messages,\ com.mossle.core.messages,\ com.mossle.user.messages,\ @@ -17,8 +17,8 @@ # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver db.default.url=jdbc:oracle:thin:@127.0.0.1:1521:szdb -db.default.username=scott -db.default.password=SZDB +db.default.username=PG +db.default.password=PG # ============================================================================ diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml index 6e3e366..2cb05ce 100644 --- a/src/main/resources/spring/applicationContext.xml +++ b/src/main/resources/spring/applicationContext.xml @@ -14,7 +14,6 @@ - @@ -35,4 +34,4 @@ - + \ No newline at end of file diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" index 48ca5e5..3bb93da 100644 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" index 9236484..d120f9c 100644 --- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" +++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" Binary files differ