1.管理功能的完善：消费设备字段调整与前端界面调整

ruoyi-modules/ruoyi-backstage/pom.xml

@@ -162,11 +162,11 @@
         </dependency>
 
         <!-- 人脸识别 -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.arcsoft.face</groupId>
             <artifactId>arcsoft-sdk-face</artifactId>
             <version>1.1.1.0</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-api-consume</artifactId>

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

@@ -352,5 +352,14 @@ public class XfTerm extends TenantEntity {
     @TableField(exist = false)
     private Long accountName;
 
+    /*消费机管理账号*/
+    private String adminName;
+
+    /*消费机管理密码*/
+    private String adminPwd;
+
+    /*消费机品牌*/
+    private String brand;
+
 
 }

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

@@ -356,5 +356,14 @@ public class XfTermBo extends TenantEntity {
      */
     private String remark;
 
+    /*消费机管理账号*/
+    private String adminName;
+
+    /*消费机管理密码*/
+    private String adminPwd;
+
+    /*消费机品牌*/
+    private String brand;
+
 
 }

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

@@ -326,4 +326,12 @@ public class XfTermVo implements Serializable {
     private Date blackDownTime;
     //endregion
 
+    /*消费机管理账号*/
+    private String adminName;
+
+    /*消费机管理密码*/
+    private String adminPwd;
+
+    /*消费机品牌*/
+    private String brand;
 }

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

@@ -48,6 +48,13 @@ public interface IXfTermService {
     List<XfTermVo> queryListByNoOrName(XfTermBo bo);
     List<XfTermVo> queryListByIds(List<Long> ids);
 
+    /**
+     * 根据品牌查询设备列表
+     * @param brand
+     * @return
+     */
+    List<XfTermVo> queryList(String brand);
+
     public Map<Long,XfTermVo> queryMapByIds(List<Long> ids);
 
     /**

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

@@ -136,6 +136,19 @@ public class XfTermServiceImpl implements IXfTermService {
         return baseMapper.selectVoList(lqw.in(XfTerm::getTermId, ids));
     }
 
+    /**
+     * 根据品牌查询设备列表
+     *
+     * @param brand
+     * @return
+     */
+    @Override
+    public List<XfTermVo> queryList(String brand) {
+        LambdaQueryWrapper<XfTerm> lqw = Wrappers.lambdaQuery();
+        lqw.eq(XfTerm::getBrand, brand);
+        return baseMapper.selectVoList(lqw);
+    }
+
     public Map<Long, XfTermVo> queryMapByIds(List<Long> ids) {
         List<XfTermVo> xfTermVos = queryListByIds(ids);
         if (CollectionUtil.isNotEmpty(xfTermVos)) {
@@ -151,6 +164,7 @@ public class XfTermServiceImpl implements IXfTermService {
         lqw.eq(bo.getTermNo() != null, XfTerm::getTermNo, bo.getTermNo());
         lqw.like(StringUtils.isNotBlank(bo.getTermName()), XfTerm::getTermName, bo.getTermName());
         lqw.eq(StringUtils.isNotBlank(bo.getTermIp()), XfTerm::getTermIp, bo.getTermIp());
+        lqw.eq(StringUtils.isNotBlank(bo.getBrand()), XfTerm::getBrand, bo.getBrand());
 
         lqw.orderByAsc(XfTerm::getTermNo);
         return lqw;

sql/2025-5-21/kingbase/ddl.sql

@@ -0,0 +1,9 @@
+ALTER TABLE "dbo"."t_xf_term" ADD COLUMN admin_name CHARACTER VARYING(
+    32 char
+    ) NOT NULL DEFAULT 'admin'::varchar COMMENT '消费机管理账号';
+ALTER TABLE "dbo"."t_xf_term" ADD COLUMN admin_pwd CHARACTER VARYING(
+    32 char
+    ) NOT NULL DEFAULT 'Dt20250512'::varchar COMMENT '消费机管理密码';
+ALTER TABLE "dbo"."t_xf_term" ADD COLUMN brand CHARACTER VARYING(
+    4 char
+    ) NOT NULL DEFAULT 'dt'::varchar COMMENT '消费机品牌';

sql/2025-5-21/kingbase/dml.sql

@@ -0,0 +1,8 @@
+INSERT INTO t_sys_dictType ("dict_id","tenant_id","dict_name","dict_type","create_dept","create_by","create_time","update_by","update_time","remark","del_flag") VALUES
+    (1925092337927163906,'25','消费机品牌','xf_brand',100,100,'''2025-05-21 15:32:35''',100,'''2025-05-21 15:32:35''','消费机品牌','0');
+
+
+INSERT INTO t_sys_dictData ("dict_code","tenant_id","dict_sort","dict_label","dict_value","dict_type","css_class","list_class","is_default","create_dept","create_by","create_time","update_by","update_time","remark","del_flag")
+VALUES
+    (1925092890581241857,'25',1,'海康','hk','xf_brand','','success','N',100,100,'''2025-05-21 15:34:46''',100,'''2025-05-21 15:34:46''','','0'),
+    (1925092664504061954,'25',0,'大图','dt','xf_brand','','primary','N',100,100,'''2025-05-21 15:33:52''',100,'''2025-05-21 15:33:52''','','0');

sql/2025-5-21/mysql/ddl.sql

@@ -0,0 +1,3 @@
+ALTER TABLE t_xf_term ADD admin_name varchar(32) not NULL  DEFAULT 'admin' comment '消费机管理账号';
+ALTER TABLE t_xf_term ADD admin_pwd varchar(32) not NULL  DEFAULT 'Dt20250512' comment '消费机管理密码';
+ALTER TABLE t_xf_term ADD brand varchar(4) not NULL  DEFAULT 'dt' comment '消费机品牌';

sql/2025-5-21/mysql/dml.sql

@@ -0,0 +1,8 @@
+INSERT INTO t_sys_dictType (dict_id,tenant_id,dict_name,dict_type,create_dept,create_by,create_time,update_by,update_time,remark,del_flag) VALUES
+    (1925092337927163906,'25','消费机品牌','xf_brand',100,100,'2025-05-21 15:32:35',100,'2025-05-21 15:32:35','消费机品牌','0');
+
+
+INSERT INTO t_sys_dictData (dict_code,tenant_id,dict_sort,dict_label,dict_value,dict_type,css_class,list_class,is_default,create_dept,create_by,create_time,update_by,update_time,remark,del_flag)
+VALUES
+    (1925092890581241857,'25',1,'海康','hk','xf_brand','','success','N',100,100,'2025-05-21 15:34:46',100,'2025-05-21 15:34:46','','0'),
+    (1925092664504061954,'25',0,'大图','dt','xf_brand','','primary','N',100,100,'2025-05-21 15:33:52',100,'2025-05-21 15:33:52','','0');