diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java index 6e84fda..0a837f3 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java @@ -53,6 +53,7 @@ public class IvsCommonService { } public RequestBodySpec http(HttpMethod httpMethod, String uri) { + log.info("-------------------------ivs address: " + getAddress().concat(uri)); return webClient.method(httpMethod).uri(getAddress().concat(uri)); } diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsLoginService.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsLoginService.java index 7c01760..b60ed1d 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsLoginService.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsLoginService.java @@ -93,6 +93,7 @@ public class IvsLoginService extends IvsCommonService { } private IvsResult login() { + logger.info("-------------------------ivs user: " + this.queryUser()); return this.http(HttpMethod.POST, IvsConst.URI_LOGIN) .contentType(MediaType.APPLICATION_JSON) .bodyValue(this.queryUser()) diff --git a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/vo/UpResponse.java b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/vo/UpResponse.java index 3d4d1eb..ad9ba03 100644 --- a/inspect-main/inspect-main-client/src/main/java/com/inspect/client/vo/UpResponse.java +++ b/inspect-main/inspect-main-client/src/main/java/com/inspect/client/vo/UpResponse.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField; public class UpResponse { @JSONField( - name = "sendCode" + name = "SendCode" ) private String sendCode; @JSONField( diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index a7e3c15..5ee1142 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java @@ -1021,6 +1021,7 @@ public class PatrolResultController extends BaseController { @GetMapping({"/sendMessage"}) public AjaxResult getInfo(String type, String messageBody) { + logger.info("type:" + type + ", messageBody:" + messageBody); PatrolTaskFtp patrolTaskFtp = patrolTaskFtpService.selectPatrolTaskFtpByLineId(2L); int i = 1; List patrolDeviceCodeList = new ArrayList<>(); @@ -1037,8 +1038,8 @@ public class PatrolResultController extends BaseController { logger.info("<==================================RECEIVE DATA TO ANALYSIS [41]=============================>"); try { JSONObject parseObject = JSONObject.parseObject(messageBody); - Object sendCode = parseObject.get("sendCode"); - Object jsonArray = parseObject.get("taskStateList"); + Object sendCode = parseObject.get("SendCode"); + Object jsonArray = parseObject.get("Items"); // if (jsonArray == null) { // jsonArray = parseObject.get("Items"); // } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskResultConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskResultConsumerHandle.java index 64e7d3f..29629d8 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskResultConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskResultConsumerHandle.java @@ -14,12 +14,15 @@ import com.inspect.base.core.utils.DateUtils; import java.util.Date; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Component("basedataMont-61") public class BasedataMontTaskResultConsumerHandle implements IBasedataMontDataHandleService { + private static final Logger logger = LoggerFactory.getLogger(BasedataMontTaskResultConsumerHandle.class); @Resource private IBasedataMontTaskResultService basedataMontTaskResultService; @Resource @@ -28,6 +31,7 @@ public class BasedataMontTaskResultConsumerHandle implements IBasedataMontDataHa private FeignMsgClient feignMsgClient; public void handMontData(JSONObject jsonObject) { + logger.info("handMontData:" + jsonObject); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontTaskResult.class); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskStaDataConsumerHandle.java b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskStaDataConsumerHandle.java index 226cabb..fcf9cbc 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskStaDataConsumerHandle.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontTaskStaDataConsumerHandle.java @@ -13,12 +13,15 @@ import com.inspect.base.core.utils.DateUtils; import java.util.Date; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import javax.annotation.Resource; @Component("basedataMont-41") public class BasedataMontTaskStaDataConsumerHandle implements IBasedataMontDataHandleService { + private static final Logger logger = LoggerFactory.getLogger(BasedataMontTaskStaDataConsumerHandle.class); @Resource private IBasedataMontTaskStaDataService basedataMontTaskStaDataService; @Resource @@ -27,6 +30,7 @@ public class BasedataMontTaskStaDataConsumerHandle implements IBasedataMontDataH private FeignMsgClient feignMsgClient; public void handMontData(JSONObject jsonObject) { + logger.info("handMontData:" + jsonObject); String Type = jsonObject.getString("Type"); JSONArray jsonObjectItems = jsonObject.getJSONArray("Items"); List list = jsonObjectItems.toJavaList(BasedataMontTaskStaData.class); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/mqutil/FeignMsgClient.java b/inspect-metadata/src/main/java/com/inspect/metadata/mqutil/FeignMsgClient.java index 9768643..cbf31e4 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/mqutil/FeignMsgClient.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/mqutil/FeignMsgClient.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestParam; @FeignClient("inspect-main") public interface FeignMsgClient { @GetMapping({"/partrolresult/sendMessage"}) - AjaxResult senMessageToMl(@RequestParam("type") String type, @RequestParam("msg") String msg); + AjaxResult senMessageToMl(@RequestParam("type") String type, @RequestParam("messageBody") String msg); @PostMapping({"/client/upData"}) AjaxResult senMessageToZk(@RequestParam("type") String type, @RequestParam("msg") String msg); diff --git a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml index 7e03833..96ba3cc 100644 --- a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml @@ -4,9 +4,9 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + @@ -50,7 +50,7 @@ from basedata_mont_taskresult - - insert into basedata_mont_taskresult @@ -156,7 +156,7 @@ - + update basedata_mont_taskresult eqp_book_id = #{eqpBookId}, @@ -200,4 +200,4 @@ #{resultId} - \ No newline at end of file + diff --git a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml index a844a8b..ac72115 100644 --- a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -43,7 +43,7 @@ from basedata_mont_taskstadata - - insert into basedata_mont_taskstadata @@ -112,7 +112,7 @@ - + update basedata_mont_taskstadata task_patrolled_id = #{taskPatrolledId}, @@ -147,4 +147,4 @@ #{dataId} - \ No newline at end of file +