|
@ -8,11 +8,17 @@ import com.yxt.common.base.utils.PagerUtil; |
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
import com.yxt.common.core.query.PagerQuery; |
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
import com.yxt.common.core.vo.PagerVo; |
|
|
import com.yxt.common.core.vo.PagerVo; |
|
|
|
|
|
import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecord; |
|
|
|
|
|
import com.yxt.supervise.cyf.api.crudeoilpricerecord.CrudeOilPriceRecordDto; |
|
|
|
|
|
import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformation; |
|
|
import com.yxt.supervise.cyf.api.tankinformation.TankInformation; |
|
|
import com.yxt.supervise.cyf.api.tankinformation.TankInformation; |
|
|
import com.yxt.supervise.cyf.api.tankinformation.TankInformationDto; |
|
|
import com.yxt.supervise.cyf.api.tankinformation.TankInformationDto; |
|
|
import com.yxt.supervise.cyf.api.tankinformation.TankInformationQuery; |
|
|
import com.yxt.supervise.cyf.api.tankinformation.TankInformationQuery; |
|
|
import com.yxt.supervise.cyf.api.tankinformation.TankInformationVo; |
|
|
import com.yxt.supervise.cyf.api.tankinformation.TankInformationVo; |
|
|
|
|
|
import com.yxt.supervise.cyf.biz.crudeoilpricerecord.CrudeOilPriceRecordService; |
|
|
|
|
|
import com.yxt.supervise.cyf.biz.crudeoiltypeinformation.CrudeOilTypeInformationService; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
import java.util.List; |
|
|
import java.util.List; |
|
@ -24,7 +30,10 @@ import java.util.List; |
|
|
@Service |
|
|
@Service |
|
|
public class TankInformationService extends MybatisBaseService<TankInformationMapper, TankInformation> { |
|
|
public class TankInformationService extends MybatisBaseService<TankInformationMapper, TankInformation> { |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
CrudeOilTypeInformationService crudeOilTypeInformationService; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
CrudeOilPriceRecordService crudeOilPriceRecordService; |
|
|
public PagerVo<TankInformationVo> listPageVo(PagerQuery<TankInformationQuery> pq) { |
|
|
public PagerVo<TankInformationVo> listPageVo(PagerQuery<TankInformationQuery> pq) { |
|
|
TankInformationQuery query = pq.getParams(); |
|
|
TankInformationQuery query = pq.getParams(); |
|
|
QueryWrapper<TankInformation> qw = new QueryWrapper<>(); |
|
|
QueryWrapper<TankInformation> qw = new QueryWrapper<>(); |
|
@ -47,6 +56,14 @@ public class TankInformationService extends MybatisBaseService<TankInformationMa |
|
|
TankInformation entity=new TankInformation(); |
|
|
TankInformation entity=new TankInformation(); |
|
|
BeanUtil.copyProperties(dto, entity, "id", "sid"); |
|
|
BeanUtil.copyProperties(dto, entity, "id", "sid"); |
|
|
entity.setInventory(dto.getInitialInventory()); |
|
|
entity.setInventory(dto.getInitialInventory()); |
|
|
|
|
|
CrudeOilTypeInformation crude=crudeOilTypeInformationService.getOne(new QueryWrapper<CrudeOilTypeInformation>().eq("sid",dto.getCrudeSid())); |
|
|
|
|
|
//新增价格记录
|
|
|
|
|
|
CrudeOilPriceRecordDto dto1=new CrudeOilPriceRecordDto(); |
|
|
|
|
|
dto1.setTypeSid(entity.getSid()); |
|
|
|
|
|
dto1.setPrice(crude.getPrice()); |
|
|
|
|
|
dto1.setOldPrice(crude.getPrice()); |
|
|
|
|
|
crudeOilPriceRecordService.save(dto1); |
|
|
|
|
|
entity.setTotalValue(crude.getPrice()*entity.getInventory()); |
|
|
baseMapper.insert(entity); |
|
|
baseMapper.insert(entity); |
|
|
return rb.success().setMsg("新增成功"); |
|
|
return rb.success().setMsg("新增成功"); |
|
|
} |
|
|
} |
|
|