修改管材

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/VerifyServiceImpl.java

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.VerifyMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.WeldMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IVerifyService;
+import com.yeejoin.amos.boot.module.ugp.biz.fegin.MaasServiceFeignClient;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -21,6 +22,8 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -68,6 +71,9 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
 
     @Value("${mqtt.topic.weldUpdate}")
     private String weldUpdate;
+
+    @Autowired
+    private MaasServiceFeignClient maasServiceFeignClient;
     /**
 
      * 分页查询
@@ -340,7 +346,8 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
             verify.setCode(jsonObject.getString("code"));
             //从图片中获取管材编号materialId
            //管材编号(暂时写死)
-            String materialCode = "1585520415743176365";
+            String url = "http://172.16.10.220:9000/"+photo;
+            String materialCode = getMaterialCodeByOcr(url);
             verify.setStage(StageEnum.焊前管材质量.getStage());
             /**校验*/
             Boolean flag =false;
@@ -660,6 +667,7 @@ public class VerifyServiceImpl extends BaseService<VerifyDto,Verify,VerifyMapper
         return VerifyEnum.已通过.getName();
     }
 
+
     /**  cpp
      * 校验失败需要添加的数据
      * @param verify
@@ -1219,4 +1227,18 @@ return jsonArray;
         objectPage1.setRecords(list2);
        return objectPage1 ;
     }
+
+
+
+    public String getMaterialCodeByOcr(String urlPath){
+        JSONObject param = new JSONObject();
+        JSONArray urls = new JSONArray();
+        JSONObject url = new JSONObject();
+        url.put("url", urlPath);
+        urls.add(url);
+        param.put("data", urls);
+        ResponseModel<Object> result = maasServiceFeignClient.getPatrolDangerInfo(param);
+        String resultStr = JSONObject.parseObject(JSONObject.toJSONString(result.getResult())).getJSONObject("result1").getJSONArray("rows").getJSONObject(0).getString("ocrResult");
+        return resultStr;
+    }
 }