diff --git a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/HttpHelper.java b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/HttpHelper.java index f05f5a4..58a58b8 100644 --- a/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/HttpHelper.java +++ b/sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/utils/HttpHelper.java @@ -41,7 +41,7 @@ public class HttpHelper { System.out.println("JSONBody-=========:" + JSONBody); CloseableHttpClient httpClient = HttpClients.createDefault(); HttpPost httpPost = new HttpPost(url); - httpPost.addHeader("Content-Type", "application/json; charset=UTF-8"); + httpPost.addHeader("Content-Type", "multipart/form-data; charset=UTF-8"); if (!CollectionUtils.isEmpty(headerMap)) { for (Map.Entry entry : headerMap.entrySet()) { httpPost.addHeader(entry.getKey(), entry.getValue()); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 0da6bf4..18b1d68 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -1383,16 +1383,19 @@ public class TmTaskServiceImpl implements TmTaskService { try { String content = JSONObject.toJSONString(intelVOList); Map bodyMap = new HashMap<>(); - bodyMap.put("body", content); + //如果以后文件,就添加进去 + bodyMap.put("files", ""); + bodyMap.put("params", content); String body = JSONObject.toJSONString(bodyMap); Map headerMap = new HashMap<>(); - headerMap.put("appKey", intelligentAppKey); - String token = GetTokenByAppKey.getToken(intelligentAppKey, intelligentAesKey); + headerMap.put("appKey", /*intelligentAppKey*/"abc123"); + String token = GetTokenByAppKey.getToken(/*intelligentAppKey*/"abc123", /*intelligentAesKey*/"abcdefghijklmnop"); headerMap.put("token", token); - String data = HttpHelper.sendHttpPost(intelligentUrl+"/acceptExternalMechanical", headerMap, body); + String data = HttpHelper.sendHttpPost(/*intelligentUrl+*/"https://sit.zhgkxt.com/api/clientapi/public/externalApi/acceptExternalMechanical", headerMap, body); log.info("dataString-=========:" + data); resultDataHandler(data); } catch (Exception e) { + log.error("请求失败!{}", e); return AjaxResult.error("请求失败!{}", e.getMessage()); } log.info("推送成功!修改状态"); @@ -1407,37 +1410,56 @@ public class TmTaskServiceImpl implements TmTaskService { return AjaxResult.success("请求成功!"); } + public static void main(String[] args) { + List tmTasks = new ArrayList<>(); + TmTask tmTask= new TmTask(); + tmTask.setId("622"); + tmTask.setCreateTime(new Date()); + tmTask.setLeasePerson("李思思"); + tmTask.setAgreementCode("XY20240830-0001"); + tmTask.setManageType("0"); + tmTask.setPartNum(5); + tmTask.setProName("核打击保密单位"); + tmTasks.add(tmTask); + TmTaskServiceImpl tm = new TmTaskServiceImpl(); + tm.pushToIntelligentProject( tmTasks); + } + private void makeIntelligentVOList(List tmTasks, List intelVOList) { LoginUser loginUser = SecurityUtils.getLoginUser(); for (TmTask task : tmTasks) { - List subTasks = tmTaskMapper.getLeaseOutDetails(task); - for (TmTask subTask : subTasks) { + // List subTasks = tmTaskMapper.getLeaseOutDetails(task); + // for (TmTask subTask : subTasks) { MaMachineIntelligentVO intelVO = new MaMachineIntelligentVO(); - intelVO.setSocialCreditCode(loginUser.getSysUser().getDept().getSocialCreditCode()); + intelVO.setSocialCreditCode(/*loginUser.getSysUser().getDept().getSocialCreditCode()*/"9134010039449847XC"); intelVO.setAffiliatedUnitName(task.getUnitName()); intelVO.setBelongUnitId(String.valueOf(task.getUnitId())); intelVO.setCategoryCode(task.getTypeId()); intelVO.setClassifyCode(task.getTypeId()); - intelVO.setDelReason(""); - intelVO.setInspectorUnitName(""); - intelVO.setInspectionCertificateNumber(""); - intelVO.setManufacturer(""); - intelVO.setMultipartFiles(""); + intelVO.setDelReason("不是报废"); + intelVO.setInspectorUnitName("123"); + intelVO.setInspectionCertificateNumber("123"); + intelVO.setManufacturer("123"); + intelVO.setMultipartFiles("123"); intelVO.setOperateType(1); //0:默认新增 1:修改以前推送的数据 - intelVO.setRemarks(""); + intelVO.setRemarks("123"); intelVO.setSource(2); //1:智慧工程系统 2:第三方数据 intelVO.setStatus("15".equals(task.getMaStatus()) ? 0 : 1); //0:有效 1:无效 - intelVO.setSpecificationType(""); + intelVO.setSpecificationType("123"); intelVO.setValidityDate(new Date()); //每个设备不同点的设置 - String ownerCode = loginUser.getSysUser().getDept().getEnterpriseOwnershipCode(); - intelVO.setDeviceCode(StringUtils.getDeviceCode(ownerCode, subTask.getTypeName(), subTask.getTypeId(), subTask.getCreateTime(), subTask.getMaId())); - intelVO.setFactoryDate(subTask.getOutFacTime()); +// String ownerCode = loginUser.getSysUser().getDept().getEnterpriseOwnershipCode(); + //intelVO.setDeviceCode(StringUtils.getDeviceCode(ownerCode, subTask.getTypeName(), subTask.getTypeId(), subTask.getCreateTime(), subTask.getMaId())); + intelVO.setDeviceCode("CSG-A101-2024061950001"); + /* intelVO.setFactoryDate(subTask.getOutFacTime()); intelVO.setMachineryCode(subTask.getMaId()); - intelVO.setTrialDate(subTask.getThisCheckTime()); + intelVO.setTrialDate(subTask.getThisCheckTime());*/ + intelVO.setFactoryDate(new Date()); + intelVO.setMachineryCode("123"); + intelVO.setTrialDate(new Date()); //组成list intelVOList.add(intelVO); - } + // } } } @@ -1445,7 +1467,7 @@ public class TmTaskServiceImpl implements TmTaskService { JSONObject object = JSONObject.parseObject(data); System.err.println(data); String code = object.getString("code"); - if ("200".equals(code)) { + if ("0".equals(code)) { String dataResultString = object.getString("data"); // 数据解密 String dataArrayString = RsaUtil.decryptByPrivateKey(dataResultString, Constants.publicKey);