现场联调问题修改

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));
     }
 

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())

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(

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<String> 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");
 //                }

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<BasedataMontTaskResult> list = jsonObjectItems.toJavaList(BasedataMontTaskResult.class);

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<BasedataMontTaskStaData> list = jsonObjectItems.toJavaList(BasedataMontTaskStaData.class);

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);

inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml

@@ -4,9 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.inspect.metadata.montdata.mapper.BasedataMontTaskResultMapper">
 
-    <resultMap type="BasedataMontTaskResult" id="BasedataMontTaskResultResult">
+    <resultMap type="com.inspect.metadata.montdata.domain.BasedataMontTaskResult" id="BasedataMontTaskResultResult">
         <result property="resultId" column="result_id"/>
-        <result property="eqp_book_id" column="eqp_book_id"/>
+        <result property="eqpBookId" column="eqp_book_id"/>
         <result property="patrolDeviceCode" column="patrol_device_code"/>
         <result property="patrolDeviceName" column="patrol_device_name"/>
         <result property="taskName" column="task_name"/>
@@ -50,7 +50,7 @@
         from basedata_mont_taskresult
     </sql>
 
-    <select id="selectBasedataMontTaskResultList" parameterType="BasedataMontTaskResult"
+    <select id="selectBasedataMontTaskResultList" parameterType="com.inspect.metadata.montdata.domain.BasedataMontTaskResult"
             resultMap="BasedataMontTaskResultResult">
         <include refid="selectBasedataMontTaskResultVo"/>
         <where>
@@ -97,7 +97,7 @@
         where result_id = #{resultId}
     </select>
 
-    <insert id="insertBasedataMontTaskResult" parameterType="BasedataMontTaskResult" useGeneratedKeys="true"
+    <insert id="insertBasedataMontTaskResult" parameterType="com.inspect.metadata.montdata.domain.BasedataMontTaskResult" useGeneratedKeys="true"
             keyProperty="resultId">
         insert into basedata_mont_taskresult
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -156,7 +156,7 @@
         </trim>
     </insert>
 
-    <update id="updateBasedataMontTaskResult" parameterType="BasedataMontTaskResult">
+    <update id="updateBasedataMontTaskResult" parameterType="com.inspect.metadata.montdata.domain.BasedataMontTaskResult">
         update basedata_mont_taskresult
         <trim prefix="SET" suffixOverrides=",">
             <if test="eqpBookId != null">eqp_book_id = #{eqpBookId},</if>
@@ -200,4 +200,4 @@
             #{resultId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.inspect.metadata.montdata.mapper.BasedataMontTaskStaDataMapper">
 
-    <resultMap type="BasedataMontTaskStaData" id="BasedataMontTaskStaDataResult">
+    <resultMap type="com.inspect.metadata.montdata.domain.BasedataMontTaskStaData" id="BasedataMontTaskStaDataResult">
         <result property="dataId" column="data_id"/>
         <result property="taskPatrolledId" column="task_patrolled_id"/>
         <result property="taskName" column="task_name"/>
@@ -43,7 +43,7 @@
         from basedata_mont_taskstadata
     </sql>
 
-    <select id="selectBasedataMontTaskStaDataList" parameterType="BasedataMontTaskStaData"
+    <select id="selectBasedataMontTaskStaDataList" parameterType="com.inspect.metadata.montdata.domain.BasedataMontTaskStaData"
             resultMap="BasedataMontTaskStaDataResult">
         <include refid="selectBasedataMontTaskStaDataVo"/>
         <where>
@@ -73,7 +73,7 @@
         where data_id = #{dataId}
     </select>
 
-    <insert id="insertBasedataMontTaskStaData" parameterType="BasedataMontTaskStaData" useGeneratedKeys="true"
+    <insert id="insertBasedataMontTaskStaData" parameterType="com.inspect.metadata.montdata.domain.BasedataMontTaskStaData" useGeneratedKeys="true"
             keyProperty="dataId">
         insert into basedata_mont_taskstadata
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -112,7 +112,7 @@
         </trim>
     </insert>
 
-    <update id="updateBasedataMontTaskStaData" parameterType="BasedataMontTaskStaData">
+    <update id="updateBasedataMontTaskStaData" parameterType="com.inspect.metadata.montdata.domain.BasedataMontTaskStaData">
         update basedata_mont_taskstadata
         <trim prefix="SET" suffixOverrides=",">
             <if test="taskPatrolledId != null and taskPatrolledId != ''">task_patrolled_id = #{taskPatrolledId},
@@ -147,4 +147,4 @@
             #{dataId}
         </foreach>
     </delete>
-</mapper>
+</mapper>