代码更新

沈斌

2017-10-25 c212d4a32be33f173a1f4a58310349e98860c8d2

代码更新

 .idea/uiDesigner.xml

New file
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="Palette2">
    <group name="Swing">
      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
      </item>
      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
      </item>
      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
      </item>
      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
      </item>
      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
        <initial-values>
          <property name="text" value="Button" />
        </initial-values>
      </item>
      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
        <initial-values>
          <property name="text" value="RadioButton" />
        </initial-values>
      </item>
      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
        <initial-values>
          <property name="text" value="CheckBox" />
        </initial-values>
      </item>
      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
        <initial-values>
          <property name="text" value="Label" />
        </initial-values>
      </item>
      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
          <preferred-size width="150" height="-1" />
        </default-constraints>
      </item>
      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
          <preferred-size width="150" height="-1" />
        </default-constraints>
      </item>
      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
          <preferred-size width="150" height="-1" />
        </default-constraints>
      </item>
      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
      </item>
      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
          <preferred-size width="200" height="200" />
        </default-constraints>
      </item>
      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
          <preferred-size width="200" height="200" />
        </default-constraints>
      </item>
      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
      </item>
      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
      </item>
      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
      </item>
      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
      </item>
      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
          <preferred-size width="-1" height="20" />
        </default-constraints>
      </item>
      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
      </item>
      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
      </item>
    </group>
  </component>
</project>

 .idea/workspace.xml

@@ -7,9 +7,17 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="">
      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />
      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Monitorpoint.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java" />
      <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorpointExample.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPointExample.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MgrController.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MgrController.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MonitorPointController.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MonitorPointController.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MgrDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MgrDao.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MonitorpointDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MonitorpointDao.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MgrService.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MgrService.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MonitorpointService.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MonitorpointService.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java" />
    </list>
    <ignored path="$PROJECT_DIR$/out/" />
    <ignored path="$PROJECT_DIR$/target/" />
@@ -22,11 +30,11 @@
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file leaf-file-name="Listener.java" pinned="false" current-in-tab="true">
      <file leaf-file-name="Listener.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="2888">
              <caret line="230" column="47" lean-forward="false" selection-start-line="230" selection-start-column="47" selection-end-line="230" selection-end-column="47" />
            <state relative-caret-position="158">
              <caret line="48" column="56" lean-forward="false" selection-start-line="48" selection-start-column="56" selection-end-line="48" selection-end-column="56" />
              <folding>
                <element signature="imports" expanded="true" />
                <element signature="e#2778#2796#0" expanded="true" />
@@ -53,9 +61,42 @@
      <file leaf-file-name="quartz.xml" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="702">
            <state relative-caret-position="835">
              <caret line="75" column="21" lean-forward="false" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="MonitorPoint.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="479">
              <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="MonitorpointServiceImpl.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="135">
              <caret line="17" column="8" lean-forward="false" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="MgrService.java" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MgrService.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="180">
              <caret line="17" column="28" lean-forward="false" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="28" />
              <folding>
                <element signature="e#362#363#0" expanded="true" />
                <element signature="e#404#405#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
@@ -74,7 +115,7 @@
        <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="135">
              <caret line="23" column="75" lean-forward="true" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
              <caret line="23" column="75" lean-forward="false" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
              <folding />
            </state>
          </provider>
@@ -107,6 +148,7 @@
      <find>insertIntoequipment</find>
      <find>updateFromequipmentBymac</find>
      <find>jedis</find>
      <find>Monitorpoint</find>
    </findStrings>
  </component>
  <component name="Git.Settings">
@@ -133,6 +175,8 @@
        <option value="$PROJECT_DIR$/src/main/resources/quartz.xml" />
        <option value="$PROJECT_DIR$/pom.xml" />
        <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java" />
      </list>
    </option>
  </component>
@@ -177,41 +221,6 @@
            <path>
              <item name="task" type="b2602c69:ProjectViewProjectNode" />
              <item name="task" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="task" type="b2602c69:ProjectViewProjectNode" />
              <item name="task" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="task" type="b2602c69:ProjectViewProjectNode" />
              <item name="task" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="task" type="b2602c69:ProjectViewProjectNode" />
              <item name="task" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="task" type="b2602c69:ProjectViewProjectNode" />
              <item name="task" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="monitor" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="task" type="b2602c69:ProjectViewProjectNode" />
              <item name="task" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="monitor" type="462c0819:PsiDirectoryNode" />
              <item name="listener" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
