Merge remote-tracking branch 'origin/master'

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

@@ -1,5 +1,6 @@
 package org.dromara.backstage.consumption.domain;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -345,5 +346,11 @@ public class XfTerm extends TenantEntity {
     @TableLogic
     private String delFlag;
 
+    @TableField(exist = false)
+    private Long roomName;
+
+    @TableField(exist = false)
+    private Long accountName;
+
 
 }

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

@@ -41,8 +41,9 @@ public class XfTermBo extends BaseEntity {
     private String termName;
 
     /**
-     * 所属餐厅Id
+     * 所属餐厅Id 所属餐厅不能为空
      */
+    @NotNull(message = "所属餐厅不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long roomId;
 
     /**
@@ -160,19 +161,19 @@ public class XfTermBo extends BaseEntity {
     /**
      * 消费工作模式,见XF_WorkMode字典类别
      */
-    @NotBlank(message = "消费工作模式,见XF_WorkMode字典类别不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "消费工作模式,见XF_WorkMode字典类别不能为空", groups = { AddGroup.class, EditGroup.class })
     private String workMode;
 
     /**
      * 开机模式,0-不需要营业员开机,1-需要营业员开机
      */
-    @NotBlank(message = "开机模式,0-不需要营业员开机,1-需要营业员开机不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "开机模式,0-不需要营业员开机,1-需要营业员开机不能为空", groups = { AddGroup.class, EditGroup.class })
     private String openMode;
 
     /**
      * 卡上最大金额
      */
-    @NotNull(message = "卡上最大金额不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "卡上最大金额不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long maxCardMoney;
 
     /**

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

@@ -2,9 +2,13 @@ package org.dromara.backstage.consumption.domain.vo;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import org.dromara.backstage.consumption.domain.XfTerm;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
@@ -51,15 +55,19 @@ public class XfTermVo implements Serializable {
     /**
      * 所属餐厅Id
      */
-    @ExcelProperty(value = "所属餐厅Id")
     private Long roomId;
 
+    @ExcelProperty(value = "所属餐厅")
+    private String roomName;
+
     /**
      * 结算账户Id
      */
-    @ExcelProperty(value = "结算账户Id")
     private Long accountId;
 
+    @ExcelProperty(value = "结算账户")
+    private String accountName;
+
     /**
      * 设备类型,见XF_TermType字典类型
      */
@@ -92,5 +100,14 @@ public class XfTermVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private String serverIp;
+
+    /**
+     * 服务器端口
+     */
+    private Long serverPort;
+
+    private String autoDown;
+
 
 }

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

@@ -1,5 +1,8 @@
 package org.dromara.backstage.consumption.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.dromara.backstage.consumption.domain.XfTerm;
 import org.dromara.backstage.consumption.domain.vo.XfTermVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@@ -12,4 +15,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface XfTermMapper extends BaseMapperPlus<XfTerm, XfTermVo> {
 
+
+    Page<XfTermVo> customPageList(@Param("page") Page<XfTerm> page, @Param("ew") Wrapper<XfTerm> wrapper);
+
 }

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

@@ -52,8 +52,8 @@ public class XfTermServiceImpl implements IXfTermService {
      */
     @Override
     public TableDataInfo<XfTermVo> queryPageList(XfTermBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<XfTerm> lqw = buildQueryWrapper(bo);
-        Page<XfTermVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        QueryWrapper<XfTerm> lqw = buildQueryWrapper(bo,"t");
+        Page<XfTermVo> result = baseMapper.customPageList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 

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

@@ -76,4 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="updateBy"    column="update_by"    />
             <result property="updateTime"    column="update_time"    />
     </resultMap>
+
+    <select id="customPageList" resultType="org.dromara.backstage.consumption.domain.vo.XfTermVo">
+        select t.term_id,  t.term_no, t.term_name, t.room_id, t.account_id, t.term_type, t.consume_type,
+        t.auto_down, t.remark, t.term_ip, t.comm_port, t.server_ip, t.server_port,r.room_name, a.account_name from t_xf_term t
+        left join t_pt_room r on t.room_id = r.room_id and r.del_flag = '0' and t.del_flag = '0'
+        left join t_pt_account a on t.account_id = a.account_id and a.del_flag = '0' and t.del_flag = '0'
+        ${ew.customSqlSegment}
+    </select>
 </mapper>