多次扫码分页查询接口

src/main/java/com/alihealth/d2d/provtest/controller/MultySacnCodeRecordController.java

@@ -1,20 +0,0 @@
-package com.alihealth.d2d.provtest.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 药品追溯码多次扫码记录 前端控制器
- * </p>
- *
- * @author Jason
- * @since 2025-06-24
- */
-@Controller
-@RequestMapping("/multy-sacn-code-record")
-public class MultySacnCodeRecordController {
-
-}

src/main/java/com/alihealth/d2d/provtest/controller/MultyScanCodeRecordController.java

@@ -0,0 +1,40 @@
+package com.alihealth.d2d.provtest.controller;
+
+
+import com.alihealth.d2d.provtest.common.AjaxResult;
+import com.alihealth.d2d.provtest.domain.MultyScanCodeRecord;
+import com.alihealth.d2d.provtest.service.IMultyScanCodeRecordService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 药品追溯码多次扫码记录 前端控制器
+ * </p>
+ *
+ * @author Jason
+ * @since 2025-06-24
+ */
+@RestController
+@RequestMapping("/multyScanCode")
+public class MultyScanCodeRecordController {
+
+    @Autowired
+    private IMultyScanCodeRecordService iMultyScanCodeRecordService;
+
+    @GetMapping("/query")
+    public AjaxResult multyScanCode(
+            @RequestParam(defaultValue = "1") Integer current,
+            @RequestParam(defaultValue = "10") Integer size,
+            @RequestParam(required = false) String ypzsm,
+            @RequestParam(required = false) Integer handleFlag) {
+
+        Page<MultyScanCodeRecord> page = new Page<>(current, size);
+        Page<MultyScanCodeRecord> result = iMultyScanCodeRecordService.pageQuery(page, ypzsm, handleFlag);
+        return AjaxResult.success(result);
+    }
+}

src/main/java/com/alihealth/d2d/provtest/domain/MultyScanCodeRecord.java

