2

9637230e · manxiaoqiang · 7d847bc2 · 9637230e · 9637230e
Commit 9637230e authored Apr 27, 2018 by manxiaoqiang
Hide whitespace changes
Inline Side-by-side

Showing with 72 additions and 38 deletions

workspace.xml .idea/workspace.xml +63 -33

AccountTask.java src/main/java/tkio/task/AccountTask.java +9 -5

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
  <component name="ChangeListManager">
    <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" 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/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
    </list>
    <ignored path="$PROJECT_DIR$/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -32,11 +32,41 @@
  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="322">
-              <caret line="14" column="70" lean-forward="false" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
+            <state relative-caret-position="184">
+              <caret line="14" column="56" lean-forward="true" selection-start-line="14" selection-start-column="56" selection-end-line="14" selection-end-column="56" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AccountTask.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1686">
+              <caret line="124" column="38" lean-forward="true" selection-start-line="124" selection-start-column="38" selection-end-line="124" selection-end-column="38" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AccountFlowRestrictService.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="230">
+              <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AccountFlowRestrictServiceImpl.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="242">
+              <caret line="202" column="47" lean-forward="false" selection-start-line="202" selection-start-column="47" selection-end-line="202" selection-end-column="47" />
              <folding />
            </state>
          </provider>
@@ -54,7 +84,6 @@
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>jpa</find>
      <find>jdbc:mysql://tkio.cma5jkozme68.rds.cn-north-1.amazonaws.com.cn:3306</find>
      <find>label</find>
      <find>unit</find>
@@ -84,6 +113,7 @@
      <find>packageType</find>
      <find>ThisMonthIOFlow</find>
      <find>IOLimit</find>
+      <find>IOFlowNotified</find>
    </findStrings>
    <replaceStrings>
      <replace />
@@ -153,9 +183,9 @@
        <option value="$PROJECT_DIR$/pom.xml" />
        <option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java" />
        <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/TkioAccountServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
        <option value="$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" />
      </list>
    </option>
  </component>
@@ -1196,13 +1226,6 @@
      <workItem from="1523843445576" duration="7238000" />
      <workItem from="1523876594256" duration="75800000" />
    </task>
-    <task id="LOCAL-00090" summary="显示">
-      <created>1517906414924</created>
-      <option name="number" value="00090" />
-      <option name="presentableId" value="LOCAL-00090" />
-      <option name="project" value="LOCAL" />
-      <updated>1517906414924</updated>
-    </task>
    <task id="LOCAL-00091" summary="显示">
      <created>1517985721218</created>
      <option name="number" value="00091" />
@@ -1539,11 +1562,18 @@
      <option name="project" value="LOCAL" />
      <updated>1524820944956</updated>
    </task>
-    <option name="localTasksCounter" value="139" />
+    <task id="LOCAL-00139" summary="2&#10;">
+      <created>1524821340476</created>
+      <option name="number" value="00139" />
+      <option name="presentableId" value="LOCAL-00139" />
+      <option name="project" value="LOCAL" />
+      <updated>1524821340476</updated>
+    </task>
+    <option name="localTasksCounter" value="140" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="518356000" />
+    <option name="totallyTimeSpent" value="519247000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -2082,50 +2112,50 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
+        <state relative-caret-position="274">
+          <caret line="40" column="49" lean-forward="true" selection-start-line="40" selection-start-column="49" selection-end-line="40" selection-end-column="49" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="81" column="142" lean-forward="false" selection-start-line="81" selection-start-column="138" selection-end-line="81" selection-end-column="142" />
+        <state relative-caret-position="2001">
+          <caret line="186" column="29" lean-forward="false" selection-start-line="186" selection-start-column="21" selection-end-line="186" selection-end-column="29" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="12">
-          <caret line="182" column="17" lean-forward="true" selection-start-line="182" selection-start-column="17" selection-end-line="182" selection-end-column="17" />
+        <state relative-caret-position="184">
+          <caret line="14" column="56" lean-forward="true" selection-start-line="14" selection-start-column="56" selection-end-line="14" selection-end-column="56" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountCheck.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/AccountFlowRestrictService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="40" column="49" lean-forward="true" selection-start-line="40" selection-start-column="49" selection-end-line="40" selection-end-column="49" />
+        <state relative-caret-position="230">
+          <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2001">
-          <caret line="186" column="29" lean-forward="false" selection-start-line="186" selection-start-column="21" selection-end-line="186" selection-end-column="29" />
+        <state relative-caret-position="1686">
+          <caret line="124" column="38" lean-forward="true" selection-start-line="124" selection-start-column="38" selection-end-line="124" selection-end-column="38" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="14" column="70" lean-forward="false" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
+        <state relative-caret-position="242">
+          <caret line="202" column="47" lean-forward="false" selection-start-line="202" selection-start-column="47" selection-end-line="202" selection-end-column="47" />
          <folding />
        </state>
      </provider>

--- a/src/main/java/tkio/task/AccountTask.java
+++ b/src/main/java/tkio/task/AccountTask.java
@@ -79,7 +79,7 @@ public class AccountTask {
                }
                try{
                    AccountRestrict4Web restrict4Web = accountFlowRestrictService.findRestrictByAccount(ac.getId());
-                    account4Web.setStatus(null == restrict4Web.getIOFlowNotified() ? "已激活" : (restrict4Web.getIOFlowNotified() ? "已激活" : "流量用尽"));
+                    account4Web.setStatus(null == restrict4Web.getTrackFlowNotified() ? "已激活" : (restrict4Web.getTrackFlowNotified() ? "已激活" : "流量用尽"));
                    account4Web.setPackageType(restrict4Web.getPackageName());
                    if (ac.getPricelevel().equals(7L) || ac.getPricelevel().equals(8L) || ac.getPricelevel().equals(5L) || ac.getPricelevel().equals(6L)){
                        account4Web.setIo(restrict4Web.getThisMonthIOFlow());
@@ -110,12 +110,16 @@ public class AccountTask {
                        if(account4Web.getTrackLimit().doubleValue() <= 0){
                            account4Web.setTrackStatus(true);
                            account4Web.setStatus("已激活");
-
                        }
+//                              else {
+//                            if(account4Web.getTrack().doubleValue() < account4Web.getTrackLimit().doubleValue()){
+//                                account4Web.setStatus("已激活");
+//                            } else{
+//                                account4Web.setStatus("流量用尽");
+//                            }
+//                        }
                        account4Web.setIoStatus(true);
-                        if(account4Web.getTrackStatus()){
-                            account4Web.setStatus("已激活");
-                        }
+
                    }
                    list.add(account4Web);
                } catch (Exception e){