@@ -445,7 +454,7 @@
      <workItem from="1508824129641" duration="250000" />
      <workItem from="1508824729673" duration="781000" />
      <workItem from="1508900264535" duration="3612000" />
      <workItem from="1508911116546" duration="4151000" />
      <workItem from="1508911116546" duration="4544000" />
    </task>
    <task id="LOCAL-00001" summary="updates">
      <created>1508484578874</created>
@@ -538,17 +547,24 @@
      <option name="project" value="LOCAL" />
      <updated>1508920155177</updated>
    </task>
    <option name="localTasksCounter" value="14" />
    <task id="LOCAL-00014" summary="updates">
      <created>1508920429528</created>
      <option name="number" value="00014" />
      <option name="presentableId" value="LOCAL-00014" />
      <option name="project" value="LOCAL" />
      <updated>1508920429528</updated>
    </task>
    <option name="localTasksCounter" value="15" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="18908000" />
    <option name="totallyTimeSpent" value="19301000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="0" y="23" width="1404" height="877" extended-state="6" />
    <layout>
      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.50293684" order="8" side_tool="true" content_ui="tabs" />
      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.685422" sideWeight="0.50587374" order="8" side_tool="true" content_ui="tabs" />
      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49706313" order="0" side_tool="false" content_ui="tabs" />
      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -564,12 +580,13 @@
      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.685422" sideWeight="0.49706313" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.45140666" sideWeight="0.4941263" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.48237884" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23348017" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -577,7 +594,6 @@
      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -625,10 +641,10 @@
  <component name="VcsManagerConfiguration">
    <MESSAGE value="修复task后台登录" />
    <MESSAGE value="运维app加密密码登录" />
    <MESSAGE value="updates" />
    <MESSAGE value="BUG-058" />
    <MESSAGE value="配置文件排版" />
    <option name="LAST_COMMIT_MESSAGE" value="配置文件排版" />
    <MESSAGE value="updates" />
    <option name="LAST_COMMIT_MESSAGE" value="updates" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@@ -637,34 +653,6 @@
    <watches-manager />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/apientity/ApiEquipment.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="75">
          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/webapp/bootbox/bootbox.min.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/DashboardDao.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-2">
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/test/java/EchoServerHandler.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="75">
          <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/test/java/EchoServer.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="75">
@@ -797,6 +785,19 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="15">
          <caret line="9" column="0" lean-forward="false" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
          <folding>
            <marker date="1507622125000" expanded="true" signature="339:380" ph="select * fro... equipment" />
            <marker date="1507622125000" expanded="true" signature="449:562" ph="UPDATE equip... " />
            <marker date="1507622125000" expanded="true" signature="627:769" ph="INSERT INTO equipment... " />
            <marker date="1507622125000" expanded="true" signature="908:969" ph="SELECT * fro... user" />
            <marker date="1507622125000" expanded="true" signature="1107:1162" ph="SELECT * fro... user" />
            <marker date="1507622125000" expanded="true" signature="1224:1271" ph="UPDATE `user... " />
            <marker date="1507622125000" expanded="true" signature="1430:1473" ph="select * fro... user" />
            <marker date="1507622125000" expanded="true" signature="1550:1596" ph="UPDATE `user... " />
            <marker date="1507622125000" expanded="true" signature="1745:1807" ph="select * fro... equipment" />
            <marker date="1507622125000" expanded="true" signature="2793:2831" ph="select * fro... equipment" />
            <marker date="1507622125000" expanded="true" signature="2958:2991" ph="select * fro... user" />
          </folding>
        </state>
      </provider>
    </entry>
@@ -804,6 +805,7 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
          <caret line="71" column="47" lean-forward="false" selection-start-line="71" selection-start-column="23" selection-end-line="71" selection-end-column="47" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -920,6 +922,7 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="134">
          <caret line="13" column="34" lean-forward="true" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -934,6 +937,7 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="309">
          <caret line="100" column="5" lean-forward="true" selection-start-line="100" selection-start-column="5" selection-end-line="100" selection-end-column="5" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -977,14 +981,6 @@
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="702">
          <caret line="75" column="21" lean-forward="false" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="102">
@@ -996,15 +992,15 @@
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="135">
          <caret line="23" column="75" lean-forward="true" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
          <caret line="23" column="75" lean-forward="false" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="2888">
          <caret line="230" column="47" lean-forward="false" selection-start-line="230" selection-start-column="47" selection-end-line="230" selection-end-column="47" />
        <state relative-caret-position="158">
          <caret line="48" column="56" lean-forward="false" selection-start-line="48" selection-start-column="56" selection-end-line="48" selection-end-column="56" />
          <folding>
            <element signature="imports" expanded="true" />
            <element signature="e#2778#2796#0" expanded="true" />
