diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index c2a52c1..817e589 100644 --- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -76,6 +76,11 @@ public class ShiroConfig { } } // 配置不会被拦截的链接 顺序判断 + filterChainDefinitionMap.put("/sys/dict/getDictItems/ship_type", "anon"); //发货类型字典 + filterChainDefinitionMap.put("/vehicledemandcount/vehicleDemandCount/getVdCountById", "anon"); //获取用车计算数据 + filterChainDefinitionMap.put("/vehicleinout/vehicleInOut/take", "anon"); //提货 + filterChainDefinitionMap.put("/logisticsdriver/logisticsDriver/getDriverInfo", "anon"); //查询司机信息 + filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录 filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除 filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除 diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java index 11da6a3..aec9761 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/controller/VehicleDemandCountController.java @@ -205,4 +205,18 @@ public class VehicleDemandCountController extends JeecgController getVdCountById(@RequestParam(name="id",required=true) String id) { + List vdNos = vehicleDemandCountService.getVdCountById(id); + IPage page = new Page<>(1, vdNos.size()); + page.setRecords(vdNos); + page.setTotal(vdNos.size()); + return Result.OK(page); + } } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/VehicleDemandCountMapper.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/VehicleDemandCountMapper.java index 7f0dc14..1e17b31 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/VehicleDemandCountMapper.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/VehicleDemandCountMapper.java @@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface VehicleDemandCountMapper extends BaseMapper { List getByVdNo(@Param("vdNo") String vdNo); + + List getVdCountById(@Param("id") String id); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml index d1ae253..b8a7c40 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml @@ -13,4 +13,16 @@ and a.supplier_code = b.supplier_code where a.vd_no = #{vdNo} + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/IVehicleDemandCountService.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/IVehicleDemandCountService.java index d68c7df..70a706d 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/IVehicleDemandCountService.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/IVehicleDemandCountService.java @@ -15,4 +15,6 @@ public interface IVehicleDemandCountService extends IService List getByVdNo(String vdNo); void deleteByVdNo(String vdNo); + + List getVdCountById(String id); } diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/impl/VehicleDemandCountServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/impl/VehicleDemandCountServiceImpl.java index f97f0dc..4ae6ee5 100644 --- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/impl/VehicleDemandCountServiceImpl.java +++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/service/impl/VehicleDemandCountServiceImpl.java @@ -34,4 +34,9 @@ public class VehicleDemandCountServiceImpl extends ServiceImpl getVdCountById(String id) { + return vehicleDemandCountMapper.getVdCountById(id); + } }