From 7eef997238fd90d75564538d1e12009563850c72 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 15 Nov 2017 23:08:04 +0800
Subject: [PATCH] test
---
.idea/workspace.xml | 74 +++++++++++++++++++------------------
src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java | 4 -
2 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f6fbfa4..1818883 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,9 +6,10 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
- <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="test">
+ <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -31,21 +32,21 @@
</provider>
</entry>
</file>
- <file leaf-file-name="RedisServiceImpl.java" pinned="false" current-in-tab="false">
+ <file leaf-file-name="RedisServiceImpl.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="386">
- <caret line="97" column="27" lean-forward="false" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="27" />
+ <state relative-caret-position="311">
+ <caret line="100" column="58" lean-forward="false" selection-start-line="100" selection-start-column="58" selection-end-line="100" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="StopStateCheck.java" pinned="false" current-in-tab="true">
+ <file leaf-file-name="StopStateCheck.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="517">
- <caret line="55" column="20" lean-forward="false" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
+ <state relative-caret-position="76">
+ <caret line="27" column="25" lean-forward="false" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="26" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -130,8 +131,8 @@
<find>sysConfig</find>
<find>setAlarmLevles</find>
<find>detEquState</find>
- <find>setEquState</find>
<find>getAllEquipment</find>
+ <find>setEquState</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -190,6 +191,7 @@
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java" />
</list>
</option>
</component>
@@ -599,14 +601,7 @@
<workItem from="1510700803433" duration="454000" />
<workItem from="1510705763364" duration="3849000" />
<workItem from="1510726840192" duration="2659000" />
- <workItem from="1510754613409" duration="2007000" />
- </task>
- <task id="LOCAL-00022" summary="���������������������������">
- <created>1509091232558</created>
- <option name="number" value="00022" />
- <option name="presentableId" value="LOCAL-00022" />
- <option name="project" value="LOCAL" />
- <updated>1509091232558</updated>
+ <workItem from="1510754613409" duration="2328000" />
</task>
<task id="LOCAL-00023" summary="������������">
<created>1509265063354</created>
@@ -944,11 +939,18 @@
<option name="project" value="LOCAL" />
<updated>1510757487933</updated>
</task>
- <option name="localTasksCounter" value="71" />
+ <task id="LOCAL-00071" summary="test">
+ <created>1510757829759</created>
+ <option name="number" value="00071" />
+ <option name="presentableId" value="LOCAL-00071" />
+ <option name="project" value="LOCAL" />
+ <updated>1510757829759</updated>
+ </task>
+ <option name="localTasksCounter" value="72" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="152009000" />
+ <option name="totallyTimeSpent" value="152330000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="23" width="1405" height="877" extended-state="0" />
@@ -1378,22 +1380,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="315">
- <caret line="53" column="72" lean-forward="true" selection-start-line="53" selection-start-column="4" selection-end-line="53" selection-end-column="72" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="386">
- <caret line="97" column="27" lean-forward="false" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="27" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="356">
@@ -1407,16 +1393,32 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="315">
+ <caret line="53" column="72" lean-forward="true" selection-start-line="53" selection-start-column="4" selection-end-line="53" selection-end-column="72" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="517">
- <caret line="55" column="20" lean-forward="false" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
+ <state relative-caret-position="76">
+ <caret line="27" column="25" lean-forward="false" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="26" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="311">
+ <caret line="100" column="58" lean-forward="false" selection-start-line="100" selection-start-column="58" selection-end-line="100" selection-end-column="58" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java b/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
index 9e48915..f490486 100644
--- a/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
+++ b/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
@@ -25,9 +25,7 @@
@Resource
RedisTemplate<String, String> redisTemplate;
- private Logger logger = LoggerFactory.getLogger(StopStateCheck.class);
-
- private int waits = 10000;
+ private int waits = 15000;
public void check() {
--
Gitblit v1.8.0