@@ -1017,6 +1013,49 @@
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.7.RELEASE/spring-context-4.3.7.RELEASE.jar!/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="68">
          <caret line="145" column="0" lean-forward="false" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="835">
          <caret line="75" column="21" lean-forward="false" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="479">
          <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="135">
          <caret line="17" column="8" lean-forward="false" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MgrService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="180">
          <caret line="17" column="28" lean-forward="false" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="28" />
          <folding>
            <element signature="e#362#363#0" expanded="true" />
            <element signature="e#404#405#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
  </component>
  <component name="masterDetails">
    <states>

 src/main/java/com/moral/monitor/controller/MgrController.java

@@ -8,7 +8,6 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.bind.annotation.ResponseBody;



import javax.annotation.Resource;

@@ -27,12 +26,12 @@
    @ResponseBody

    public Map randpoint(){



        List<Monitorpoint> randpoint = mgrService.randpoint();

        List<MonitorPoint> randpoint = mgrService.randpoint();



        LinkedHashMap<String, List<Equipment>> point_equ = new LinkedHashMap<String, List<Equipment>>();





        for (Monitorpoint point:randpoint){

        for (MonitorPoint point:randpoint){

            String name = point.getName();

            List<Equipment> equipments = mgrService.pointequ(name);

            if (equipments.size()>0){

@@ -125,13 +124,13 @@
    @ResponseBody

    public String top100(){



        List<Monitorpoint> randpoint = mgrService.allpoint();

        List<MonitorPoint> randpoint = mgrService.allpoint();



        LinkedHashMap<String, List<Equipment>> point_equ = new LinkedHashMap<String, List<Equipment>>();







        for (Monitorpoint point:randpoint){

        for (MonitorPoint point:randpoint){

            String name = point.getName();

            List<Equipment> equipments = mgrService.pointequ(name);

            if (equipments.size()>0){


 src/main/java/com/moral/monitor/controller/MonitorPointController.java

@@ -1,6 +1,6 @@
package com.moral.monitor.controller;



import com.moral.monitor.entity.Monitorpoint;

import com.moral.monitor.entity.MonitorPoint;

import com.moral.monitor.entity.QueryHelper;

import com.moral.monitor.service.MonitorpointService;

import org.apache.commons.logging.Log;

@@ -36,7 +36,7 @@
        }



        LinkedHashMap<String, Object> s = new LinkedHashMap<String, Object>();

        List<Monitorpoint> equs = monitorPointService.allMonitorpoint(queryHelper);

        List<MonitorPoint> equs = monitorPointService.allMonitorpoint(queryHelper);

        s.put("rows",equs);



        int total = monitorPointService.monitorCount(queryHelper);

@@ -69,7 +69,7 @@


    @RequestMapping("/addMonitorpoint")

    @ResponseBody

    public String addMonitorpoint(@RequestBody Monitorpoint monitorPoint){

    public String addMonitorpoint(@RequestBody MonitorPoint monitorPoint){



        try {

            String name = monitorPoint.getName();

@@ -90,7 +90,7 @@


    @RequestMapping("/editMonitorPoint")

    @ResponseBody

    public String editMonitorPoint(@RequestBody Monitorpoint monitorPoint){

    public String editMonitorPoint(@RequestBody MonitorPoint monitorPoint){

        try {

            monitorPointService.updateMonitorpoint(monitorPoint);

        }catch (Exception e){


 src/main/java/com/moral/monitor/dao/MgrDao.java

@@ -12,12 +12,12 @@
@Repository

public interface MgrDao {



    public List<Monitorpoint> randpoint();

    public List<MonitorPoint> randpoint();

    public List<Equipment> pointequ(String monitorpoint);



    public List<State> equsensorstate(@Param("mac") String mac);



    public List<Monitorpoint> allpoint();

    public List<MonitorPoint> allpoint();



    public List<PointAvg>  allPointsData(QueryHelper queryHelper);

    public int  pointcount(QueryHelper queryHelper);


 src/main/java/com/moral/monitor/dao/MonitorpointDao.java

@@ -2,29 +2,29 @@


import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.moral.monitor.entity.Monitorpoint;

import com.moral.monitor.entity.MonitorpointExample;

import com.moral.monitor.entity.MonitorPoint;

import com.moral.monitor.entity.MonitorPointExample;



public interface MonitorpointDao {

    long countByExample(MonitorpointExample example);

    long countByExample(MonitorPointExample example);



    int deleteByExample(MonitorpointExample example);

    int deleteByExample(MonitorPointExample example);



    int deleteByPrimaryKey(String id);



    int insert(Monitorpoint record);

    int insert(MonitorPoint record);



    int insertSelective(Monitorpoint record);

    int insertSelective(MonitorPoint record);



    List<Monitorpoint> selectByExample(MonitorpointExample example);

    List<MonitorPoint> selectByExample(MonitorPointExample example);



    Monitorpoint selectByPrimaryKey(String id);

    MonitorPoint selectByPrimaryKey(String id);



    int updateByExampleSelective(@Param("record") Monitorpoint record, @Param("example") MonitorpointExample example);

    int updateByExampleSelective(@Param("record") MonitorPoint record, @Param("example") MonitorPointExample example);



    int updateByExample(@Param("record") Monitorpoint record, @Param("example") MonitorpointExample example);

    int updateByExample(@Param("record") MonitorPoint record, @Param("example") MonitorPointExample example);



    int updateByPrimaryKeySelective(Monitorpoint record);

    int updateByPrimaryKeySelective(MonitorPoint record);



    int updateByPrimaryKey(Monitorpoint record);

    int updateByPrimaryKey(MonitorPoint record);

}

 src/main/java/com/moral/monitor/entity/MonitorPoint.java

File was renamed from src/main/java/com/moral/monitor/entity/Monitorpoint.java
@@ -2,7 +2,7 @@


import java.util.Date;



public class Monitorpoint {

public class MonitorPoint {

    private String id;



    private String name;


 src/main/java/com/moral/monitor/entity/MonitorPointExample.java

File was renamed from src/main/java/com/moral/monitor/entity/MonitorpointExample.java
@@ -4,14 +4,14 @@
import java.util.Date;

import java.util.List;



public class MonitorpointExample {

public class MonitorPointExample {

    protected String orderByClause;



    protected boolean distinct;



    protected List<Criteria> oredCriteria;



    public MonitorpointExample() {

    public MonitorPointExample() {

        oredCriteria = new ArrayList<Criteria>();

    }




 src/main/java/com/moral/monitor/service/MgrService.java

@@ -15,7 +15,7 @@
    @Resource

    MgrDao mgrDao;



    public List<Monitorpoint> randpoint(){

    public List<MonitorPoint> randpoint(){

        return  mgrDao.randpoint();

    }



@@ -26,7 +26,7 @@
    public List<State> equsensorstate(String mac){return mgrDao.equsensorstate(mac);}





    public List<Monitorpoint> allpoint(){

    public List<MonitorPoint> allpoint(){

        return mgrDao.allpoint();

    }




 src/main/java/com/moral/monitor/service/MonitorpointService.java

@@ -1,6 +1,6 @@
package com.moral.monitor.service;



import com.moral.monitor.entity.Monitorpoint;

import com.moral.monitor.entity.MonitorPoint;

import com.moral.monitor.entity.QueryHelper;

import org.springframework.stereotype.Service;

import java.util.List;

@@ -10,7 +10,7 @@
 */

@Service

public interface MonitorpointService {

    public List<Monitorpoint> allMonitorpoint(QueryHelper queryHelper);

    public List<MonitorPoint> allMonitorpoint(QueryHelper queryHelper);

    

    public int monitorCount(QueryHelper queryHelper);



@@ -18,9 +18,9 @@
    public void deleteMonitor(String id);





    public void addMonitorpoint(Monitorpoint Monitorpoint);

    public void addMonitorpoint(MonitorPoint MonitorPoint);



    public void updateMonitorpoint(Monitorpoint Monitorpoint);

    public void updateMonitorpoint(MonitorPoint MonitorPoint);





}


 src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java

@@ -5,19 +5,21 @@
import javax.annotation.Resource;



import com.moral.monitor.dao.MonitorpointDao;

import com.moral.monitor.entity.Monitorpoint;

import com.moral.monitor.entity.MonitorPoint;

import com.moral.monitor.entity.QueryHelper;

import com.moral.monitor.service.MonitorpointService;

import org.springframework.stereotype.Service;



/**

 * @author fengxiang

 * @Time：2017年10月25日 下午2:24:46

 * @version 1.0

 */

@Service

public class MonitorpointServiceImpl implements MonitorpointService {

    @Resource

    MonitorpointDao monitorpointDao;

    public List<Monitorpoint> allMonitorpoint(QueryHelper queryHelper) {

    public List<MonitorPoint> allMonitorpoint(QueryHelper queryHelper) {

        // TODO Auto-generated method stub

        return null;

    }

@@ -32,12 +34,12 @@


    }



    public void addMonitorpoint(Monitorpoint Monitorpoint) {

    public void addMonitorpoint(MonitorPoint MonitorPoint) {

        // TODO Auto-generated method stub



    }



    public void updateMonitorpoint(Monitorpoint Monitorpoint) {

    public void updateMonitorpoint(MonitorPoint MonitorPoint) {

        // TODO Auto-generated method stub



    }