diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/controller/HyController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/controller/HyController.java index 491e359..2e0bfde 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/controller/HyController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/controller/HyController.java @@ -57,6 +57,24 @@ public class HyController { return Result.ok(list); } + /** + * 会员投递重量排行榜 + */ + @RequestMapping(value = "/queryHyTdzlList", method = RequestMethod.GET) + public Result queryHyTdzlList(Hy hy) { + List list = service.queryHyTdzlList(hy); + return Result.ok(list); + } + + /** + * 会员违规信息统计 + */ + @RequestMapping(value = "/queryHyWgList", method = RequestMethod.GET) + public Result queryHyWgList(Hy hy) { + List list = service.queryHyWgList(hy); + return Result.ok(list); + } + @RequestMapping(value = "/queryAllHyTdcsList", method = RequestMethod.GET) public Result queryAllHyTdcsList(Hy hy) { List list = service.queryAllHyTdcsList(hy); @@ -69,19 +87,4 @@ public class HyController { return Result.ok(list); } - - /** - * 设备投递次数排行榜 - */ - @RequestMapping(value = "/querySheBeiTdcsList", method = RequestMethod.GET) - public Result querySheBeiTdcsList(Hy hy) { - List list = service.querySheBeiTdcsList(hy); - return Result.ok(list); - } - - @RequestMapping(value = "/queryAllSheBeiTdcsList", method = RequestMethod.GET) - public Result queryAllSheBeiTdcsList(Hy hy) { - List list = service.queryAllSheBeiTdcsList(hy); - return Result.ok(list); - } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/HyMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/HyMapper.java index 2ae1535..c9e694a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/HyMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/HyMapper.java @@ -14,9 +14,11 @@ public interface HyMapper extends BaseMapper{ List queryHyRegisterList(Hy hy); List queryHyXzList(Hy hy); List queryHyTdcsList(Hy hy); + List queryHyTdzlList(Hy hy); + List queryHyWgList(Hy hy); + List queryAllHyTdcsList(Hy hy); List queryHyjlList(Hy hy); - List querySheBeiTdcsList(Hy hy); - List queryAllSheBeiTdcsList(Hy hy); + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml index 1d81b58..2b8081f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/mapper/xml/HyMapper.xml @@ -52,6 +52,41 @@ limit 10 + + + + - - - - diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/IHyService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/IHyService.java index ef44d4b..222e6cf 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/IHyService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/IHyService.java @@ -14,9 +14,10 @@ public interface IHyService extends IService { List queryHyRegisterList(Hy hy); List queryHyXzList(Hy hy); List queryHyTdcsList(Hy hy); + List queryHyTdzlList(Hy hy); + List queryHyWgList(Hy hy); + List queryAllHyTdcsList(Hy hy); List queryHyjlList(Hy hy); - List querySheBeiTdcsList(Hy hy); - List queryAllSheBeiTdcsList(Hy hy); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/impl/HyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/impl/HyServiceImpl.java index 613816e..8f2880b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/impl/HyServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/service/impl/HyServiceImpl.java @@ -48,6 +48,22 @@ public class HyServiceImpl extends ServiceImpl implements IHyServi return baseMapper.queryHyTdcsList(hy); } + /** + * 会员投递重量排行榜 + */ + @Override + public List queryHyTdzlList(Hy hy) { + return baseMapper.queryHyTdzlList(hy); + } + + /** + * 会员违规信息统计 + */ + @Override + public List queryHyWgList(Hy hy) { + return baseMapper.queryHyWgList(hy); + } + /** * 查询所有会员递次数排行榜 */ @@ -64,19 +80,4 @@ public class HyServiceImpl extends ServiceImpl implements IHyServi return baseMapper.queryHyjlList(hy); } - /** - * 设备投递次数排行榜 - */ - @Override - public List querySheBeiTdcsList(Hy hy) { - return baseMapper.querySheBeiTdcsList(hy); - } - - /** - * 查询所有设备递次数排行榜 - */ - @Override - public List queryAllSheBeiTdcsList(Hy hy) { - return baseMapper.queryAllSheBeiTdcsList(hy); - } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java index 0592098..207b44a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/controller/ShebeiController.java @@ -18,8 +18,9 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.List; - /** +/** * @Description: 设备信息 * @Author: jeecg-boot * @Date: 2025-07-02 @@ -54,4 +55,27 @@ public class ShebeiController extends JeecgController { return Result.OK(pageList); } + /** + * 设备投递次数排行榜 + */ + @RequestMapping(value = "/querySheBeiTdcsList", method = RequestMethod.GET) + public Result querySheBeiTdcsList(Shebei shebei) { + List list = service.querySheBeiTdcsList(shebei); + return Result.ok(list); + } + + @RequestMapping(value = "/queryAllSheBeiTdcsList", method = RequestMethod.GET) + public Result queryAllSheBeiTdcsList(Shebei shebei) { + List list = service.queryAllSheBeiTdcsList(shebei); + return Result.ok(list); + } + + /** + * 设备投递重量排行榜 + */ + @RequestMapping(value = "/querySheBeiTdzlList", method = RequestMethod.GET) + public Result querySheBeiTdzlList(Shebei shebei) { + List list = service.querySheBeiTdzlList(shebei); + return Result.ok(list); + } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/entity/Shebei.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/entity/Shebei.java index 3b41146..fc285e3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/entity/Shebei.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/entity/Shebei.java @@ -92,13 +92,21 @@ public class Shebei implements Serializable { @TableField(exist = false) private String housingestateName; /**注册会员数*/ - @Excel(name = "注册会员数", width = 15) - @ApiModelProperty(value = "注册会员数") @TableField(exist = false) private String hyCount; /**投递次数*/ - @Excel(name = "投递次数", width = 15) - @ApiModelProperty(value = "投递次数") @TableField(exist = false) private String tdcsCount; + @TableField(exist = false) + private Integer cn; + @TableField(exist = false) + private String weight;//重量 + @TableField(exist = false) + private String beginTime; + @TableField(exist = false) + private String endTime; + @TableField(exist = false) + private Integer countMin;//最小投递数量 + @TableField(exist = false) + private Integer countMax;//最大投递数量 } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java index c18538d..b3af303 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/ShebeiMapper.java @@ -1,12 +1,13 @@ package org.jeecg.modules.zh.view.shebei.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.zh.view.shebei.entity.Shebei; +import java.util.List; + /** * @Description: 设备信息 * @Author: jeecg-boot @@ -16,4 +17,7 @@ import org.jeecg.modules.zh.view.shebei.entity.Shebei; public interface ShebeiMapper extends BaseMapper { IPage queryDeviceInfo(Page page, @Param("params") Shebei shebei); + List querySheBeiTdcsList(Shebei shebei); + List queryAllSheBeiTdcsList(Shebei shebei); + List querySheBeiTdzlList(Shebei shebei); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml index b1469c1..25bf897 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/mapper/xml/ShebeiMapper.xml @@ -34,4 +34,78 @@ order by a.device_id + + + + + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/IShebeiService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/IShebeiService.java index 6daf374..5f41cae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/IShebeiService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/IShebeiService.java @@ -4,8 +4,11 @@ package org.jeecg.modules.zh.view.shebei.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.zh.view.hy.entity.Hy; import org.jeecg.modules.zh.view.shebei.entity.Shebei; +import java.util.List; + /** * @Description: 设备信息 * @Author: jeecg-boot @@ -15,4 +18,7 @@ import org.jeecg.modules.zh.view.shebei.entity.Shebei; public interface IShebeiService extends IService { IPage queryDeviceInfo(Page page, Shebei shebei); + List querySheBeiTdcsList(Shebei shebei); + List queryAllSheBeiTdcsList(Shebei shebei); + List querySheBeiTdzlList(Shebei shebei); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/impl/ShebeiServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/impl/ShebeiServiceImpl.java index c3337c1..66e3056 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/impl/ShebeiServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/shebei/service/impl/ShebeiServiceImpl.java @@ -8,6 +8,8 @@ import org.jeecg.modules.zh.view.shebei.mapper.ShebeiMapper; import org.jeecg.modules.zh.view.shebei.service.IShebeiService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 设备信息 * @Author: jeecg-boot @@ -21,4 +23,28 @@ public class ShebeiServiceImpl extends ServiceImpl impleme public IPage queryDeviceInfo(Page page, Shebei shebei) { return baseMapper.queryDeviceInfo(page, shebei); } + + /** + * 设备投递次数排行榜 + */ + @Override + public List querySheBeiTdcsList(Shebei shebei) { + return baseMapper.querySheBeiTdcsList(shebei); + } + + /** + * 查询所有设备递次数排行榜 + */ + @Override + public List queryAllSheBeiTdcsList(Shebei shebei) { + return baseMapper.queryAllSheBeiTdcsList(shebei); + } + + /** + * 设备投递重量排行榜 + */ + @Override + public List querySheBeiTdzlList(Shebei shebei) { + return baseMapper.querySheBeiTdzlList(shebei); + } }