Commit 05fee0e5 authored by 张森's avatar 张森

现场问题处理

parent 21f89c65
...@@ -66,7 +66,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -66,7 +66,7 @@ public class PlanTaskController extends AbstractBaseController {
@Autowired @Autowired
private IRouteService routeService; private IRouteService routeService;
@Value("${params.isPush:false}") @Value("${is.zxj:false}")
private Boolean isZxj; private Boolean isZxj;
...@@ -350,11 +350,11 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -350,11 +350,11 @@ public class PlanTaskController extends AbstractBaseController {
* *
* @return * @return
*/ */
@Scheduled(cron = "${jobs.cron}") // @Scheduled(cron = "${jobs.cron}")
@ApiOperation(value = "定时执行任务表生成(<font color='blue'>release</font>)", notes = "定时执行任务表生成") @ApiOperation(value = "定时执行任务表生成(<font color='blue'>release</font>)", notes = "定时执行任务表生成")
@RequestMapping(value = "/queryOmission", method = RequestMethod.GET, produces = "application/json;charset=UTF-8") @RequestMapping(value = "/queryOmission", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public CommonResponse pushCarData() { public CommonResponse pushCarData() {
if (Boolean.TRUE.equals(!isZxj)) { // if (Boolean.TRUE.equals(!isZxj)) {
try { try {
RequestAttributes reqs = RequestContextHolder.getRequestAttributes(); RequestAttributes reqs = RequestContextHolder.getRequestAttributes();
RequestContextHolder.setRequestAttributes(reqs, true); RequestContextHolder.setRequestAttributes(reqs, true);
...@@ -365,8 +365,8 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -365,8 +365,8 @@ public class PlanTaskController extends AbstractBaseController {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return CommonResponseUtil.failure(); return CommonResponseUtil.failure();
} }
} // }
return CommonResponseUtil.success(); // return CommonResponseUtil.success();
} }
/** /**
......
...@@ -25,18 +25,18 @@ public class PatrolMqttListener extends EmqxListener { ...@@ -25,18 +25,18 @@ public class PatrolMqttListener extends EmqxListener {
@Override @Override
public void processMessage(String topic, MqttMessage message) { public void processMessage(String topic, MqttMessage message) {
if(log.isInfoEnabled()){ // if(log.isInfoEnabled()){
log.info("收到消息主题:{},消息内容:{}",topic, message.toString()); // log.info("收到消息主题:{},消息内容:{}",topic, message.toString());
} // }
try { // try {
Map<String, Object> msg = JSON.parseObject(message.toString()); // Map<String, Object> msg = JSON.parseObject(message.toString());
if (pointClassifyTopic.equals(topic)) { // if (pointClassifyTopic.equals(topic)) {
iPointService.syncPointClassify(msg); // iPointService.syncPointClassify(msg);
} // }
log.info("巡检对象同步完成"); // log.info("巡检对象同步完成");
} catch (Exception e) { // } catch (Exception e) {
log.info("巡检对象同步失败:{}", e.getMessage()); // log.info("巡检对象同步失败:{}", e.getMessage());
} // }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment