diff --git a/bweb/src/main/java/com/bweb/controller/TestController.java b/bweb/src/main/java/com/bweb/controller/TestController.java index 578f053..0aa50bf 100644 --- a/bweb/src/main/java/com/bweb/controller/TestController.java +++ b/bweb/src/main/java/com/bweb/controller/TestController.java @@ -11,6 +11,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import java.util.HashMap; @@ -45,14 +46,14 @@ public class TestController { @RequestMapping(value="/generateQRCodeImage",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询详情") - public ResponseData generateQRCodeImage() { + public ResponseData generateQRCodeImage(@RequestParam(value = "id" , required = false) Long id) { try { // 生成二维码 String url = "carId="; - String qrCodeImg = "carQrCode/17" +".png"; + String qrCodeImg = "carQrCode/" + id +".png"; String qrCodeUrl = "/home/project/en-server/filesystem/" + qrCodeImg; - QRCodeGenerator.generateQRCodeImage(url+"17", 350, 350, qrCodeUrl); + QRCodeGenerator.generateQRCodeImage(url+id, 350, 350, qrCodeUrl); return ResponseMsgUtil.success(qrCodeUrl); diff --git a/bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyCarController.java b/bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyCarController.java index db064ee..0ce837f 100644 --- a/bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyCarController.java +++ b/bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyCarController.java @@ -79,6 +79,7 @@ public class EnTransportCompanyCarController { body.setUpdateTime(new Date()); body.setCreateTime(new Date()); + body.setTransportId(sessionModel.getAccount().getObjectId()); body.setCreateUser(sessionModel.getAccount().getId()); body.setStatus(1); body.setCreateUserName(sessionModel.getAccount().getUserName()); @@ -89,9 +90,8 @@ public class EnTransportCompanyCarController { String qrCodeImg = "carQrCode/" + body.getId()+".png"; String qrCodeUrl = "/home/project/en-server/filesystem/" + qrCodeImg; QRCodeGenerator.generateQRCodeImage(url+body.getId(), 350, 350, qrCodeUrl); - body.setQrImg(qrCodeImg); - body.setTransportId(sessionModel.getAccount().getObjectId()); + body.setUpdateUser(sessionModel.getAccount().getId()); body.setUpdateUserName(sessionModel.getAccount().getUserName()); enTransportCompanyCarService.update(body);