From e124553ea6b876af4e378fc4d39c677e1b632c74 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 2 Jul 2025 20:18:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=201=E3=80=81=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=8A=95=E9=80=92=E6=AC=A1=E6=95=B0=E6=8E=92=E8=A1=8C=E6=A6=9C?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=88=97=E8=A1=A8=E9=A1=B5=E3=80=81?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E3=80=81=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E6=A0=87=E8=AE=B0=E3=80=81=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E6=8C=89=E9=92=AE=EF=BC=88=E6=8C=89=E9=92=AE=E9=9C=80?= =?UTF-8?q?=E8=A1=A5=E5=85=85=EF=BC=89=202=E3=80=81=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=EF=BC=9A=E8=AE=BE=E5=A4=87=E6=B3=A8=E5=86=8C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=88=E6=9C=89=E4=B8=AA=E5=AD=97=E6=AE=B5=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=B8=8B=EF=BC=89=203=E3=80=81=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=EF=BC=9A=E8=AE=BE=E5=A4=87=E6=8A=95=E9=80=92=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E6=8E=92=E8=A1=8C=E6=A6=9C=E3=80=91=20=E4=BB=A5?= =?UTF-8?q?=E4=B8=8A=E7=9A=84=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceInfoController.java | 163 ++++++++++++++++++ .../zh/deviceinfo/entity/DeviceInfo.java | 94 ++++++++++ .../deviceinfo/mapper/DeviceInfo2Mapper.java | 21 +++ .../mapper/xml/DeviceInfo2Mapper.xml | 15 ++ .../service/IDeviceInfo2Service.java | 20 +++ .../service/impl/DeviceInfo2ServiceImpl.java | 39 +++++ .../zh/view/hy/controller/HyController.java | 27 +++ .../jeecg/modules/zh/view/hy/entity/Hy.java | 14 ++ .../modules/zh/view/hy/mapper/HyMapper.java | 5 + .../zh/view/hy/mapper/xml/HyMapper.xml | 76 +++++++- .../zh/view/hy/service/IHyService.java | 4 + .../view/hy/service/impl/HyServiceImpl.java | 31 ++++ 12 files changed, 508 insertions(+), 1 deletion(-) create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/controller/DeviceInfoController.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/entity/DeviceInfo.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/DeviceInfo2Mapper.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/xml/DeviceInfo2Mapper.xml create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/IDeviceInfo2Service.java create mode 100644 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/impl/DeviceInfo2ServiceImpl.java diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/controller/DeviceInfoController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/controller/DeviceInfoController.java new file mode 100644 index 0000000..2718d77 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/controller/DeviceInfoController.java @@ -0,0 +1,163 @@ +package org.jeecg.modules.zh.deviceinfo.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.zh.deviceinfo.entity.DeviceInfo; +import org.jeecg.modules.zh.deviceinfo.service.IDeviceInfo2Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 设备信息 + * @Author: jeecg-boot + * @Date: 2025-07-02 + * @Version: V1.0 + */ +@Api(tags="设备信息") +@RestController +@RequestMapping("/deviceinfo/deviceInfo") +@Slf4j +public class DeviceInfoController extends JeecgController { + @Autowired + private IDeviceInfo2Service deviceInfoService; + + /** + * 分页列表查询 + * + * @param deviceInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "设备信息-分页列表查询") + @ApiOperation(value="设备信息-分页列表查询", notes="设备信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(DeviceInfo deviceInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(deviceInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); +// IPage pageList = deviceInfoService.page(page, queryWrapper); + IPage pageList = deviceInfoService.queryDeviceInfoWithRelatedTables(page, deviceInfo, req.getParameterMap()); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param deviceInfo + * @return + */ + @AutoLog(value = "设备信息-添加") + @ApiOperation(value="设备信息-添加", notes="设备信息-添加") + @RequiresPermissions("deviceinfo:bl_device_info:add") + @PostMapping(value = "/add") + public Result add(@RequestBody DeviceInfo deviceInfo) { + deviceInfoService.save(deviceInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param deviceInfo + * @return + */ + @AutoLog(value = "设备信息-编辑") + @ApiOperation(value="设备信息-编辑", notes="设备信息-编辑") + @RequiresPermissions("deviceinfo:bl_device_info:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody DeviceInfo deviceInfo) { + deviceInfoService.updateById(deviceInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "设备信息-通过id删除") + @ApiOperation(value="设备信息-通过id删除", notes="设备信息-通过id删除") + @RequiresPermissions("deviceinfo:bl_device_info:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + deviceInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "设备信息-批量删除") + @ApiOperation(value="设备信息-批量删除", notes="设备信息-批量删除") + @RequiresPermissions("deviceinfo:bl_device_info:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.deviceInfoService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "设备信息-通过id查询") + @ApiOperation(value="设备信息-通过id查询", notes="设备信息-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + DeviceInfo deviceInfo = deviceInfoService.getById(id); + if(deviceInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(deviceInfo); + } + + /** + * 导出excel + * + * @param request + * @param deviceInfo + */ + @RequiresPermissions("deviceinfo:bl_device_info:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, DeviceInfo deviceInfo) { + return super.exportXls(request, deviceInfo, DeviceInfo.class, "设备信息"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("deviceinfo:bl_device_info:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, DeviceInfo.class); + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/entity/DeviceInfo.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/entity/DeviceInfo.java new file mode 100644 index 0000000..b6a18c2 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/entity/DeviceInfo.java @@ -0,0 +1,94 @@ +package org.jeecg.modules.zh.deviceinfo.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 设备信息 + * @Author: jeecg-boot + * @Date: 2025-07-02 + * @Version: V1.0 + */ +@Data +@TableName("bl_device_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="bl_device_info对象", description="设备信息") +public class DeviceInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private Integer id; + /**设备ID*/ + @Excel(name = "设备ID", width = 15) + @ApiModelProperty(value = "设备ID") + private String deviceId; + /**设备编码*/ + @Excel(name = "设备编码", width = 15) + @ApiModelProperty(value = "设备编码") + private String imei; + /**ICCID*/ + @Excel(name = "ICCID", width = 15) + @ApiModelProperty(value = "ICCID") + private String iccid; + /**是否在线*/ + @Excel(name = "是否在线", width = 15) + @ApiModelProperty(value = "是否在线") + private String isOnline; + /**设备点位*/ + @Excel(name = "设备点位", width = 15) + @ApiModelProperty(value = "设备点位") + private String content; + /**经纬度*/ + @Excel(name = "经纬度", width = 15) + @ApiModelProperty(value = "经纬度") + private String lnglat; + /**桶数量*/ + @Excel(name = "桶数量", width = 15) + @ApiModelProperty(value = "桶数量") + private String boxNum; + /**满溢桶数量*/ + @Excel(name = "满溢桶数量", width = 15) + @ApiModelProperty(value = "满溢桶数量") + private String overflowBoxNum; + /**是否在仓库中*/ + @Excel(name = "是否在仓库中", width = 15) + @ApiModelProperty(value = "是否在仓库中") + private String inWarehouse; + /**区域ID*/ + @Excel(name = "区域ID", width = 15) + @ApiModelProperty(value = "区域ID") + private String housingestateId; + /**厂家更新时间*/ + @Excel(name = "厂家更新时间", width = 15) + @ApiModelProperty(value = "厂家更新时间") + private String updatedAt; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + @TableField(exist = false) + private String housingestateName; +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/DeviceInfo2Mapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/DeviceInfo2Mapper.java new file mode 100644 index 0000000..7013bdb --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/DeviceInfo2Mapper.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.zh.deviceinfo.mapper; + + +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.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.zh.deviceinfo.entity.DeviceInfo; + +/** + * @Description: 设备信息 + * @Author: jeecg-boot + * @Date: 2025-07-02 + * @Version: V1.0 + */ +public interface DeviceInfo2Mapper extends BaseMapper { + + IPage selectDeviceInfoWithRelatedTables(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/xml/DeviceInfo2Mapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/xml/DeviceInfo2Mapper.xml new file mode 100644 index 0000000..b217454 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/mapper/xml/DeviceInfo2Mapper.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/IDeviceInfo2Service.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/IDeviceInfo2Service.java new file mode 100644 index 0000000..45a3b7b --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/IDeviceInfo2Service.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.zh.deviceinfo.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.deviceinfo.entity.DeviceInfo; + +import java.util.Map; + +/** + * @Description: 设备信息 + * @Author: jeecg-boot + * @Date: 2025-07-02 + * @Version: V1.0 + */ +public interface IDeviceInfo2Service extends IService { + + IPage queryDeviceInfoWithRelatedTables(Page page, DeviceInfo deviceInfo, Map parameterMap); +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/impl/DeviceInfo2ServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/impl/DeviceInfo2ServiceImpl.java new file mode 100644 index 0000000..8d0739c --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/deviceinfo/service/impl/DeviceInfo2ServiceImpl.java @@ -0,0 +1,39 @@ +package org.jeecg.modules.zh.deviceinfo.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.zh.deviceinfo.entity.DeviceInfo; +import org.jeecg.modules.zh.deviceinfo.mapper.DeviceInfo2Mapper; +import org.jeecg.modules.zh.deviceinfo.service.IDeviceInfo2Service; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * @Description: 设备信息 + * @Author: jeecg-boot + * @Date: 2025-07-02 + * @Version: V1.0 + */ +@Service +public class DeviceInfo2ServiceImpl extends ServiceImpl implements IDeviceInfo2Service { + + @Override + public IPage queryDeviceInfoWithRelatedTables(Page page, DeviceInfo deviceInfo, Map parameterMap) { + // 构建基础查询条件 + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(deviceInfo, parameterMap); + String[] housingestateNames = parameterMap.get("housingestateName"); + if(housingestateNames!=null){ + String housingestateName = housingestateNames[0]; + if(StringUtils.isNotBlank(housingestateName)){ + queryWrapper.like("hi.name",housingestateName); + } + } + // 执行拼表查询 + return baseMapper.selectDeviceInfoWithRelatedTables(page, queryWrapper); + } +} 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 e51c9ec..491e359 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,4 +57,31 @@ public class HyController { return Result.ok(list); } + @RequestMapping(value = "/queryAllHyTdcsList", method = RequestMethod.GET) + public Result queryAllHyTdcsList(Hy hy) { + List list = service.queryAllHyTdcsList(hy); + return Result.ok(list); + } + + @RequestMapping(value = "/queryHyjlList", method = RequestMethod.GET) + public Result queryHyjlList(Hy hy) { + List list = service.queryHyjlList(hy); + 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/entity/Hy.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java index 1cdbff5..a076251 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java @@ -10,6 +10,7 @@ public class Hy implements Serializable { private static final long serialVersionUID = 1L; private String phone; + private String imei; private String shortHour; private String shortDay; private Integer cn; @@ -18,4 +19,17 @@ public class Hy implements Serializable { private String housingestateName; private String beginTime; private String endTime; + + private Integer countMin;//最小投递数量 + private Integer countMax;//最大投递数量 + private String money;//金额 + private String weight;//重量 + private String addTime;//投递时间 + private String invalid;//订单是否有效 + private String startWeight;//订单开始重量 + private String endWeight;//订单结束重量 + private String updatedAt;//厂家更新时间 + private String deductMoney;//扣除金额 + } + 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 e022fa3..2ae1535 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,4 +14,9 @@ public interface HyMapper extends BaseMapper{ List queryHyRegisterList(Hy hy); List queryHyXzList(Hy hy); List queryHyTdcsList(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 a0c7835..ae948f8 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,4 +52,78 @@ limit 10 - \ No newline at end of file + + + + + + + + + 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 bd5da41..ef44d4b 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,5 +14,9 @@ public interface IHyService extends IService { List queryHyRegisterList(Hy hy); List queryHyXzList(Hy hy); List queryHyTdcsList(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 3d42403..613816e 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,4 +48,35 @@ public class HyServiceImpl extends ServiceImpl implements IHyServi return baseMapper.queryHyTdcsList(hy); } + /** + * 查询所有会员递次数排行榜 + */ + @Override + public List queryAllHyTdcsList(Hy hy) { + return baseMapper.queryAllHyTdcsList(hy); + } + + /** + * 查询会员投递历史信息 + */ + @Override + public List queryHyjlList(Hy hy) { + return baseMapper.queryHyjlList(hy); + } + + /** + * 设备投递次数排行榜 + */ + @Override + public List querySheBeiTdcsList(Hy hy) { + return baseMapper.querySheBeiTdcsList(hy); + } + + /** + * 查询所有设备递次数排行榜 + */ + @Override + public List queryAllSheBeiTdcsList(Hy hy) { + return baseMapper.queryAllSheBeiTdcsList(hy); + } }