|
|
@@ -11,9 +11,11 @@ import com.zd.airbottle.service.DbUsageRecordService;
|
|
|
import com.zd.airbottle.utils.PageUtil;
|
|
|
import com.zd.common.core.annotation.Log;
|
|
|
import com.zd.common.core.log.BusinessType;
|
|
|
+import com.zd.common.core.security.TokenService;
|
|
|
import com.zd.common.core.utils.StringUtils;
|
|
|
import com.zd.common.core.web.controller.AbstractController;
|
|
|
import com.zd.model.domain.ResultData;
|
|
|
+import com.zd.model.entity.SysUser;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -40,6 +42,8 @@ public class DbUsageRecordController extends AbstractController {
|
|
|
@Autowired
|
|
|
private DbStockService dbStockService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TokenService tokenService;
|
|
|
/**
|
|
|
* 添加使用记录
|
|
|
*
|
|
|
@@ -54,8 +58,15 @@ public class DbUsageRecordController extends AbstractController {
|
|
|
paramCheck.notNull(dbUsageRecordBo).notNull(dbUsageRecordBo.getUsageStartTime()).notNull(dbUsageRecordBo.getUsageEndTime());
|
|
|
DbUsageRecord dbUsageRecord = new DbUsageRecord();
|
|
|
BeanUtils.copyProperties(dbUsageRecordBo, dbUsageRecord);
|
|
|
- dbUsageRecord.setOperator(getCurrentUserName());
|
|
|
- dbUsageRecord.setOperatorId(getCurrentUserId());
|
|
|
+ DbStock dbStock = dbStockService.getById(dbUsageRecordBo.getStcokId());
|
|
|
+
|
|
|
+
|
|
|
+ SysUser sysUser = tokenService.getLoginUser().getSysUser();
|
|
|
+ if (sysUser == null) {
|
|
|
+ dbUsageRecord.setOperator(sysUser.getNickName());
|
|
|
+ dbUsageRecord.setOperatorId(sysUser.getUserId());
|
|
|
+ dbUsageRecord.setPhone(sysUser.getPhonenumber());
|
|
|
+ }
|
|
|
if (dbUsageRecordService.save(dbUsageRecord)) {
|
|
|
if(dbUsageRecord.getGasPressure() != null){
|
|
|
dbStockService.update(new LambdaUpdateWrapper<DbStock>().eq(DbStock::getId,dbUsageRecordBo.getStcokId()).set(DbStock::getGasPressure,dbUsageRecord.getGasPressure()));
|