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 0ce837f..d9bbd52 100644 --- a/bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyCarController.java +++ b/bweb/src/main/java/com/bweb/controller/item/EnTransportCompanyCarController.java @@ -85,16 +85,6 @@ public class EnTransportCompanyCarController { body.setCreateUserName(sessionModel.getAccount().getUserName()); enTransportCompanyCarService.create(body); - // 生成二维码 - String url = "carId="; - 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.setUpdateUser(sessionModel.getAccount().getId()); - body.setUpdateUserName(sessionModel.getAccount().getUserName()); - enTransportCompanyCarService.update(body); return ResponseMsgUtil.success("操作成功"); diff --git a/service/src/main/java/com/hfkj/service/item/EnTransportCompanyCarService.java b/service/src/main/java/com/hfkj/service/item/EnTransportCompanyCarService.java index 193f798..47d76aa 100644 --- a/service/src/main/java/com/hfkj/service/item/EnTransportCompanyCarService.java +++ b/service/src/main/java/com/hfkj/service/item/EnTransportCompanyCarService.java @@ -25,6 +25,8 @@ public interface EnTransportCompanyCarService { */ void update(EnTransportCompanyCar enTransportCompanyCar); + void updateDate(EnTransportCompanyCar enTransportCompanyCar); + /** * @MethodName delete * @Description:删除 diff --git a/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyCarServiceImpl.java b/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyCarServiceImpl.java index 13372b9..eb81310 100644 --- a/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyCarServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyCarServiceImpl.java @@ -1,5 +1,6 @@ package com.hfkj.service.item.impl; +import com.hfkj.common.QRCodeGenerator; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; @@ -13,6 +14,8 @@ import com.hfkj.sysenum.SecUserStatusEnum; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; @@ -27,6 +30,7 @@ public class EnTransportCompanyCarServiceImpl implements EnTransportCompanyCarSe private SecUserService secUserService; @Override + @Transactional(propagation= Propagation.REQUIRES_NEW,rollbackFor= {RuntimeException.class}) public void create(EnTransportCompanyCar enTransportCompanyCar) throws Exception { enTransportCompanyCarMapper.insert(enTransportCompanyCar); @@ -34,6 +38,17 @@ public class EnTransportCompanyCarServiceImpl implements EnTransportCompanyCarSe throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "登录账户已存在,请更换"); } + // 生成二维码 + String url = "carId="; + String qrCodeImg = "carQrCode/" + enTransportCompanyCar.getId()+".png"; + String qrCodeUrl = "/home/project/en-server/filesystem/" + qrCodeImg; + QRCodeGenerator.generateQRCodeImage(url+enTransportCompanyCar.getId(), 350, 350, qrCodeUrl); + enTransportCompanyCar.setQrImg(qrCodeImg); + + enTransportCompanyCar.setUpdateUser(enTransportCompanyCar.getCreateUser()); + enTransportCompanyCar.setUpdateUserName(enTransportCompanyCar.getCreateUserName()); + updateDate(enTransportCompanyCar); + SecUser secUser = new SecUser(); secUser.setUserName(enTransportCompanyCar.getPerson()); secUser.setCreateTimeUserId(enTransportCompanyCar.getCreateUser()); @@ -59,6 +74,11 @@ public class EnTransportCompanyCarServiceImpl implements EnTransportCompanyCarSe secUserService.editUser(secUser); } + @Override + public void updateDate(EnTransportCompanyCar enTransportCompanyCar) { + enTransportCompanyCarMapper.updateByPrimaryKey(enTransportCompanyCar); + } + @Override public void delete(Long id, Boolean fullDelete) { EnTransportCompanyCar enTransportCompanyCar = queryDetail(id); diff --git a/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyServiceImpl.java b/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyServiceImpl.java index d936573..3c098d0 100644 --- a/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/item/impl/EnTransportCompanyServiceImpl.java @@ -13,6 +13,8 @@ import com.hfkj.sysenum.SecUserStatusEnum; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -29,6 +31,7 @@ public class EnTransportCompanyServiceImpl implements EnTransportCompanyService private SecUserService secUserService; @Override + @Transactional(propagation= Propagation.REQUIRES_NEW,rollbackFor= {RuntimeException.class}) public void create(EnTransportCompany enTransportCompany) throws Exception { enTransportCompanyMapper.insert(enTransportCompany);