|
@@ -510,24 +510,27 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
System.out.println(object);
|
|
|
JSONArray data = (JSONArray) object.get("data");
|
|
|
System.out.println(data);
|
|
|
- for (int i = 0; i < data.size(); i++) {
|
|
|
- JSONObject jsonObject1 = (JSONObject) data.get(i);
|
|
|
- if (jsonObject1.get("plate").equals(billPersonnelAdmission.getCarNum())) {
|
|
|
- JSONObject jsonObject2 = new JSONObject();
|
|
|
- jsonObject2.put("isBlack", false);
|
|
|
- jsonObject2.put("seq", deviceList.getDeviceCode());
|
|
|
- List<Integer> list = new ArrayList<>();
|
|
|
- list.add((Integer) jsonObject1.get("cid"));
|
|
|
- jsonObject2.put("cids", list);
|
|
|
-
|
|
|
- String body = HttpRequest.post(" http://39.173.90.137:8040/delCarDeviceWoBList").header(Header.CONTENT_TYPE, "application/json")
|
|
|
- .body(jsonObject2.toJSONString())
|
|
|
- .timeout(30 * 1000).execute().body();
|
|
|
- System.out.println(body);
|
|
|
+ if (data.size() > 0) {
|
|
|
+ for (int i = 0; i < data.size(); i++) {
|
|
|
+ JSONObject jsonObject1 = (JSONObject) data.get(i);
|
|
|
+ if (jsonObject1.get("plate").equals(billPersonnelAdmission.getCarNum())) {
|
|
|
+ JSONObject jsonObject2 = new JSONObject();
|
|
|
+ jsonObject2.put("isBlack", false);
|
|
|
+ jsonObject2.put("seq", deviceList.getDeviceCode());
|
|
|
+ List<Integer> list = new ArrayList<>();
|
|
|
+ list.add((Integer) jsonObject1.get("cid"));
|
|
|
+ jsonObject2.put("cids", list);
|
|
|
+
|
|
|
+ String body = HttpRequest.post(" http://39.173.90.137:8040/delCarDeviceWoBList").header(Header.CONTENT_TYPE, "application/json")
|
|
|
+ .body(jsonObject2.toJSONString())
|
|
|
+ .timeout(30 * 1000).execute().body();
|
|
|
+ System.out.println(body);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
JSONObject jsonObject1 = new JSONObject();
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
JSONObject object1 = new JSONObject();
|
|
@@ -1209,7 +1212,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
List<DeviceList> deviceLists = deviceListMapper.selectList(deviceListQueryWrapper);
|
|
|
//找到对应的入场申请表
|
|
|
QueryWrapper<BillPersonnelAdmission> queryWrapper1 = new QueryWrapper<>();
|
|
|
- queryWrapper1.eq("farm_id", isolate.getFarmId()).eq("process_id", isolate.getId());
|
|
|
+ queryWrapper1.eq("farm_id", isolate.getFarmId()).eq("process_id", isolate.getProcessId());
|
|
|
BillPersonnelAdmission billPersonnelAdmission = billPersonnelAdmissionMapper.selectOne(queryWrapper1);
|
|
|
if (deviceLists.size() > 0) {
|
|
|
for (DeviceList deviceList : deviceLists) {
|