lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lyf:4780f01f7d3c0fa9b87089e54aeb5ef89f8f2c01
Branches Tags
lyf:master
..
compare: lyf:36c8945201d5570512863f6536fc4f2b7d10f294
Branches Tags
lyf:master

No commits in common. "4780f01f7d3c0fa9b87089e54aeb5ef89f8f2c01" and "36c8945201d5570512863f6536fc4f2b7d10f294" have entirely different histories.
4780f01f7d ... 36c8945201

4 changed files with 48 additions and 58 deletions
Show Stats Expand all files Collapse all files

12
src/main/java/com/whdc/component/AutoCallTaskScheduled.java
View File

@ -45,17 +45,12 @@ public class AutoCallTaskScheduled {
@EventListener(ApplicationReadyEvent.class) @EventListener(ApplicationReadyEvent.class)
public void initialize() throws Exception { public void initialize() throws Exception {
try {
autoCallHelper.getToken(); autoCallHelper.getToken();
log.info("token1 {}", autoCallHelper.getToken()); log.info("token1 {}", autoCallHelper.getToken());
autoCallHelper.getToken(); autoCallHelper.getToken();
log.info("token2 {}", autoCallHelper.getToken()); log.info("token2 {}", autoCallHelper.getToken());
log.info("AutoCallTaskScheduled初始化完成");
} catch (Exception ignore) {
} finally {
initialized.set(true); initialized.set(true);
} log.info("AutoCallTaskScheduled初始化完成");
} }
@Scheduled(cron = "*/3 * * * * ?") @Scheduled(cron = "*/3 * * * * ?")
@ -130,11 +125,6 @@ public class AutoCallTaskScheduled {
return; return;
} }
for (AutoCallPerson person : personList) { for (AutoCallPerson person : personList) {
AutoCallTask task = autoCallTaskService.getTaskMapper().selectById(taskId);
if (task.getStatus() == AutoCallTask.STATUS_MANUAL_CLOSE || task.getStatus() == AutoCallTask.STATUS_CANCELLED) {
autoCallTaskService.cancelPerson(person);
continue;
}
while (person.getUploadedTimes() < 2) { while (person.getUploadedTimes() < 2) {
if (AutoCallPerson.TAG_DONE.equals(person.getTag())) break; if (AutoCallPerson.TAG_DONE.equals(person.getTag())) break;
//do upload //do upload

4
src/main/java/com/whdc/controller/QXWarnController.java
View File

@ -149,7 +149,7 @@ public class QXWarnController {
/** /**
* 气象预警-正在生效的预警信息 * 气象预警-正在生效的预警信息
* *
* @param * @param dto
* @return * @return
*/ */
@ApiOperation(value = "气象预警-正在生效的预警信息") @ApiOperation(value = "气象预警-正在生效的预警信息")
@ -435,7 +435,7 @@ public class QXWarnController {
yearDto.setFilter(filter); yearDto.setFilter(filter);
String yearstr = HttpUtil.sendPost(getGroupWarning, JSON.toJSONString(yearDto)); String yearstr = HttpUtil.sendPost(getGroupWarning, JSON.toJSONString(yearDto));
JSONObject yearjson = JSON.parseObject(yearstr); JSONObject yearjson = JSON.parseObject(yearstr);
// System.out.println("yearstr:" + yearjson); System.out.println("yearstr:" + yearjson);
if (yearjson != null && yearjson.getInteger("code") == HttpStatus.SC_OK) { if (yearjson != null && yearjson.getInteger("code") == HttpStatus.SC_OK) {
List<WarningData> data = yearjson.getJSONArray("data").toJavaList(WarningData.class); List<WarningData> data = yearjson.getJSONArray("data").toJavaList(WarningData.class);
//// return ResultJson.ok(getCount(data, publishUnit, warnSignalLevel, warnSignalType)); //// return ResultJson.ok(getCount(data, publishUnit, warnSignalLevel, warnSignalType));

72
src/main/java/com/whdc/service/autocall/AutoCallTaskService2.java
View File

@ -73,7 +73,7 @@ public class AutoCallTaskService2 {
task.setWarnCnnm("钟祥 "); task.setWarnCnnm("钟祥 ");
taskMapper.insert(task); taskMapper.insert(task);
generatePerson(task); generatePerson(task);
//
// warn = qxWarningMapper.selectOne( // warn = qxWarningMapper.selectOne(
// new QueryWrapper<QXWarning>() // new QueryWrapper<QXWarning>()
// .orderByDesc("WARNID") // .orderByDesc("WARNID")
@ -89,21 +89,21 @@ public class AutoCallTaskService2 {
// taskMapper.insert(task); // taskMapper.insert(task);
// generatePerson(task); // generatePerson(task);
// //
// warn = qxWarningMapper.selectOne( warn = qxWarningMapper.selectOne(
// new QueryWrapper<QXWarning>() new QueryWrapper<QXWarning>()
// .orderByDesc("WARNID") .orderByDesc("WARNID")
// .last("limit 1") .last("limit 1")
// ); );
// warn.setCtnm("荆州市"); warn.setCtnm("荆州市");
// warn.setCnnm("枣阳 "); warn.setCnnm("枣阳 ");
// taskList = newTask(warn); taskList = newTask(warn);
// task = taskList.get(0); task = taskList.get(0);
// task.setStatus(0); task.setStatus(0);
// task.setCreateTm(new Date()); task.setCreateTm(new Date());
// task.setWarnCnnm("枣阳 "); task.setWarnCnnm("枣阳 ");
// taskMapper.insert(task); taskMapper.insert(task);
// generatePerson(task); generatePerson(task);
//
// warn = qxWarningMapper.selectOne( // warn = qxWarningMapper.selectOne(
// new QueryWrapper<QXWarning>() // new QueryWrapper<QXWarning>()
// .orderByDesc("WARNID") // .orderByDesc("WARNID")
@ -124,7 +124,7 @@ public class AutoCallTaskService2 {
// .orderByDesc("WARNID") // .orderByDesc("WARNID")
// .last("limit 1") // .last("limit 1")
// ); // );
//
// warn.setCtnm("荆州市"); // warn.setCtnm("荆州市");
// warn.setCnnm("英山 "); // warn.setCnnm("英山 ");
// taskList = newTask(warn); // taskList = newTask(warn);
@ -150,20 +150,20 @@ public class AutoCallTaskService2 {
// taskMapper.insert(task); // taskMapper.insert(task);
// generatePerson(task); // generatePerson(task);
warn = qxWarningMapper.selectOne( // warn = qxWarningMapper.selectOne(
new QueryWrapper<QXWarning>() // new QueryWrapper<QXWarning>()
.orderByDesc("WARNID") // .orderByDesc("WARNID")
.last("limit 1") // .last("limit 1")
); // );
warn.setCtnm("荆州市"); // warn.setCtnm("荆州市");
warn.setCnnm("阳新 "); // warn.setCnnm("阳新 ");
taskList = newTask(warn); // taskList = newTask(warn);
task = taskList.get(0); // task = taskList.get(0);
task.setStatus(0); // task.setStatus(0);
task.setCreateTm(new Date()); // task.setCreateTm(new Date());
task.setWarnCnnm("阳新 "); // task.setWarnCnnm("阳新 ");
taskMapper.insert(task); // taskMapper.insert(task);
generatePerson(task); // generatePerson(task);
// warn = qxWarningMapper.selectOne( // warn = qxWarningMapper.selectOne(
// new QueryWrapper<QXWarning>() // new QueryWrapper<QXWarning>()
@ -194,7 +194,7 @@ public class AutoCallTaskService2 {
// task.setWarnCnnm("宜城 "); // task.setWarnCnnm("宜城 ");
// taskMapper.insert(task); // taskMapper.insert(task);
// generatePerson(task); // generatePerson(task);
//
// warn = qxWarningMapper.selectOne( // warn = qxWarningMapper.selectOne(
// new QueryWrapper<QXWarning>() // new QueryWrapper<QXWarning>()
// .orderByDesc("WARNID") // .orderByDesc("WARNID")
@ -209,7 +209,7 @@ public class AutoCallTaskService2 {
// task.setWarnCnnm("孝南 "); // task.setWarnCnnm("孝南 ");
// taskMapper.insert(task); // taskMapper.insert(task);
// generatePerson(task); // generatePerson(task);
//
// warn = qxWarningMapper.selectOne( // warn = qxWarningMapper.selectOne(
// new QueryWrapper<QXWarning>() // new QueryWrapper<QXWarning>()
// .orderByDesc("WARNID") // .orderByDesc("WARNID")
@ -224,7 +224,7 @@ public class AutoCallTaskService2 {
// task.setWarnCnnm("孝感 "); // task.setWarnCnnm("孝感 ");
// taskMapper.insert(task); // taskMapper.insert(task);
// generatePerson(task); // generatePerson(task);
//
// warn = qxWarningMapper.selectOne( // warn = qxWarningMapper.selectOne(
// new QueryWrapper<QXWarning>() // new QueryWrapper<QXWarning>()
// .orderByDesc("WARNID") // .orderByDesc("WARNID")
@ -239,7 +239,7 @@ public class AutoCallTaskService2 {
// task.setWarnCnnm("襄州 "); // task.setWarnCnnm("襄州 ");
// taskMapper.insert(task); // taskMapper.insert(task);
// generatePerson(task); // generatePerson(task);
//
// warn = qxWarningMapper.selectOne( // warn = qxWarningMapper.selectOne(
// new QueryWrapper<QXWarning>() // new QueryWrapper<QXWarning>()
// .orderByDesc("WARNID") // .orderByDesc("WARNID")
@ -285,7 +285,7 @@ public class AutoCallTaskService2 {
// task.setWarnCnnm("秭归 "); // task.setWarnCnnm("秭归 ");
// taskMapper.insert(task); // taskMapper.insert(task);
// generatePerson(task); // generatePerson(task);
//
// warn = qxWarningMapper.selectOne( // warn = qxWarningMapper.selectOne(
// new QueryWrapper<QXWarning>() // new QueryWrapper<QXWarning>()
// .orderByDesc("WARNID") // .orderByDesc("WARNID")

8
src/main/java/com/whdc/utils/HttpUtil.java
View File

@ -90,7 +90,7 @@ public class HttpUtil {
} }
jstr = sb.toString(); jstr = sb.toString();
// log.info("响应参数: " + jstr); log.info("响应参数: " + jstr);
jstr = jsonFormat(jstr); jstr = jsonFormat(jstr);
@ -169,7 +169,7 @@ public class HttpUtil {
} }
jstr = sb.toString(); jstr = sb.toString();
// log.info("响应参数: " + jstr); log.info("响应参数: " + jstr);
jstr = jsonFormat(jstr); jstr = jsonFormat(jstr);
@ -243,7 +243,7 @@ public class HttpUtil {
} }
jstr = sb.toString(); jstr = sb.toString();
// log.info("响应参数: " + jstr); log.info("响应参数: " + jstr);
jstr = jsonFormat(jstr); jstr = jsonFormat(jstr);
@ -317,7 +317,7 @@ public class HttpUtil {
} }
jstr = sb.toString(); jstr = sb.toString();
// log.info("响应参数: " + jstr); log.info("响应参数: " + jstr);
jstr = jsonFormat(jstr); jstr = jsonFormat(jstr);