diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java index 8628c69..10c4f72 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/MaReceiveController.java @@ -102,7 +102,7 @@ public class MaReceiveController extends BaseController { } @ApiOperation(value = "修改租赁设备状态") - @GetMapping("/updateItemStatus") + @PostMapping("/updateItemStatus") public AjaxResult updateItemStatus(@RequestBody String maMachineRequest) { Integer itemStatus = maReceiveService.updateItemStatus(maMachineRequest); return success(itemStatus); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java index 44dd866..8519418 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/DataReceiveDetail.java @@ -110,5 +110,5 @@ public class DataReceiveDetail { private Long itemId; @ApiModelProperty(value = "机手附件信息") - private List enterpriseDriverFile; + private List enterpriseDriverFileList; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/EnterpriseDriverFile.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/EnterpriseDriverFile.java index dedaa71..8f8f6a1 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/EnterpriseDriverFile.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/EnterpriseDriverFile.java @@ -14,7 +14,7 @@ public class EnterpriseDriverFile { private Integer receiveDetailId; @ApiModelProperty(value = "附件名称") - private String file_name; + private String fileName; @ApiModelProperty(value = "附件地址") private String fileUrl; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java index 0e4fe70..efdc287 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java @@ -185,7 +185,7 @@ public class MaMachineServiceImpl implements MaMachineService { @Override public AjaxResult pushNotifications(List maMachineList) { - log.info("MaMachineServiceImpl pushNotifications 开始处理设备推送逻辑==={}",maMachineList); + log.info("MaMachineServiceImpl pushNotifications 开始处理设备推送逻辑==={},地址{}",maMachineList,zlptUrl); if (maMachineList.isEmpty()){ throw new ServiceException(String.format(ExceptionDict.PARAM_IS_NULL_ERROR_MSG,"maMachineList"), ExceptionDict.PARAM_IS_NULL_ERROR); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java index 374f1cf..6d6cb94 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/MaReceiveServiceImpl.java @@ -65,6 +65,7 @@ public class MaReceiveServiceImpl implements MaReceiveService { @Override @Transactional public int saveDataReceiveDetails(DataReceiveDetail dataReceiveDetail) { + log.info("保存推送详情{}", dataReceiveDetail); int i = 0; //保存推送详情 i = maReceiveMapper.saveDataReceiveDetails(dataReceiveDetail); @@ -72,7 +73,7 @@ public class MaReceiveServiceImpl implements MaReceiveService { throw new RuntimeException("保存失败"); } //保存机手附件信息 - List enterpriseDriverFileList = dataReceiveDetail.getEnterpriseDriverFile(); + List enterpriseDriverFileList = dataReceiveDetail.getEnterpriseDriverFileList(); if (enterpriseDriverFileList != null && !enterpriseDriverFileList.isEmpty()){ for (EnterpriseDriverFile enterpriseDriverFile : enterpriseDriverFileList) { enterpriseDriverFile.setReceiveDetailId(dataReceiveDetail.getId()); @@ -99,7 +100,7 @@ public class MaReceiveServiceImpl implements MaReceiveService { public List getDataReceiveDetails(DataReceiveDetail dataReceiveDetail) { List dataReceiveDetails = maReceiveMapper.getDataReceiveDetails(dataReceiveDetail); dataReceiveDetails.forEach(dataReceiveDetail1 -> { - dataReceiveDetail1.setEnterpriseDriverFile(enterpriseDriverFileMapper.selectEnterpriseDriverFileByReceiveDetailId(dataReceiveDetail1.getId())); + dataReceiveDetail1.setEnterpriseDriverFileList(enterpriseDriverFileMapper.selectEnterpriseDriverFileByReceiveDetailId(dataReceiveDetail1.getId())); }); return dataReceiveDetails; } @@ -110,7 +111,8 @@ public class MaReceiveServiceImpl implements MaReceiveService { for (DataReceiveDetail dataReceiveDetail : dataReceiveInfo.getDataReceiveDetailList()) { MaMachine maMachine = new MaMachine(); maMachine.setMaCode(FieldGenerator.generateField()); - maMachine.setTypeId(dataReceiveDetail.getTypeId()); +// maMachine.setTypeId(dataReceiveDetail.getTypeId()); + maMachine.setTypeId(1763); maMachine.setMaStatus("15"); maMachine.setCreateTime(new Date()); maMachine.setSouceBy(2); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/enterpriseDriverFileMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/enterpriseDriverFileMapper.xml index 0ef3c0a..27635ff 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/enterpriseDriverFileMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/enterpriseDriverFileMapper.xml @@ -5,7 +5,7 @@ - insert into base_enterprise_driver_file(receive_detail_id,file_name,file_url,file_type) + insert into enterprise_driver_file(receive_detail_id,file_name,file_url,file_type) values(#{receiveDetailId},#{fileName},#{fileUrl},#{fileType})