diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 2a3d8dc679..efb2562291 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -864,26 +864,29 @@ public class BaseVehicleService extends MybatisBaseService> commonConfigInfoList = new ArrayList<>(); List list2 = new ArrayList<>(); - list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor())); - list2.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine())); - list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror())); - list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize())); - list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification())); list2.add(getConfigValueSpanSize("后桥", configVo.getRearAxleValue())); list2.add(getConfigValueSpanSize("速比", configVo.getRearAxleRatio())); - list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner())); - list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial())); - list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel())); + list2.add(getConfigValueSpanSize("轴距", configVo.getWheelbase())); list2.add(getConfigValueSpanSize("悬架", configVo.getSuspension())); - list2.add(getConfigValueSpanSize("座椅", configVo.getSeat())); - list2.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover())); list2.add(getConfigValueSpanSize("鞍座", configVo.getSaddle())); - list2.add(getConfigValueSpanSize("轴距", configVo.getWheelbase())); + list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor())); + list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification())); list2.add(getConfigValueSpanSize("保险杠", configVo.getBumper())); - list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao())); - list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources())); list2.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank())); + list2.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel())); + list2.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources())); + list2.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine())); + list2.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover())); + list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror())); + list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize())); + list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial())); + list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner())); + list2.add(getConfigValueSpanSize("座椅", configVo.getSeat())); list2.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia())); + list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao())); + + + configDetailVo.setConfigInfo(list2); //更多配置 String otherConfig = configVo.getOtherConfig(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java index 5579f80fcf..1b24e25597 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java @@ -470,31 +470,31 @@ public class BusVehicleOrderService extends MybatisBaseService> commonConfigInfoList = new ArrayList<>(); List list3 = new ArrayList<>(); - list3.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1)); - list3.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine(), 1)); - list3.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror(), 1)); - list3.add(getConfigValueSpanSize("轮胎", configVo.getTireSize(), 1)); - list3.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification(), 1)); list3.add(getConfigValueSpanSize("后桥", configVo.getRearAxleValue(),1)); list3.add(getConfigValueSpanSize("速比", configVo.getRearAxleRatio(), 1)); - list3.add(getConfigValueSpanSize("空调", configVo.getAirConditioner(), 1)); - list3.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial(), 1)); - list3.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel(), 1)); + list3.add(getConfigValueSpanSize("轴距", configVo.getWheelbase(), 1)); list3.add(getConfigValueSpanSize("悬架", configVo.getSuspension(), 1)); - list3.add(getConfigValueSpanSize("座椅", configVo.getSeat(), 1)); - list3.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover(), 1)); list3.add(getConfigValueSpanSize("鞍座", configVo.getSaddle(), 1)); - list3.add(getConfigValueSpanSize("轴距", configVo.getWheelbase(), 1)); + list3.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1)); + list3.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification(), 1)); list3.add(getConfigValueSpanSize("保险杠", configVo.getBumper(), 1)); - list3.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao(), 1)); - list3.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1)); list3.add(getConfigValueSpanSize("燃料箱", configVo.getFuelTank(), 1)); + list3.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel(), 1)); + list3.add(getConfigValueSpanSize("独立热源", configVo.getIndependentSources(), 1)); + list3.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine(), 1)); + list3.add(getConfigValueSpanSize("护轮罩", configVo.getTireCover(), 1)); + list3.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror(), 1)); + list3.add(getConfigValueSpanSize("轮胎", configVo.getTireSize(), 1)); + list3.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial(), 1)); + list3.add(getConfigValueSpanSize("空调", configVo.getAirConditioner(), 1)); + list3.add(getConfigValueSpanSize("座椅", configVo.getSeat(), 1)); list3.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia(), 1)); + list3.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao(), 1)); configDetailVo.setConfigInfo(list3); //更多配置 String otherConfig = configVo.getOtherConfig(); configDetailVo.setMoreConfig(otherConfig); - return null; + return configDetailVo; } /** diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index ed1f2ddab9..0b41091a00 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1688,10 +1688,10 @@ public class CommonContractService extends MybatisBaseService fetchBySid(@PathVariable("sid") String sid); + @ApiOperation("查询按钮的权限") + @PostMapping("/getButtonPermissions") + public ResultBean> getButtonPermissions(@RequestBody ButtonPermissionQuery query); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java index 1dfc53514e..220c2d0e8d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java @@ -89,4 +89,9 @@ public class SysFunctionFeignFallback implements SysFunctionFeign { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui_portal/sysfunction/fetchBySid无法访问"); } + + @Override + public ResultBean> getButtonPermissions(ButtonPermissionQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java index 648787b5a0..ad146bc087 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java @@ -43,7 +43,8 @@ public class SysFunctionQuery implements Query { @ApiModelProperty("移动端按钮id") private String funId; - + @ApiModelProperty("前端控制按钮的id") + private String cId; @ApiModelProperty("是否手机端权限0否,1是") private String phoneFunction; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java index 7cbfbdad4b..49bd6c0a47 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java @@ -48,4 +48,8 @@ public class SysFunctionVo implements Vo { private String sourceSid; @ApiModelProperty("是否可用") private Integer isEnable; + @ApiModelProperty("移动端按钮id") + private String funId; + @ApiModelProperty("前端控制按钮的id") + private String cId; } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java index a8c92a01e9..69f354f5c9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java @@ -5,9 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.portal.api.sysfunction.SysFunction; -import com.yxt.anrui.portal.api.sysfunction.SysFunctionTreeVo; -import com.yxt.anrui.portal.api.sysfunction.SysFunctionVo; +import com.yxt.anrui.portal.api.sysfunction.*; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -56,4 +55,6 @@ public interface SysFunctionMapper extends BaseMapper { * @return */ int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid); + + List getButtonPermissions(@Param("query")ButtonPermissionQuery query); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml index e22c86145e..8534e68e16 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml @@ -60,4 +60,11 @@ where sf.isEnable = #{isEnable} and ssf.sourceSid = #{sourceSid} + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java index 525930b73c..9ef3101384 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java @@ -192,4 +192,10 @@ public class SysFunctionRest implements SysFunctionFeign { } return rb.success().setData(vo); } + + @Override + public ResultBean> getButtonPermissions(ButtonPermissionQuery query) { + ResultBean> rb = ResultBean.fireFail(); + return rb.success().setData(sysFunctionService.getButtonPermissions(query)); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java index 2cb0868a03..fbd2836632 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java @@ -10,6 +10,7 @@ import com.yxt.anrui.portal.biz.syssourcefunction.SysSourceFunctionService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -234,4 +235,9 @@ public class SysFunctionService extends MybatisBaseService sids) { return baseMapper.updateBySourceSid(isEnable, sids); } + + public List getButtonPermissions(ButtonPermissionQuery query) { + List buttonPermissions = baseMapper.getButtonPermissions(query); + return buttonPermissions ; + } } \ No newline at end of file