From 1f5378d72e5187d76f72ac7ebd0bec669d065e77 Mon Sep 17 00:00:00 2001 From: daichao <1438977546@qq.com> Date: Tue, 24 Jun 2025 18:31:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=89=AB=E7=A0=81=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MultySacnCodeRecordController.java | 20 ---------- .../MultyScanCodeRecordController.java | 40 +++++++++++++++++++ ...deRecord.java => MultyScanCodeRecord.java} | 6 +-- ...er.java => MultyScanCodeRecordMapper.java} | 4 +- .../service/IMultySacnCodeRecordService.java | 16 -------- .../service/IMultyScanCodeRecordService.java | 25 ++++++++++++ .../service/handle/EventData2017Handler.java | 18 ++++----- .../impl/DataStatisticsServiceImpl.java | 10 +---- .../impl/MultySacnCodeRecordServiceImpl.java | 20 ---------- .../impl/MultyScanCodeRecordServiceImpl.java | 39 ++++++++++++++++++ ...pper.xml => MultyScanCodeRecordMapper.xml} | 2 +- 11 files changed, 121 insertions(+), 79 deletions(-) delete mode 100644 src/main/java/com/alihealth/d2d/provtest/controller/MultySacnCodeRecordController.java create mode 100644 src/main/java/com/alihealth/d2d/provtest/controller/MultyScanCodeRecordController.java rename src/main/java/com/alihealth/d2d/provtest/domain/{MultySacnCodeRecord.java => MultyScanCodeRecord.java} (88%) rename src/main/java/com/alihealth/d2d/provtest/mapper/{MultySacnCodeRecordMapper.java => MultyScanCodeRecordMapper.java} (59%) delete mode 100644 src/main/java/com/alihealth/d2d/provtest/service/IMultySacnCodeRecordService.java create mode 100644 src/main/java/com/alihealth/d2d/provtest/service/IMultyScanCodeRecordService.java delete mode 100644 src/main/java/com/alihealth/d2d/provtest/service/impl/MultySacnCodeRecordServiceImpl.java create mode 100644 src/main/java/com/alihealth/d2d/provtest/service/impl/MultyScanCodeRecordServiceImpl.java rename src/main/resources/mapper/{MultySacnCodeRecordMapper.xml => MultyScanCodeRecordMapper.xml} (73%) diff --git a/src/main/java/com/alihealth/d2d/provtest/controller/MultySacnCodeRecordController.java b/src/main/java/com/alihealth/d2d/provtest/controller/MultySacnCodeRecordController.java deleted file mode 100644 index cc8edf4..0000000 --- a/src/main/java/com/alihealth/d2d/provtest/controller/MultySacnCodeRecordController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.alihealth.d2d.provtest.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 药品追溯码多次扫码记录 前端控制器 - *

