feat：1、增加扫码记录功能，数据展示2、通过类型区分生成临时文件解决contentList混乱问题。3、扫码后更新预约到达状态

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/controller/SmsbDeviceScScanCodeController.java

@@ -0,0 +1,106 @@
+package com.inspur.digital.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.inspur.digital.domain.bo.SmsbDeviceScScanCodeBo;
+import com.inspur.digital.domain.vo.SmsbDeviceScScanCodeVo;
+import com.inspur.digital.service.ISmsbDeviceScScanCodeService;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+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.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 扫码记录
+ *
+ * @author Hao Li
+ * @date 2025-07-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/digital/scScanCode")
+public class SmsbDeviceScScanCodeController extends BaseController {
+
+    private final ISmsbDeviceScScanCodeService smsbDeviceScScanCodeService;
+
+    /**
+     * 查询扫码记录列表
+     */
+    @SaCheckPermission("digital:scScanCode:list")
+    @GetMapping("/list")
+    public TableDataInfo<SmsbDeviceScScanCodeVo> list(SmsbDeviceScScanCodeBo bo, PageQuery pageQuery) {
+        return smsbDeviceScScanCodeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出扫码记录列表
+     */
+    @SaCheckPermission("digital:scScanCode:export")
+    @Log(title = "扫码记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SmsbDeviceScScanCodeBo bo, HttpServletResponse response) {
+        List<SmsbDeviceScScanCodeVo> list = smsbDeviceScScanCodeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "扫码记录", SmsbDeviceScScanCodeVo.class, response);
+    }
+
+    /**
+     * 获取扫码记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("digital:scScanCode:query")
+    @GetMapping("/{id}")
+    public R<SmsbDeviceScScanCodeVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(smsbDeviceScScanCodeService.queryById(id));
+    }
+
+    /**
+     * 新增扫码记录
+     */
+    @SaCheckPermission("digital:scScanCode:add")
+    @Log(title = "扫码记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SmsbDeviceScScanCodeBo bo) {
+        return toAjax(smsbDeviceScScanCodeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改扫码记录
+     */
+    @SaCheckPermission("digital:scScanCode:edit")
+    @Log(title = "扫码记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SmsbDeviceScScanCodeBo bo) {
+        return toAjax(smsbDeviceScScanCodeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除扫码记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("digital:scScanCode:remove")
+    @Log(title = "扫码记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(smsbDeviceScScanCodeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/domain/SmsbDeviceScScanCode.java

@@ -0,0 +1,72 @@
+package com.inspur.digital.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 扫码记录对象 smsb_device_sc_scan_code
+ *
+ * @author Hao Li
+ * @date 2025-07-02
+ */
+@Data
+@TableName("smsb_device_sc_scan_code")
+public class SmsbDeviceScScanCode {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备唯一标识
+     */
+    private String identifier;
+
+    /**
+     * 企业名称
+     */
+    private String enterprise;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 区域编号
+     */
+    private String regionCode;
+
+    /**
+     * 区域
+     */
+    private String region;
+
+    /**
+     * 预约人数
+     */
+    private Integer personNum;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+}

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/domain/bo/SmsbDeviceScScanCodeBo.java

@@ -0,0 +1,60 @@
+package com.inspur.digital.domain.bo;
+
+import com.inspur.digital.domain.SmsbDeviceScScanCode;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 扫码记录业务对象 smsb_device_sc_scan_code
+ *
+ * @author Hao Li
+ * @date 2025-07-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SmsbDeviceScScanCode.class, reverseConvertGenerate = false)
+public class SmsbDeviceScScanCodeBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 设备唯一标识
+     */
+    private String identifier;
+
+    /**
+     * 企业名称
+     */
+    private String enterprise;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 区域编号
+     */
+    private String regionCode;
+
+    /**
+     * 区域
+     */
+    private String region;
+
+    /**
+     * 预约人数
+     */
+    private Integer personNum;
+
+    private String deviceName;
+
+    private String deviceMac;
+
+
+}

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/domain/bo/SmsbStartInfoBo.java

@@ -27,5 +27,20 @@ public class SmsbStartInfoBo {
      */
     private String identifier;
 
+    /**
+     * 区域码
+     */
+    private String regionCode;
+
+    /**
+     * 区域
+     */
+    private String region;
+
+    /**
+     * 人数
+     */
+    private Integer personNum;
+
 
 }

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/domain/vo/SmsbDeviceScScanCodeVo.java

@@ -0,0 +1,81 @@
+package com.inspur.digital.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.inspur.digital.domain.SmsbDeviceScScanCode;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 扫码记录视图对象 smsb_device_sc_scan_code
+ *
+ * @author Hao Li
+ * @date 2025-07-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SmsbDeviceScScanCode.class)
+public class SmsbDeviceScScanCodeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 设备唯一标识
+     */
+    @ExcelProperty(value = "设备唯一标识")
+    private String identifier;
+
+    private String deviceName;
+
+    private String deviceMac;
+
+    /**
+     * 企业名称
+     */
+    @ExcelProperty(value = "企业名称")
+    private String enterprise;
+
+    /**
+     * 手机号
+     */
+    @ExcelProperty(value = "手机号")
+    private String phone;
+
+    /**
+     * 区域编号
+     */
+    @ExcelProperty(value = "区域编号")
+    private String regionCode;
+
+    /**
+     * 区域
+     */
+    @ExcelProperty(value = "区域")
+    private String region;
+
+    /**
+     * 预约人数
+     */
+    @ExcelProperty(value = "预约人数")
+    private Integer personNum;
+
+    /**
+     * 扫码时间
+     */
+    @ExcelProperty(value = "扫码时间")
+    private Date createTime;
+
+
+}

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/mapper/SmsbDeviceScScanCodeMapper.java

@@ -0,0 +1,24 @@
+package com.inspur.digital.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.inspur.digital.domain.SmsbDeviceScScanCode;
+import com.inspur.digital.domain.bo.SmsbDeviceScScanCodeBo;
+import com.inspur.digital.domain.vo.SmsbDeviceScScanCodeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 扫码记录Mapper接口
+ *
+ * @author Hao Li
+ * @date 2025-07-02
+ */
+public interface SmsbDeviceScScanCodeMapper extends BaseMapperPlus<SmsbDeviceScScanCode, SmsbDeviceScScanCodeVo> {
+
+    /**
+     * 分页查询
+     * @param build
+     * @param bo
+     * @return
+     */
+    Page<SmsbDeviceScScanCodeVo> selectVoPageWithDevice(Page<Object> build, SmsbDeviceScScanCodeBo bo);
+}

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/service/ISmsbDeviceScScanCodeService.java

@@ -0,0 +1,68 @@
+package com.inspur.digital.service;
+
+import com.inspur.digital.domain.bo.SmsbDeviceScScanCodeBo;
+import com.inspur.digital.domain.vo.SmsbDeviceScScanCodeVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 扫码记录Service接口
+ *
+ * @author Hao Li
+ * @date 2025-07-02
+ */
+public interface ISmsbDeviceScScanCodeService {
+
+    /**
+     * 查询扫码记录
+     *
+     * @param id 主键
+     * @return 扫码记录
+     */
+    SmsbDeviceScScanCodeVo queryById(Long id);
+
+    /**
+     * 分页查询扫码记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 扫码记录分页列表
+     */
+    TableDataInfo<SmsbDeviceScScanCodeVo> queryPageList(SmsbDeviceScScanCodeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的扫码记录列表
+     *
+     * @param bo 查询条件
+     * @return 扫码记录列表
+     */
+    List<SmsbDeviceScScanCodeVo> queryList(SmsbDeviceScScanCodeBo bo);
+
+    /**
+     * 新增扫码记录
+     *
+     * @param bo 扫码记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SmsbDeviceScScanCodeBo bo);
+
+    /**
+     * 修改扫码记录
+     *
+     * @param bo 扫码记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SmsbDeviceScScanCodeBo bo);
+
+    /**
+     * 校验并批量删除扫码记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/service/impl/SmsbAppointmentInfoServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,12 +17,14 @@ import com.inspur.device.mapper.SmsbDeviceGroupRelMapper;
 import com.inspur.digital.domain.SmsbAppointmentInfo;
 import com.inspur.digital.domain.SmsbDeviceChatScCase;
 import com.inspur.digital.domain.SmsbDeviceChatScReport;
+import com.inspur.digital.domain.SmsbDeviceScScanCode;
 import com.inspur.digital.domain.bo.SmsbAppointmentInfoBo;
 import com.inspur.digital.domain.bo.SmsbStartInfoBo;
 import com.inspur.digital.domain.vo.*;
 import com.inspur.digital.mapper.SmsbAppointmentInfoMapper;
 import com.inspur.digital.mapper.SmsbDeviceChatScCaseMapper;
 import com.inspur.digital.mapper.SmsbDeviceChatScReportMapper;
+import com.inspur.digital.mapper.SmsbDeviceScScanCodeMapper;
 import com.inspur.digital.service.ISmsbAppointmentInfoService;
 import com.inspur.digital.util.DifyStreamUtil;
 import com.inspur.digital.util.EncryptUtil;
@@ -44,10 +47,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -65,6 +65,7 @@ public class SmsbAppointmentInfoServiceImpl implements ISmsbAppointmentInfoServi
     private final SmsbDeviceGroupRelMapper smsbDeviceGroupRelMapper;
     private final SmsbDeviceChatScReportMapper smsbDeviceChatScReportMapper;
     private final SmsbDeviceChatScCaseMapper smsbDeviceChatScCaseMapper;
+    private final SmsbDeviceScScanCodeMapper smsbDeviceScScanCodeMapper;
     @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
     @Value("${sc.api.url}")
@@ -475,6 +476,14 @@ public class SmsbAppointmentInfoServiceImpl implements ISmsbAppointmentInfoServi
             return R.ok(result);
         }
         // 存在预约
+        // 更新到访 生成扫码记录
+        SmsbAppointmentInfo updateArrived = new SmsbAppointmentInfo();
+        updateArrived.setIsArrived(1);
+        updateArrived.setArrivedTime(new Date());
+        baseMapper.update(updateArrived, new LambdaUpdateWrapper<SmsbAppointmentInfo>().eq(SmsbAppointmentInfo::getId, appointmentInfo.getId()));
+        // 记录扫码记录
+        recordScanCode(appointmentInfo,smsbStartInfoBo);
+
         result.setPhone(appointmentInfo.getPhone());
         result.setEnterprise(appointmentInfo.getEnterprise());
         result.setAppointmentId(appointmentInfo.getId());
@@ -533,6 +542,18 @@ public class SmsbAppointmentInfoServiceImpl implements ISmsbAppointmentInfoServi
         return R.ok(result);
     }
 
+    private void recordScanCode(SmsbAppointmentInfo appointmentInfo, SmsbStartInfoBo smsbStartInfoBo) {
+        SmsbDeviceScScanCode scanCode = new SmsbDeviceScScanCode();
+        scanCode.setIdentifier(smsbStartInfoBo.getIdentifier());
+        scanCode.setEnterprise(smsbStartInfoBo.getEnterprise());
+        scanCode.setPhone(smsbStartInfoBo.getPhone());
+        scanCode.setRegionCode(smsbStartInfoBo.getRegionCode());
+        scanCode.setRegion(smsbStartInfoBo.getRegion());
+        scanCode.setPersonNum(smsbStartInfoBo.getPersonNum());
+        scanCode.setTenantId(appointmentInfo.getTenantId());
+        smsbDeviceScScanCodeMapper.insert(scanCode);
+    }
+
     private List<String> createCaseContentList(List<SmsbDeviceChatScCaseVo> caseVoList) {
         List<String> contentList = new ArrayList<>();
         for (SmsbDeviceChatScCaseVo caseVo : caseVoList) {
@@ -554,7 +575,7 @@ public class SmsbAppointmentInfoServiceImpl implements ISmsbAppointmentInfoServi
                     allContentStr.append("###").append("\n");
                     allContentStr.append(content).append("\n");
                 }
-                String filePath = createTempFile(allContentStr.toString());
+                String filePath = createTempFile(allContentStr.toString(), "report_");
                 log.info("syncDatasetsReport thread createTempFile success tempFilePath = " + filePath);
                 boolean uploadResult = uploadDatasetsToDify(datasetsId,filePath);
             } catch (IOException e) {
@@ -576,7 +597,7 @@ public class SmsbAppointmentInfoServiceImpl implements ISmsbAppointmentInfoServi
                     allContentStr.append("###").append("\n");
                     allContentStr.append(content).append("\n");
                 }
-                String filePath = createTempFile(allContentStr.toString());
+                String filePath = createTempFile(allContentStr.toString(), "case_");
                 log.info("syncDatasetsCase thread createTempFile success tempFilePath = " + filePath);
                 boolean uploadResult = uploadDatasetsToDify(datasetsId,filePath);
             } catch (IOException e) {
@@ -686,13 +707,13 @@ public class SmsbAppointmentInfoServiceImpl implements ISmsbAppointmentInfoServi
         return datasetsFiles;
     }
 
-    private String createTempFile(String datasetsContent) throws IOException {
+    private String createTempFile(String datasetsContent,String type) throws IOException {
         // 创建一个临时路径
         String localPath = tempDir + "/" + System.currentTimeMillis();
         Path path = Paths.get(localPath);
         Files.createDirectories(path);
         // 将datasetsContent保存到临时路径
-        String filePath = localPath + "/" + System.currentTimeMillis() + ".txt";
+        String filePath = localPath + "/" + type + System.currentTimeMillis() + ".txt";
         Path filePathObj = Paths.get(filePath);
         byte[] contentBytes = datasetsContent.getBytes(StandardCharsets.UTF_8);
         Files.write(filePathObj, contentBytes);

smsb-modules/smsb-digital-promotion/src/main/java/com/inspur/digital/service/impl/SmsbDeviceScScanCodeServiceImpl.java

@@ -0,0 +1,130 @@
+package com.inspur.digital.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.inspur.digital.domain.SmsbDeviceScScanCode;
+import com.inspur.digital.domain.bo.SmsbDeviceScScanCodeBo;
+import com.inspur.digital.domain.vo.SmsbDeviceScScanCodeVo;
+import com.inspur.digital.mapper.SmsbDeviceScScanCodeMapper;
+import com.inspur.digital.service.ISmsbDeviceScScanCodeService;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 扫码记录Service业务层处理
+ *
+ * @author Hao Li
+ * @date 2025-07-02
+ */
+@RequiredArgsConstructor
+@Service
+public class SmsbDeviceScScanCodeServiceImpl implements ISmsbDeviceScScanCodeService {
+
+    private final SmsbDeviceScScanCodeMapper baseMapper;
+
+    /**
+     * 查询扫码记录
+     *
+     * @param id 主键
+     * @return 扫码记录
+     */
+    @Override
+    public SmsbDeviceScScanCodeVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询扫码记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 扫码记录分页列表
+     */
+    @Override
+    public TableDataInfo<SmsbDeviceScScanCodeVo> queryPageList(SmsbDeviceScScanCodeBo bo, PageQuery pageQuery) {
+        Page<SmsbDeviceScScanCodeVo> result = baseMapper.selectVoPageWithDevice(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的扫码记录列表
+     *
+     * @param bo 查询条件
+     * @return 扫码记录列表
+     */
+    @Override
+    public List<SmsbDeviceScScanCodeVo> queryList(SmsbDeviceScScanCodeBo bo) {
+        LambdaQueryWrapper<SmsbDeviceScScanCode> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SmsbDeviceScScanCode> buildQueryWrapper(SmsbDeviceScScanCodeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SmsbDeviceScScanCode> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getIdentifier()), SmsbDeviceScScanCode::getIdentifier, bo.getIdentifier());
+        lqw.like(StringUtils.isNotBlank(bo.getEnterprise()), SmsbDeviceScScanCode::getEnterprise, bo.getEnterprise());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), SmsbDeviceScScanCode::getPhone, bo.getPhone());
+        return lqw;
+    }
+
+    /**
+     * 新增扫码记录
+     *
+     * @param bo 扫码记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SmsbDeviceScScanCodeBo bo) {
+        SmsbDeviceScScanCode add = MapstructUtils.convert(bo, SmsbDeviceScScanCode.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改扫码记录
+     *
+     * @param bo 扫码记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SmsbDeviceScScanCodeBo bo) {
+        SmsbDeviceScScanCode update = MapstructUtils.convert(bo, SmsbDeviceScScanCode.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SmsbDeviceScScanCode entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除扫码记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

smsb-modules/smsb-digital-promotion/src/main/resources/mapper/digital/SmsbDeviceScScanCodeMapper.xml

@@ -0,0 +1,30 @@
+<?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="com.inspur.digital.mapper.SmsbDeviceScScanCodeMapper">
+    <select id="selectVoPageWithDevice" resultType="com.inspur.digital.domain.vo.SmsbDeviceScScanCodeVo" parameterType="com.inspur.digital.domain.bo.SmsbDeviceScScanCodeBo">
+        SELECT
+            sc.*,
+            sd.NAME AS deviceName,
+            mac AS deviceMac
+        FROM
+            smsb_device_sc_scan_code sc
+                LEFT JOIN smsb_device sd ON sc.identifier = sd.identifier
+        WHERE
+            1 = 1
+        <if test="bo.enterprise != null and bo.enterprise != ''">
+            AND sc.enterprise like concat('%',#{bo.enterprise},'%')
+        </if>
+        <if test="bo.deviceName != null and bo.deviceName != ''">
+            AND sd.NAME like concat('%',#{bo.deviceName},'%')
+        </if>
+        <if test="bo.deviceMac != null and bo.deviceMac != ''">
+            AND sd.mac like concat('%',#{bo.deviceMac},'%')
+        </if>
+        <if test="bo.phone != null and bo.phone != ''">
+            AND sc.phone like concat('%',#{bo.phone},'%')
+        </if>
+        ORDER BY sc.id desc
+    </select>
+</mapper>

smsb-plus-ui/src/api/smsb/digital/scScanCode/api.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ScScanCodeVO, ScScanCodeForm, ScScanCodeQuery } from '@/api/smsb/digital/scScanCode/types';
+
+/**
+ * 查询扫码记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listScScanCode = (query?: ScScanCodeQuery): AxiosPromise<ScScanCodeVO[]> => {
+  return request({
+    url: '/digital/scScanCode/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询扫码记录详细
+ * @param id
+ */
+export const getScScanCode = (id: string | number): AxiosPromise<ScScanCodeVO> => {
+  return request({
+    url: '/digital/scScanCode/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增扫码记录
+ * @param data
+ */
+export const addScScanCode = (data: ScScanCodeForm) => {
+  return request({
+    url: '/digital/scScanCode',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改扫码记录
+ * @param data
+ */
+export const updateScScanCode = (data: ScScanCodeForm) => {
+  return request({
+    url: '/digital/scScanCode',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除扫码记录
+ * @param id
+ */
+export const delScScanCode = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/digital/scScanCode/' + id,
+    method: 'delete'
+  });
+};

smsb-plus-ui/src/api/smsb/digital/scScanCode/types.ts

@@ -0,0 +1,116 @@
+export interface ScScanCodeVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 设备唯一标识
+   */
+  identifier: string | number;
+
+  /**
+   * 企业名称
+   */
+  enterprise: string;
+
+  /**
+   * 手机号
+   */
+  phone: string;
+
+  /**
+   * 区域编号
+   */
+  regionCode: string;
+
+  /**
+   * 区域
+   */
+  region: string;
+
+  /**
+   * 预约人数
+   */
+  personNum: number;
+
+  /**
+   * 扫码时间
+   */
+  createTime: string;
+
+}
+
+export interface ScScanCodeForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 设备唯一标识
+   */
+  identifier?: string | number;
+
+  /**
+   * 企业名称
+   */
+  enterprise?: string;
+
+  /**
+   * 手机号
+   */
+  phone?: string;
+
+  /**
+   * 区域编号
+   */
+  regionCode?: string;
+
+  /**
+   * 区域
+   */
+  region?: string;
+
+  /**
+   * 预约人数
+   */
+  personNum?: number;
+
+  /**
+   * 扫码时间
+   */
+  createTime?: string;
+
+  /**
+   * 租户标识
+   */
+  tenantId?: string | number;
+
+}
+
+export interface ScScanCodeQuery extends PageQuery {
+
+  /**
+   * 设备唯一标识
+   */
+  identifier?: string | number;
+
+  /**
+   * 企业名称
+   */
+  enterprise?: string;
+
+  /**
+   * 手机号
+   */
+  phone?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
+
+
+

smsb-plus-ui/src/views/smsb/scScanCode/index.vue

@@ -0,0 +1,255 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover"  :style="{ marginTop: '10px', height: '60px' }">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="企业名称" prop="enterprise">
+              <el-input v-model="queryParams.enterprise" placeholder="请输入企业名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="queryParams.phone" placeholder="请输入手机号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+<!--      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['digital:scScanCode:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['digital:scScanCode:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['digital:scScanCode:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['digital:scScanCode:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>-->
+
+      <el-table v-loading="loading" :data="scScanCodeList" @selection-change="handleSelectionChange">
+<!--        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" v-if="true" />-->
+        <el-table-column label="" align="left" prop=""  width="10"/>
+        <el-table-column label="扫码设备" align="left" prop="deviceName" width="200" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备标识" align="left" prop="identifier" width="220"/>
+        <el-table-column label="设备MAC" align="left" prop="deviceMac" width="160"/>
+        <el-table-column label="企业名称" align="left" prop="enterprise" :show-overflow-tooltip="true"/>
+        <el-table-column label="手机号" align="left" prop="phone" width="120"/>
+        <el-table-column label="区域编号" align="center" prop="regionCode" width="120" :show-overflow-tooltip="true"/>
+        <el-table-column label="区域" align="left" prop="region" width="180" :show-overflow-tooltip="true"/>
+        <el-table-column label="预约人数" align="center" prop="personNum" width="100" :show-overflow-tooltip="true"/>
+        <el-table-column label="扫码时间" align="left" prop="createTime" width="160"/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+          <template #default="scope">
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['digital:scScanCode:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改扫码记录对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="scScanCodeFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备唯一标识" prop="identifier">
+          <el-input v-model="form.identifier" placeholder="请输入设备唯一标识" />
+        </el-form-item>
+        <el-form-item label="企业名称" prop="enterprise">
+          <el-input v-model="form.enterprise" placeholder="请输入企业名称" />
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="区域编号" prop="regionCode">
+          <el-input v-model="form.regionCode" placeholder="请输入区域编号" />
+        </el-form-item>
+        <el-form-item label="区域" prop="region">
+          <el-input v-model="form.region" placeholder="请输入区域" />
+        </el-form-item>
+        <el-form-item label="预约人数" prop="personNum">
+          <el-input v-model="form.personNum" placeholder="请输入预约人数" />
+        </el-form-item>
+        <el-form-item label="扫码时间" prop="createTime">
+          <el-date-picker clearable
+                          v-model="form.createTime"
+                          type="datetime"
+                          value-format="YYYY-MM-DD HH:mm:ss"
+                          placeholder="请选择扫码时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="租户标识" prop="tenantId">
+          <el-input v-model="form.tenantId" placeholder="请输入租户标识" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ScScanCode" lang="ts">
+import { listScScanCode, getScScanCode, delScScanCode, addScScanCode, updateScScanCode } from '@/api/smsb/digital/scScanCode/api';
+import { ScScanCodeVO, ScScanCodeQuery, ScScanCodeForm } from '@/api/smsb/digital/scScanCode/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const scScanCodeList = ref<ScScanCodeVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const scScanCodeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ScScanCodeForm = {
+  id: undefined,
+  identifier: undefined,
+  enterprise: undefined,
+  phone: undefined,
+  regionCode: undefined,
+  region: undefined,
+  personNum: undefined,
+  createTime: undefined,
+  tenantId: undefined
+}
+const data = reactive<PageData<ScScanCodeForm, ScScanCodeQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    identifier: undefined,
+    enterprise: undefined,
+    phone: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询扫码记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listScScanCode(queryParams.value);
+  scScanCodeList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  scScanCodeFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ScScanCodeVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加扫码记录";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ScScanCodeVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getScScanCode(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改扫码记录";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  scScanCodeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateScScanCode(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addScScanCode(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ScScanCodeVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除扫码记录的数据项？').finally(() => loading.value = false);
+  await delScScanCode(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('digital/scScanCode/export', {
+    ...queryParams.value
+  }, `scScanCode_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>