Merge remote-tracking branch 'origin/master'

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/MealTypeNameTranslationImpl.java

@@ -3,6 +3,7 @@ package org.dromara.common.translation.core.impl;
 import lombok.AllArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.backstage.api.RemoteCardTypeService;
+import org.dromara.backstage.api.RemoteMealTypeService;
 import org.dromara.common.translation.annotation.TranslationType;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.common.translation.core.TranslationInterface;
@@ -17,10 +18,10 @@ import org.dromara.common.translation.core.TranslationInterface;
 public class MealTypeNameTranslationImpl implements TranslationInterface<String> {
 
     @DubboReference
-    private RemoteCardTypeService remoteCardTypeService;
+    private RemoteMealTypeService mealTypeService;
 
     @Override
     public String translation(Object key, String other) {
-        return remoteCardTypeService.selectCardTypeNameByIds(key.toString());
+        return mealTypeService.selectMealTypeNameByIds(key.toString());
     }
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/dubbo/RemoteMealTypeServiceImpl.java

@@ -0,0 +1,21 @@
+package org.dromara.backstage.basics.dubbo;
+
+
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.backstage.api.RemoteMealTypeService;
+import org.dromara.backstage.basics.service.IPtCardtypeService;
+import org.dromara.backstage.basics.service.IPtMealtypeService;
+import org.springframework.stereotype.Service;
+
+@RequiredArgsConstructor
+@Service
+@DubboService
+public class RemoteMealTypeServiceImpl implements RemoteMealTypeService {
+
+    private final IPtMealtypeService mealtypeService;
+    @Override
+    public String selectMealTypeNameByIds(String ids) {
+        return mealtypeService.selectMealTypeNameByIds(ids);
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/IPtMealtypeService.java

@@ -66,4 +66,6 @@ public interface IPtMealtypeService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    String selectMealTypeNameByIds(String ids);
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtMealtypeServiceImpl.java

@@ -1,6 +1,9 @@
 package org.dromara.backstage.basics.service.impl;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -15,6 +18,7 @@ import org.dromara.backstage.basics.domain.PtMealtype;
 import org.dromara.backstage.basics.mapper.PtMealtypeMapper;
 import org.dromara.backstage.basics.service.IPtMealtypeService;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -128,4 +132,17 @@ public class PtMealtypeServiceImpl implements IPtMealtypeService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public String selectMealTypeNameByIds(String ids) {
+        List<String> list = new ArrayList<>();
+        for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
+//            PtMealtypeVo vo = SpringUtils.getAopProxy(this).queryById(id);
+            PtMealtypeVo vo = baseMapper.selectVoById(id);
+            if (ObjectUtil.isNotNull(vo)) {
+                list.add(vo.getMealName());
+            }
+        }
+        return String.join(StringUtils.SEPARATOR, list);
+    }
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfQuotaController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.consumption.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.consumption.domain.vo.XfQuotaVo;
+import org.dromara.backstage.consumption.domain.bo.XfQuotaBo;
+import org.dromara.backstage.consumption.service.IXfQuotaService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 限额管理
+ * 前端访问路由地址为:/consumption/xfQuota
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/consumption/xfQuota")
+public class XfQuotaController extends BaseController {
+
+    private final IXfQuotaService xfQuotaService;
+
+    /**
+     * 查询限额管理列表
+     */
+    @SaCheckPermission("consumption:xfQuota:list")
+    @GetMapping("/list")
+    public TableDataInfo<XfQuotaVo> list(XfQuotaBo bo, PageQuery pageQuery) {
+        return xfQuotaService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出限额管理列表
+     */
+    @SaCheckPermission("consumption:xfQuota:export")
+    @Log(title = "限额管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XfQuotaBo bo, HttpServletResponse response) {
+        List<XfQuotaVo> list = xfQuotaService.queryList(bo);
+        ExcelUtil.exportExcel(list, "限额管理", XfQuotaVo.class, response);
+    }
+
+    /**
+     * 获取限额管理详细信息
+     *
+     * @param quotaId 主键
+     */
+    @SaCheckPermission("consumption:xfQuota:query")
+    @GetMapping("/{quotaId}")
+    public R<XfQuotaVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long quotaId) {
+        return R.ok(xfQuotaService.queryById(quotaId));
+    }
+
+    /**
+     * 新增限额管理
+     */
+    @SaCheckPermission("consumption:xfQuota:add")
+    @Log(title = "限额管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XfQuotaBo bo) {
+        return toAjax(xfQuotaService.insertByBo(bo));
+    }
+
+    /**
+     * 修改限额管理
+     */
+    @SaCheckPermission("consumption:xfQuota:edit")
+    @Log(title = "限额管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfQuotaBo bo) {
+        return toAjax(xfQuotaService.updateByBo(bo));
+    }
+
+    /**
+     * 删除限额管理
+     *
+     * @param quotaIds 主键串
+     */
+    @SaCheckPermission("consumption:xfQuota:remove")
+    @Log(title = "限额管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{quotaIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] quotaIds) {
+        return toAjax(xfQuotaService.deleteWithValidByIds(List.of(quotaIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfQuotatermController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.consumption.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.consumption.domain.vo.XfQuotatermVo;
+import org.dromara.backstage.consumption.domain.bo.XfQuotatermBo;
+import org.dromara.backstage.consumption.service.IXfQuotatermService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 限额设备绑定
+ * 前端访问路由地址为:/consumption/xfQuotaterm
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/consumption/xfQuotaterm")
+public class XfQuotatermController extends BaseController {
+
+    private final IXfQuotatermService xfQuotatermService;
+
+    /**
+     * 查询限额设备绑定列表
+     */
+    @SaCheckPermission("consumption:xfQuotaterm:list")
+    @GetMapping("/list")
+    public TableDataInfo<XfQuotatermVo> list(XfQuotatermBo bo, PageQuery pageQuery) {
+        return xfQuotatermService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出限额设备绑定列表
+     */
+    @SaCheckPermission("consumption:xfQuotaterm:export")
+    @Log(title = "限额设备绑定", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(XfQuotatermBo bo, HttpServletResponse response) {
+        List<XfQuotatermVo> list = xfQuotatermService.queryList(bo);
+        ExcelUtil.exportExcel(list, "限额设备绑定", XfQuotatermVo.class, response);
+    }
+
+    /**
+     * 获取限额设备绑定详细信息
+     *
+     * @param quotaTermId 主键
+     */
+    @SaCheckPermission("consumption:xfQuotaterm:query")
+    @GetMapping("/{quotaTermId}")
+    public R<XfQuotatermVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long quotaTermId) {
+        return R.ok(xfQuotatermService.queryById(quotaTermId));
+    }
+
+    /**
+     * 新增限额设备绑定
+     */
+    @SaCheckPermission("consumption:xfQuotaterm:add")
+    @Log(title = "限额设备绑定", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody XfQuotatermBo bo) {
+        return toAjax(xfQuotatermService.insertByBo(bo));
+    }
+
+    /**
+     * 修改限额设备绑定
+     */
+    @SaCheckPermission("consumption:xfQuotaterm:edit")
+    @Log(title = "限额设备绑定", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfQuotatermBo bo) {
+        return toAjax(xfQuotatermService.updateByBo(bo));
+    }
+
+    /**
+     * 删除限额设备绑定
+     *
+     * @param quotaTermIds 主键串
+     */
+    @SaCheckPermission("consumption:xfQuotaterm:remove")
+    @Log(title = "限额设备绑定", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{quotaTermIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] quotaTermIds) {
+        return toAjax(xfQuotatermService.deleteWithValidByIds(List.of(quotaTermIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/XfQuota.java

@@ -0,0 +1,77 @@
+package org.dromara.backstage.consumption.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 限额管理对象 t_xf_quota
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_xf_quota")
+public class XfQuota extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 限额Id,主键
+     */
+    @TableId(value = "quota_id")
+    private Long quotaId;
+
+    /**
+     * 卡类Id
+     */
+    private Long cardType;
+
+    /**
+     * 每日金额
+     */
+    private Long dailyMoney;
+
+    /**
+     * 早餐金额
+     */
+    private Long oneMoney;
+
+    /**
+     * 午餐金额
+     */
+    private Long twoMoney;
+
+    /**
+     * 晚餐金额
+     */
+    private Long threeMoney;
+
+    /**
+     * 宵夜金额
+     */
+    private Long fourMoney;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 启用状态，0-未启用 1-启用
+     */
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/XfQuotaterm.java

@@ -0,0 +1,42 @@
+package org.dromara.backstage.consumption.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 限额设备绑定对象 t_xf_quotaTerm
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_xf_quotaTerm")
+public class XfQuotaterm extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 限额Id,主键
+     */
+    @TableId(value = "quota_term_id")
+    private Long quotaTermId;
+
+    /**
+     * 设备Id
+     */
+    private Long termId;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/bo/XfQuotaBo.java

@@ -0,0 +1,78 @@
+package org.dromara.backstage.consumption.domain.bo;
+
+import org.dromara.backstage.consumption.domain.XfQuota;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 限额管理业务对象 t_xf_quota
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XfQuota.class, reverseConvertGenerate = false)
+public class XfQuotaBo extends BaseEntity {
+
+    /**
+     * 限额Id,主键
+     */
+    @NotNull(message = "限额Id,主键不能为空", groups = { EditGroup.class })
+    private Long quotaId;
+
+    /**
+     * 卡类Id
+     */
+    @NotNull(message = "卡类Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long cardType;
+
+    /**
+     * 每日金额
+     */
+//    @NotNull(message = "每日金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long dailyMoney;
+
+    /**
+     * 早餐金额
+     */
+//    @NotNull(message = "早餐金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long oneMoney;
+
+    /**
+     * 午餐金额
+     */
+//    @NotNull(message = "午餐金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long twoMoney;
+
+    /**
+     * 晚餐金额
+     */
+//    @NotNull(message = "晚餐金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long threeMoney;
+
+    /**
+     * 宵夜金额
+     */
+//    @NotNull(message = "宵夜金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long fourMoney;
+
+    /**
+     * 备注
+     */
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 启用状态，0-未启用 1-启用
+     */
+    @NotBlank(message = "启用状态，0-未启用 1-启用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/bo/XfQuotatermBo.java

@@ -0,0 +1,36 @@
+package org.dromara.backstage.consumption.domain.bo;
+
+import org.dromara.backstage.consumption.domain.XfQuotaterm;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 限额设备绑定业务对象 t_xf_quotaTerm
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = XfQuotaterm.class, reverseConvertGenerate = false)
+public class XfQuotatermBo extends BaseEntity {
+
+    /**
+     * 限额Id,主键
+     */
+    @NotNull(message = "限额Id,主键不能为空", groups = { EditGroup.class })
+    private Long quotaTermId;
+
+    /**
+     * 设备Id
+     */
+    @NotNull(message = "设备Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long termId;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/vo/XfQuotaVo.java

@@ -0,0 +1,92 @@
+package org.dromara.backstage.consumption.domain.vo;
+
+import org.dromara.backstage.consumption.domain.XfQuota;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 限额管理视图对象 t_xf_quota
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XfQuota.class)
+public class XfQuotaVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 限额Id,主键
+     */
+    @ExcelProperty(value = "限额Id,主键")
+    private Long quotaId;
+
+    /**
+     * 卡类Id
+     */
+//    @ExcelProperty(value = "卡类Id")
+    private Long cardType;
+
+    @ExcelProperty(value = "卡类名称")
+    @Translation(type = TransConstant.CARD_TYPE_ID_TO_NAME, mapper = "cardType")
+    private String cardTypeName;
+
+    /**
+     * 每日金额
+     */
+    @ExcelProperty(value = "每日金额")
+    private Long dailyMoney;
+
+    /**
+     * 早餐金额
+     */
+    @ExcelProperty(value = "早餐金额")
+    private Long oneMoney;
+
+    /**
+     * 午餐金额
+     */
+    @ExcelProperty(value = "午餐金额")
+    private Long twoMoney;
+
+    /**
+     * 晚餐金额
+     */
+    @ExcelProperty(value = "晚餐金额")
+    private Long threeMoney;
+
+    /**
+     * 宵夜金额
+     */
+    @ExcelProperty(value = "宵夜金额")
+    private Long fourMoney;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 启用状态，0-未启用 1-启用
+     */
+    @ExcelProperty(value = "启用状态，0-未启用 1-启用")
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/vo/XfQuotatermVo.java

@@ -0,0 +1,62 @@
+package org.dromara.backstage.consumption.domain.vo;
+
+import org.dromara.backstage.consumption.domain.XfQuotaterm;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 限额设备绑定视图对象 t_xf_quotaTerm
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = XfQuotaterm.class)
+public class XfQuotatermVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 限额Id,主键
+     */
+//    @ExcelProperty(value = "限额Id,主键")
+    private Long quotaTermId;
+
+    /**
+     * 设备Id
+     */
+//    @ExcelProperty(value = "设备Id")
+    private Long termId;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String termName;
+
+    /**
+     * 设备机号
+     */
+    @ExcelProperty(value = "设备机号")
+    private Long termNo;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfQuotaMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.consumption.mapper;
+
+import org.dromara.backstage.consumption.domain.XfQuota;
+import org.dromara.backstage.consumption.domain.vo.XfQuotaVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 限额管理Mapper接口
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+public interface XfQuotaMapper extends BaseMapperPlus<XfQuota, XfQuotaVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfQuotatermMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.consumption.mapper;
+
+import org.dromara.backstage.consumption.domain.XfQuotaterm;
+import org.dromara.backstage.consumption.domain.vo.XfQuotatermVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 限额设备绑定Mapper接口
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+public interface XfQuotatermMapper extends BaseMapperPlus<XfQuotaterm, XfQuotatermVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/IXfQuotaService.java

@@ -0,0 +1,69 @@
+package org.dromara.backstage.consumption.service;
+
+import org.dromara.backstage.consumption.domain.XfQuota;
+import org.dromara.backstage.consumption.domain.vo.XfQuotaVo;
+import org.dromara.backstage.consumption.domain.bo.XfQuotaBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 限额管理Service接口
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+public interface IXfQuotaService {
+
+    /**
+     * 查询限额管理
+     *
+     * @param quotaId 主键
+     * @return 限额管理
+     */
+    XfQuotaVo queryById(Long quotaId);
+
+    /**
+     * 分页查询限额管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 限额管理分页列表
+     */
+    TableDataInfo<XfQuotaVo> queryPageList(XfQuotaBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的限额管理列表
+     *
+     * @param bo 查询条件
+     * @return 限额管理列表
+     */
+    List<XfQuotaVo> queryList(XfQuotaBo bo);
+
+    /**
+     * 新增限额管理
+     *
+     * @param bo 限额管理
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XfQuotaBo bo);
+
+    /**
+     * 修改限额管理
+     *
+     * @param bo 限额管理
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XfQuotaBo bo);
+
+    /**
+     * 校验并批量删除限额管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/IXfQuotatermService.java

@@ -0,0 +1,76 @@
+package org.dromara.backstage.consumption.service;
+
+import org.dromara.backstage.consumption.domain.XfQuotaterm;
+import org.dromara.backstage.consumption.domain.vo.XfQuotatermVo;
+import org.dromara.backstage.consumption.domain.bo.XfQuotatermBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 限额设备绑定Service接口
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+public interface IXfQuotatermService {
+
+    /**
+     * 根据设备id批量新增限额设备
+     * @param ids
+     * @return
+     */
+    Boolean insertByTermIds(List<Long> ids);
+
+    /**
+     * 查询限额设备绑定
+     *
+     * @param quotaTermId 主键
+     * @return 限额设备绑定
+     */
+    XfQuotatermVo queryById(Long quotaTermId);
+
+    /**
+     * 分页查询限额设备绑定列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 限额设备绑定分页列表
+     */
+    TableDataInfo<XfQuotatermVo> queryPageList(XfQuotatermBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的限额设备绑定列表
+     *
+     * @param bo 查询条件
+     * @return 限额设备绑定列表
+     */
+    List<XfQuotatermVo> queryList(XfQuotatermBo bo);
+
+    /**
+     * 新增限额设备绑定
+     *
+     * @param bo 限额设备绑定
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(XfQuotatermBo bo);
+
+    /**
+     * 修改限额设备绑定
+     *
+     * @param bo 限额设备绑定
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(XfQuotatermBo bo);
+
+    /**
+     * 校验并批量删除限额设备绑定信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfDiscounttermServiceImpl.java

@@ -96,6 +96,7 @@ public class XfDiscounttermServiceImpl implements IXfDiscounttermService {
 
     @Override
     public Boolean insertByTermIds(List<Long> ids) {
+        if(CollectionUtil.isEmpty(ids)) return true;
         LambdaQueryWrapper<XfDiscountterm> w = Wrappers.lambdaQuery();
         w.in(XfDiscountterm::getTermId, ids);
         List<XfDiscountterm> exists = baseMapper.selectList(w);

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfQuotaServiceImpl.java

@@ -0,0 +1,135 @@
+package org.dromara.backstage.consumption.service.impl;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.consumption.domain.bo.XfQuotaBo;
+import org.dromara.backstage.consumption.domain.vo.XfQuotaVo;
+import org.dromara.backstage.consumption.domain.XfQuota;
+import org.dromara.backstage.consumption.mapper.XfQuotaMapper;
+import org.dromara.backstage.consumption.service.IXfQuotaService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 限额管理Service业务层处理
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@RequiredArgsConstructor
+@Service
+public class XfQuotaServiceImpl implements IXfQuotaService {
+
+    private final XfQuotaMapper baseMapper;
+
+    /**
+     * 查询限额管理
+     *
+     * @param quotaId 主键
+     * @return 限额管理
+     */
+    @Override
+    public XfQuotaVo queryById(Long quotaId){
+        return baseMapper.selectVoById(quotaId);
+    }
+
+    /**
+     * 分页查询限额管理列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 限额管理分页列表
+     */
+    @Override
+    public TableDataInfo<XfQuotaVo> queryPageList(XfQuotaBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XfQuota> lqw = buildQueryWrapper(bo);
+        Page<XfQuotaVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的限额管理列表
+     *
+     * @param bo 查询条件
+     * @return 限额管理列表
+     */
+    @Override
+    public List<XfQuotaVo> queryList(XfQuotaBo bo) {
+        LambdaQueryWrapper<XfQuota> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XfQuota> buildQueryWrapper(XfQuotaBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XfQuota> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), XfQuota::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增限额管理
+     *
+     * @param bo 限额管理
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XfQuotaBo bo) {
+        XfQuota add = MapstructUtils.convert(bo, XfQuota.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setQuotaId(add.getQuotaId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改限额管理
+     *
+     * @param bo 限额管理
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XfQuotaBo bo) {
+        XfQuota update = MapstructUtils.convert(bo, XfQuota.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XfQuota entity){
+        LambdaQueryWrapper<XfQuota> query = Wrappers.lambdaQuery();
+        query.eq(XfQuota::getCardType, entity.getCardType());
+        query.ne(entity.getQuotaId()!=null,XfQuota::getQuotaId, entity.getQuotaId());
+        if(baseMapper.selectCount(query)>0){
+            throw new ServiceException("卡类数据已存在");
+        }
+    }
+
+    /**
+     * 校验并批量删除限额管理信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //可以删除
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfQuotatermServiceImpl.java

@@ -0,0 +1,162 @@
+package org.dromara.backstage.consumption.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import org.dromara.backstage.consumption.domain.XfDiscountterm;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.backstage.consumption.domain.bo.XfQuotatermBo;
+import org.dromara.backstage.consumption.domain.vo.XfQuotatermVo;
+import org.dromara.backstage.consumption.domain.XfQuotaterm;
+import org.dromara.backstage.consumption.mapper.XfQuotatermMapper;
+import org.dromara.backstage.consumption.service.IXfQuotatermService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * 限额设备绑定Service业务层处理
+ *
+ * @author bing
+ * @date 2024-08-14
+ */
+@RequiredArgsConstructor
+@Service
+public class XfQuotatermServiceImpl implements IXfQuotatermService {
+
+    private final XfQuotatermMapper baseMapper;
+
+    @Override
+    public Boolean insertByTermIds(List<Long> ids) {
+        if(CollectionUtil.isEmpty(ids)) return true;
+        LambdaQueryWrapper<XfQuotaterm> w = Wrappers.lambdaQuery();
+        w.in(XfQuotaterm::getTermId, ids);
+        List<XfQuotaterm> exists = baseMapper.selectList(w);
+        List<Long> existIds = exists.stream().map(XfQuotaterm::getTermId).toList();
+        if(CollectionUtil.isNotEmpty(existIds)){
+            List<Long> adds = ids.stream().filter(id -> !existIds.contains(id)).toList();
+            if(CollectionUtil.isNotEmpty(adds)){
+                return baseMapper.insertBatch(adds.stream().map(id -> {
+                    XfQuotaterm quotaterm = new XfQuotaterm();
+                    quotaterm.setTermId(id);
+                    return quotaterm;
+                }).collect(Collectors.toList()));
+            }
+            return true;
+        }
+        return baseMapper.insertBatch(ids.stream().map(id -> {
+            XfQuotaterm quotaterm = new XfQuotaterm();
+            quotaterm.setTermId(id);
+            return quotaterm;
+        }).collect(Collectors.toList()));
+    }
+
+    /**
+     * 查询限额设备绑定
+     *
+     * @param quotaTermId 主键
+     * @return 限额设备绑定
+     */
+    @Override
+    public XfQuotatermVo queryById(Long quotaTermId){
+        return baseMapper.selectVoById(quotaTermId);
+    }
+
+    /**
+     * 分页查询限额设备绑定列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 限额设备绑定分页列表
+     */
+    @Override
+    public TableDataInfo<XfQuotatermVo> queryPageList(XfQuotatermBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<XfQuotaterm> lqw = buildQueryWrapper(bo);
+        Page<XfQuotatermVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的限额设备绑定列表
+     *
+     * @param bo 查询条件
+     * @return 限额设备绑定列表
+     */
+    @Override
+    public List<XfQuotatermVo> queryList(XfQuotatermBo bo) {
+        LambdaQueryWrapper<XfQuotaterm> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<XfQuotaterm> buildQueryWrapper(XfQuotatermBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<XfQuotaterm> lqw = Wrappers.lambdaQuery();
+        return lqw;
+    }
+
+    /**
+     * 新增限额设备绑定
+     *
+     * @param bo 限额设备绑定
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(XfQuotatermBo bo) {
+        XfQuotaterm add = MapstructUtils.convert(bo, XfQuotaterm.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setQuotaTermId(add.getQuotaTermId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改限额设备绑定
+     *
+     * @param bo 限额设备绑定
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(XfQuotatermBo bo) {
+        XfQuotaterm update = MapstructUtils.convert(bo, XfQuotaterm.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(XfQuotaterm entity){
+        LambdaQueryWrapper<XfQuotaterm> q = Wrappers.lambdaQuery();
+        q.eq(XfQuotaterm::getTermId, entity.getTermId())
+            .ne(entity.getQuotaTermId()!=null, XfQuotaterm::getQuotaTermId, entity.getQuotaTermId());
+        if(baseMapper.selectCount(q)>0){
+            throw new ServiceException("设备已绑定");
+        }
+    }
+
+    /**
+     * 校验并批量删除限额设备绑定信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //可以删除
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfQuotaMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.backstage.consumption.mapper.XfQuotaMapper">
+
+    <resultMap type="org.dromara.backstage.consumption.domain.XfQuota" id="XfQuotaResult">
+            <result property="quotaId"    column="quota_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="cardType"    column="card_type"    />
+            <result property="dailyMoney"    column="daily_money"    />
+            <result property="oneMoney"    column="one_money"    />
+            <result property="twoMoney"    column="two_money"    />
+            <result property="threeMoney"    column="three_money"    />
+            <result property="fourMoney"    column="four_money"    />
+            <result property="remark"    column="remark"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+            <result property="status"    column="status"    />
+    </resultMap>
+</mapper>

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfQuotatermMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.backstage.consumption.mapper.XfQuotatermMapper">
+
+    <resultMap type="org.dromara.backstage.consumption.domain.XfQuotaterm" id="XfQuotatermResult">
+            <result property="quotaTermId"    column="quota_term_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="termId"    column="term_id"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+    </resultMap>
+</mapper>