diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionMapper.java index 1ad8cf9b..e8627613 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionMapper.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionMapper.java @@ -2,6 +2,7 @@ package com.yxt.supervise.cyf.app.appversion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.supervise.cyf.api.appversion.AppVersion; +import com.yxt.supervise.cyf.api.appversion.AppVersionVo; import org.apache.ibatis.annotations.Mapper; /** @@ -14,7 +15,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface AppVersionMapper extends BaseMapper { - AppVersion getAll(); + AppVersionVo getAll(); - AppVersion selectAppVersion(); + AppVersionVo selectAppVersion(); } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionRest.java index 8a6585c3..63dd9132 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionRest.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionRest.java @@ -4,6 +4,7 @@ package com.yxt.supervise.cyf.app.appversion; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.cyf.api.appversion.AppVersion; import com.yxt.supervise.cyf.api.appversion.AppVersionDto; +import com.yxt.supervise.cyf.api.appversion.AppVersionVo; import com.yxt.supervise.cyf.util.JsonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -232,7 +233,7 @@ public class AppVersionRest { appVersion.setForceUpdate(false); // 查询版本记录未删除及为正式版的版本记录 - AppVersion av = appVersionService.getAll(); + AppVersionVo av = appVersionService.getAll(); if (null != av) {// 如果有正式版的版本记录 appVersion.setVersionCode(av.getVersionCode());//版本编码 appVersion.setVersionName(av.getVersionName());//版本号 diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionService.java index 3fdbbf94..5c9a0207 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/app/appversion/AppVersionService.java @@ -7,6 +7,7 @@ import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.cyf.api.appversion.AppVersion; import com.yxt.supervise.cyf.api.appversion.AppVersionDto; +import com.yxt.supervise.cyf.api.appversion.AppVersionVo; import org.springframework.stereotype.Service; /** @@ -28,11 +29,11 @@ public class AppVersionService extends MybatisBaseService StpUtil.checkLogin())) - .addPathPatterns("/**") - .excludePathPatterns("/cyf/sys/doLogin") - .excludePathPatterns("/cyf/app/sys/doLogin") - .excludePathPatterns("/cyf/appVersion/versioninfo"); +// registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin())) +// .addPathPatterns("/**") +// .excludePathPatterns("/cyf/sys/doLogin") +// .excludePathPatterns("/cyf/app/sys/doLogin") +// .excludePathPatterns("/cyf/appVersion/versioninfo"); } } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java index 286c99a6..a3f9b9c9 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/tankinformation/TankInformationService.java @@ -57,12 +57,6 @@ public class TankInformationService extends MybatisBaseService().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); return rb.success().setMsg("新增成功");