Voomra/astral-check-report
Archived
0
Fork 0
Code Activity

fix

Browse Source
This commit is contained in:
DmitriyMX
2016-05-28 23:48:36 +03:00
parent 501c2d37c1
commit 6dc119cc45
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/ru/dmitriymx/astralcheckreport/AstralSession.java
View File

@@ -46,7 +46,14 @@ class AstralSession {
"\"CreationInterval\":-1,\"SortingColumn\":\"abonentId\",\"SortingOrder\":\"desc\"}}"; "\"CreationInterval\":-1,\"SortingColumn\":\"abonentId\",\"SortingOrder\":\"desc\"}}";
browser.setHeader("Content-Type", "application/json;charset=utf-8"); browser.setHeader("Content-Type", "application/json;charset=utf-8");
String jsonStr = browser.post("http://reg.astralnalog.ru/AbonentModule.aspx/GetAbonentData", postData); String jsonStr;
do {
jsonStr = browser.post("http://reg.astralnalog.ru/AbonentModule.aspx/GetAbonentData", postData);
if (jsonStr.isEmpty()) {
logger.warn("Слишком быстро! Повторяю запрос...");
Main.safeSleep(Main.sleepThread);
}
} while (jsonStr.isEmpty());
JsonObject jsonObj = str2jsonObj(jsonStr); JsonObject jsonObj = str2jsonObj(jsonStr);
jsonObj = str2jsonObj(jsonObj.get("d").getAsString()); jsonObj = str2jsonObj(jsonObj.get("d").getAsString());

9
src/main/java/ru/dmitriymx/astralcheckreport/Main.java
View File

@@ -13,7 +13,6 @@ import ru.dmitriymx.astralcheckreport.objects.*;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.List;
import java.util.Properties; import java.util.Properties;
public class Main implements Runnable { public class Main implements Runnable {
@@ -278,7 +277,7 @@ public class Main implements Runnable {
case 10: break; case 10: break;
case 6: case 6:
case 13: case 13:
countFNS += recipient.kpp.size(); countFNS += (recipient.kpp.size() > 0 ? recipient.kpp.size() : 1);
break; break;
case 5: countFSS++; break; case 5: countFSS++; break;
case 4: countRosstat++; break; case 4: countRosstat++; break;
@@ -297,7 +296,7 @@ public class Main implements Runnable {
boolean boolRosstat = (countRosstat == 0 || countRosstat == 1); boolean boolRosstat = (countRosstat == 0 || countRosstat == 1);
boolean boolPFR = (countPFR == 0 || countPFR == 1); boolean boolPFR = (countPFR == 0 || countPFR == 1);
if (countFNS + countFSS + countRosstat + countPFR + data.addonKpp > 4 + data.addonKpp) { if (countFNS + countFSS + countRosstat + countPFR > 4 + data.addonKpp) {
return false; return false;
} }
@@ -321,7 +320,7 @@ public class Main implements Runnable {
case 10: break; case 10: break;
case 6: case 6:
case 13: case 13:
countFNS += recipient.kpp.size(); countFNS += (recipient.kpp.size() > 0 ? recipient.kpp.size() : 1);
break; break;
case 5: countFSS++; break; case 5: countFSS++; break;
case 4: countRosstat++; break; case 4: countRosstat++; break;
@@ -340,7 +339,7 @@ public class Main implements Runnable {
boolean boolRosstat = (countRosstat == 0 || countRosstat == 1); boolean boolRosstat = (countRosstat == 0 || countRosstat == 1);
boolean boolPFR = (countPFR == 0 || countPFR == 1); boolean boolPFR = (countPFR == 0 || countPFR == 1);
if (countFNS + countFSS + countRosstat + countPFR + data.addonKpp > 2 + data.addonKpp + data.addonNaprov) { if (countFNS + countFSS + countRosstat + countPFR > 2 + data.addonKpp + data.addonNaprov) {
return false; return false;
} }