@@ -17,8 +17,8 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@TableName("multy_sacn_code_record")
+@TableName("multy_scan_code_record")
-public class MultySacnCodeRecord implements Serializable {
+public class MultyScanCodeRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -43,7 +43,7 @@ public class MultySacnCodeRecord implements Serializable {
     /**
      * 更新时间
      */
-    @TableField(value = "update_time", update = "now()", fill = FieldFill.UPDATE)
+    @TableField(value = "update_time", update = "now()", fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     /**

src/main/java/com/alihealth/d2d/provtest/mapper/MultyScanCodeRecordMapper.java

@@ -1,6 +1,6 @@
 package com.alihealth.d2d.provtest.mapper;
 
-import com.alihealth.d2d.provtest.domain.MultySacnCodeRecord;
+import com.alihealth.d2d.provtest.domain.MultyScanCodeRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author Jason
  * @since 2025-06-24
  */
-public interface MultySacnCodeRecordMapper extends BaseMapper<MultySacnCodeRecord> {
+public interface MultyScanCodeRecordMapper extends BaseMapper<MultyScanCodeRecord> {
 
 }

src/main/java/com/alihealth/d2d/provtest/service/IMultySacnCodeRecordService.java

@@ -1,16 +0,0 @@
-package com.alihealth.d2d.provtest.service;
-
-import com.alihealth.d2d.provtest.domain.MultySacnCodeRecord;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 药品追溯码多次扫码记录 服务类
- * </p>
- *
- * @author Jason
- * @since 2025-06-24
- */
-public interface IMultySacnCodeRecordService extends IService<MultySacnCodeRecord> {
-
-}

src/main/java/com/alihealth/d2d/provtest/service/IMultyScanCodeRecordService.java

@@ -0,0 +1,25 @@
+package com.alihealth.d2d.provtest.service;
+
+import com.alihealth.d2d.provtest.domain.MultyScanCodeRecord;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 药品追溯码多次扫码记录 服务类
+ * </p>
+ *
+ * @author Jason
+ * @since 2025-06-24
+ */
+public interface IMultyScanCodeRecordService extends IService<MultyScanCodeRecord> {
+
+    /**
+     * 多次扫码记录分页查询
+     * @param page
+     * @param ypzsm
+     * @param handleFlag
+     * @return
+     */
+    Page<MultyScanCodeRecord> pageQuery(Page<MultyScanCodeRecord> page, String ypzsm, Integer handleFlag);
+}

src/main/java/com/alihealth/d2d/provtest/service/handle/EventData2017Handler.java

@@ -1,12 +1,12 @@
 package com.alihealth.d2d.provtest.service.handle;
 
 import com.alihealth.d2d.provtest.domain.DrugRetailAndUseApplyInfo;
-import com.alihealth.d2d.provtest.domain.MultySacnCodeRecord;
+import com.alihealth.d2d.provtest.domain.MultyScanCodeRecord;
 import com.alihealth.d2d.provtest.entity.EventBody;
 import com.alihealth.d2d.provtest.entity.InstanceDetail;
 import com.alihealth.d2d.provtest.entity.ItemDetail;
 import com.alihealth.d2d.provtest.entity.VTTSEventS;
-import com.alihealth.d2d.provtest.service.IMultySacnCodeRecordService;
+import com.alihealth.d2d.provtest.service.IMultyScanCodeRecordService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.slf4j.Logger;
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 public abstract class EventData2017Handler implements EventDataHandler {
 
     @Autowired
-    private IMultySacnCodeRecordService iMultySacnCodeRecordService;
+    private IMultyScanCodeRecordService iMultyScanCodeRecordService;
 
     protected final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -72,14 +72,14 @@ public abstract class EventData2017Handler implements EventDataHandler {
                     .in(DrugRetailAndUseApplyInfo::getYpzsm, ypzsmList)
             );
             if (!CollectionUtils.isEmpty(existedList)) {
-                List<MultySacnCodeRecord> multySacnCodeRecordList = new ArrayList<>(existedList.size());
+                List<MultyScanCodeRecord> multyScanCodeRecordList = new ArrayList<>(existedList.size());
                 for (DrugRetailAndUseApplyInfo itemInfo : existedList) {
-                    MultySacnCodeRecord multySacnCodeRecord = new MultySacnCodeRecord();
+                    MultyScanCodeRecord multyScanCodeRecord = new MultyScanCodeRecord();
-                    multySacnCodeRecord.setYpzsm(itemInfo.getYpzsm());
+                    multyScanCodeRecord.setYpzsm(itemInfo.getYpzsm());
-                    multySacnCodeRecord.setHandleFlag(0);
+                    multyScanCodeRecord.setHandleFlag(0);
-                    multySacnCodeRecordList.add(multySacnCodeRecord);
+                    multyScanCodeRecordList.add(multyScanCodeRecord);
                 }
-                iMultySacnCodeRecordService.saveOrUpdateBatch(multySacnCodeRecordList);
+                iMultyScanCodeRecordService.saveOrUpdateBatch(multyScanCodeRecordList);
             }
             getService().saveBatch(entities);
         }

src/main/java/com/alihealth/d2d/provtest/service/impl/DataStatisticsServiceImpl.java

@@ -1,14 +1,9 @@
 package com.alihealth.d2d.provtest.service.impl;
 
-import com.alihealth.d2d.provtest.domain.DomesticDrugBaseInfo;
 import com.alihealth.d2d.provtest.domain.vo.EnterpriseScanCode;
 import com.alihealth.d2d.provtest.mapper.DataStatisticsMapper;
-import com.alihealth.d2d.provtest.mapper.DomesticDrugBaseInfoMapper;
 import com.alihealth.d2d.provtest.service.IDataStatisticsService;
-import com.alihealth.d2d.provtest.service.IDomesticDrugBaseInfoService;
-import com.alihealth.d2d.provtest.utils.CertManager;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,12 +14,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class DataStatisticsServiceImpl implements IDataStatisticsService {
     @Autowired
-    private DataStatisticsMapper mapper;
+    private DataStatisticsMapper dataStatisticsMapper;
-
 
 
     @Override
     public Page<EnterpriseScanCode> pageScanCode(Page<EnterpriseScanCode> page, String name, String socialCreditCode, String type) {
-        return mapper.pageScanCode(page, name, socialCreditCode,type);
+        return dataStatisticsMapper.pageScanCode(page, name, socialCreditCode, type);
     }
 }

src/main/java/com/alihealth/d2d/provtest/service/impl/MultySacnCodeRecordServiceImpl.java

@@ -1,20 +0,0 @@
-package com.alihealth.d2d.provtest.service.impl;
-
-import com.alihealth.d2d.provtest.domain.MultySacnCodeRecord;
-import com.alihealth.d2d.provtest.mapper.MultySacnCodeRecordMapper;
-import com.alihealth.d2d.provtest.service.IMultySacnCodeRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 药品追溯码多次扫码记录 服务实现类
- * </p>
- *
- * @author Jason
- * @since 2025-06-24
- */
-@Service
-public class MultySacnCodeRecordServiceImpl extends ServiceImpl<MultySacnCodeRecordMapper, MultySacnCodeRecord> implements IMultySacnCodeRecordService {
-
-}

src/main/java/com/alihealth/d2d/provtest/service/impl/MultyScanCodeRecordServiceImpl.java

@@ -0,0 +1,39 @@
+package com.alihealth.d2d.provtest.service.impl;
+
+import com.alihealth.d2d.provtest.domain.MultyScanCodeRecord;
+import com.alihealth.d2d.provtest.mapper.MultyScanCodeRecordMapper;
+import com.alihealth.d2d.provtest.service.IMultyScanCodeRecordService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ * 药品追溯码多次扫码记录 服务实现类
+ * </p>
+ *
+ * @author Jason
+ * @since 2025-06-24
+ */
+@Service
+public class MultyScanCodeRecordServiceImpl extends ServiceImpl<MultyScanCodeRecordMapper, MultyScanCodeRecord> implements IMultyScanCodeRecordService {
+
+    @Autowired
+    private MultyScanCodeRecordMapper multyScanCodeRecordMapper;
+
+    @Override
+    public Page<MultyScanCodeRecord> pageQuery(Page<MultyScanCodeRecord> page, String ypzsm, Integer handleFlag) {
+        Page<MultyScanCodeRecord> multyScanCodeRecordPage = multyScanCodeRecordMapper.selectPage(page, new QueryWrapper<MultyScanCodeRecord>().lambda()
+                .eq(!StringUtils.isEmpty(ypzsm), MultyScanCodeRecord::getYpzsm, ypzsm)
+                .eq(Objects.nonNull(handleFlag), MultyScanCodeRecord::getHandleFlag, handleFlag)
+                .orderByDesc(MultyScanCodeRecord::getUpdateTime)
+                .orderByAsc(MultyScanCodeRecord::getHandleFlag)
+        );
+        return multyScanCodeRecordPage;
+    }
+}

src/main/resources/mapper/MultyScanCodeRecordMapper.xml

@@ -1,5 +1,5 @@
 <?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.alihealth.d2d.provtest.mapper.MultySacnCodeRecordMapper">
+<mapper namespace="com.alihealth.d2d.provtest.mapper.MultyScanCodeRecordMapper">
 
 </mapper>