- * - * @author Jason - * @since 2025-06-24 - */ -@Controller -@RequestMapping("/multy-sacn-code-record") -public class MultySacnCodeRecordController { - -} diff --git a/src/main/java/com/alihealth/d2d/provtest/controller/MultyScanCodeRecordController.java b/src/main/java/com/alihealth/d2d/provtest/controller/MultyScanCodeRecordController.java new file mode 100644 index 0000000..ebf5b92 --- /dev/null +++ b/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; + +/** + *

+ * 药品追溯码多次扫码记录 前端控制器 + *

+ * + * @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 page = new Page<>(current, size); + Page result = iMultyScanCodeRecordService.pageQuery(page, ypzsm, handleFlag); + return AjaxResult.success(result); + } +} diff --git a/src/main/java/com/alihealth/d2d/provtest/domain/MultySacnCodeRecord.java b/src/main/java/com/alihealth/d2d/provtest/domain/MultyScanCodeRecord.java similarity index 88% rename from src/main/java/com/alihealth/d2d/provtest/domain/MultySacnCodeRecord.java rename to src/main/java/com/alihealth/d2d/provtest/domain/MultyScanCodeRecord.java index 82d1ada..39e3267 100644 --- a/src/main/java/com/alihealth/d2d/provtest/domain/MultySacnCodeRecord.java +++ b/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") -public class MultySacnCodeRecord implements Serializable { +@TableName("multy_scan_code_record") +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; /** diff --git a/src/main/java/com/alihealth/d2d/provtest/mapper/MultySacnCodeRecordMapper.java b/src/main/java/com/alihealth/d2d/provtest/mapper/MultyScanCodeRecordMapper.java similarity index 59% rename from src/main/java/com/alihealth/d2d/provtest/mapper/MultySacnCodeRecordMapper.java rename to src/main/java/com/alihealth/d2d/provtest/mapper/MultyScanCodeRecordMapper.java index 2ab110e..d7855ac 100644 --- a/src/main/java/com/alihealth/d2d/provtest/mapper/MultySacnCodeRecordMapper.java +++ b/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 { +public interface MultyScanCodeRecordMapper extends BaseMapper { } diff --git a/src/main/java/com/alihealth/d2d/provtest/service/IMultySacnCodeRecordService.java b/src/main/java/com/alihealth/d2d/provtest/service/IMultySacnCodeRecordService.java deleted file mode 100644 index 1ce7b2e..0000000 --- a/src/main/java/com/alihealth/d2d/provtest/service/IMultySacnCodeRecordService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.alihealth.d2d.provtest.service; - -import com.alihealth.d2d.provtest.domain.MultySacnCodeRecord; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 药品追溯码多次扫码记录 服务类 - *

- * - * @author Jason - * @since 2025-06-24 - */ -public interface IMultySacnCodeRecordService extends IService { - -} diff --git a/src/main/java/com/alihealth/d2d/provtest/service/IMultyScanCodeRecordService.java b/src/main/java/com/alihealth/d2d/provtest/service/IMultyScanCodeRecordService.java new file mode 100644 index 0000000..19159a6 --- /dev/null +++ b/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; + +/** + *

+ * 药品追溯码多次扫码记录 服务类 + *

+ * + * @author Jason + * @since 2025-06-24 + */ +public interface IMultyScanCodeRecordService extends IService { + + /** + * 多次扫码记录分页查询 + * @param page + * @param ypzsm + * @param handleFlag + * @return + */ + Page pageQuery(Page page, String ypzsm, Integer handleFlag); +} diff --git a/src/main/java/com/alihealth/d2d/provtest/service/handle/EventData2017Handler.java b/src/main/java/com/alihealth/d2d/provtest/service/handle/EventData2017Handler.java index b595722..3ca00a9 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/handle/EventData2017Handler.java +++ b/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 multySacnCodeRecordList = new ArrayList<>(existedList.size()); + List multyScanCodeRecordList = new ArrayList<>(existedList.size()); for (DrugRetailAndUseApplyInfo itemInfo : existedList) { - MultySacnCodeRecord multySacnCodeRecord = new MultySacnCodeRecord(); - multySacnCodeRecord.setYpzsm(itemInfo.getYpzsm()); - multySacnCodeRecord.setHandleFlag(0); - multySacnCodeRecordList.add(multySacnCodeRecord); + MultyScanCodeRecord multyScanCodeRecord = new MultyScanCodeRecord(); + multyScanCodeRecord.setYpzsm(itemInfo.getYpzsm()); + multyScanCodeRecord.setHandleFlag(0); + multyScanCodeRecordList.add(multyScanCodeRecord); } - iMultySacnCodeRecordService.saveOrUpdateBatch(multySacnCodeRecordList); + iMultyScanCodeRecordService.saveOrUpdateBatch(multyScanCodeRecordList); } getService().saveBatch(entities); } diff --git a/src/main/java/com/alihealth/d2d/provtest/service/impl/DataStatisticsServiceImpl.java b/src/main/java/com/alihealth/d2d/provtest/service/impl/DataStatisticsServiceImpl.java index 4573339..ebf25da 100644 --- a/src/main/java/com/alihealth/d2d/provtest/service/impl/DataStatisticsServiceImpl.java +++ b/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 pageScanCode(Page page, String name, String socialCreditCode, String type) { - return mapper.pageScanCode(page, name, socialCreditCode,type); + return dataStatisticsMapper.pageScanCode(page, name, socialCreditCode, type); } } diff --git a/src/main/java/com/alihealth/d2d/provtest/service/impl/MultySacnCodeRecordServiceImpl.java b/src/main/java/com/alihealth/d2d/provtest/service/impl/MultySacnCodeRecordServiceImpl.java deleted file mode 100644 index 3908dbd..0000000 --- a/src/main/java/com/alihealth/d2d/provtest/service/impl/MultySacnCodeRecordServiceImpl.java +++ /dev/null @@ -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; - -/** - *

- * 药品追溯码多次扫码记录 服务实现类 - *

- * - * @author Jason - * @since 2025-06-24 - */ -@Service -public class MultySacnCodeRecordServiceImpl extends ServiceImpl implements IMultySacnCodeRecordService { - -} diff --git a/src/main/java/com/alihealth/d2d/provtest/service/impl/MultyScanCodeRecordServiceImpl.java b/src/main/java/com/alihealth/d2d/provtest/service/impl/MultyScanCodeRecordServiceImpl.java new file mode 100644 index 0000000..8397f61 --- /dev/null +++ b/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; + +/** + *

+ * 药品追溯码多次扫码记录 服务实现类 + *

+ * + * @author Jason + * @since 2025-06-24 + */ +@Service +public class MultyScanCodeRecordServiceImpl extends ServiceImpl implements IMultyScanCodeRecordService { + + @Autowired + private MultyScanCodeRecordMapper multyScanCodeRecordMapper; + + @Override + public Page pageQuery(Page page, String ypzsm, Integer handleFlag) { + Page multyScanCodeRecordPage = multyScanCodeRecordMapper.selectPage(page, new QueryWrapper().lambda() + .eq(!StringUtils.isEmpty(ypzsm), MultyScanCodeRecord::getYpzsm, ypzsm) + .eq(Objects.nonNull(handleFlag), MultyScanCodeRecord::getHandleFlag, handleFlag) + .orderByDesc(MultyScanCodeRecord::getUpdateTime) + .orderByAsc(MultyScanCodeRecord::getHandleFlag) + ); + return multyScanCodeRecordPage; + } +} diff --git a/src/main/resources/mapper/MultySacnCodeRecordMapper.xml b/src/main/resources/mapper/MultyScanCodeRecordMapper.xml similarity index 73% rename from src/main/resources/mapper/MultySacnCodeRecordMapper.xml rename to src/main/resources/mapper/MultyScanCodeRecordMapper.xml index 5f1632b..7c5c7d5 100644 --- a/src/main/resources/mapper/MultySacnCodeRecordMapper.xml +++ b/src/main/resources/mapper/MultyScanCodeRecordMapper.xml @@ -1,5 +1,5 @@ - +