From 7cf629967fc8b4ac879ce223522b6ca6e1ea2933 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 30 一月 2026 10:05:41 +0800
Subject: [PATCH] feat(purchase): 碳立方对接
---
main-business/src/main/resources/mapper/CarbonCubesMapper.xml | 17 +++++++++++++++++
main-business/src/main/java/com/ruoyi/business/mapper/CarbonCubesMapper.java | 4 ++++
main-business/src/main/java/com/ruoyi/business/service/CarbonCubesService.java | 4 ++++
main-business/src/main/java/com/ruoyi/business/service/impl/CarbonCubesServiceImpl.java | 10 +++++++++-
main-business/src/main/java/com/ruoyi/business/controller/CarbonCubesController.java | 11 +++++++----
5 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/controller/CarbonCubesController.java b/main-business/src/main/java/com/ruoyi/business/controller/CarbonCubesController.java
index 64c8796..b9556a7 100644
--- a/main-business/src/main/java/com/ruoyi/business/controller/CarbonCubesController.java
+++ b/main-business/src/main/java/com/ruoyi/business/controller/CarbonCubesController.java
@@ -2,15 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.entity.CarbonCubes;
import com.ruoyi.business.service.CarbonCubesService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.R;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RestController
@AllArgsConstructor
@@ -31,4 +29,9 @@
return carbonCubesService.remove(new QueryWrapper<CarbonCubes>()
.lambda().eq(CarbonCubes::getBillNumber,carbonCubes.getBillNumber()))? R.ok() : R.fail();
}
+
+ @GetMapping("/page")
+ public R page(CarbonCubes carbonCubes, Page<CarbonCubes> page) {
+ return R.ok(carbonCubesService.pageCarbonCubes(page, carbonCubes));
+ }
}
diff --git a/main-business/src/main/java/com/ruoyi/business/mapper/CarbonCubesMapper.java b/main-business/src/main/java/com/ruoyi/business/mapper/CarbonCubesMapper.java
index 77a5a9e..73cbbc3 100644
--- a/main-business/src/main/java/com/ruoyi/business/mapper/CarbonCubesMapper.java
+++ b/main-business/src/main/java/com/ruoyi/business/mapper/CarbonCubesMapper.java
@@ -1,9 +1,13 @@
package com.ruoyi.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.entity.CarbonCubes;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface CarbonCubesMapper extends BaseMapper<CarbonCubes> {
+ IPage<CarbonCubes> pageCarbonCubes(Page<CarbonCubes> page, @Param("ew") CarbonCubes carbonCubes);
}
diff --git a/main-business/src/main/java/com/ruoyi/business/service/CarbonCubesService.java b/main-business/src/main/java/com/ruoyi/business/service/CarbonCubesService.java
index 1bf529d..a8e4ce3 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/CarbonCubesService.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/CarbonCubesService.java
@@ -1,9 +1,13 @@
package com.ruoyi.business.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.business.entity.CarbonCubes;
import com.ruoyi.common.core.domain.R;
public interface CarbonCubesService extends IService<CarbonCubes> {
R addCarbonCubes(CarbonCubes carbonCubes);
+
+ IPage<CarbonCubes> pageCarbonCubes(Page<CarbonCubes> page, CarbonCubes carbonCubes);
}
diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/CarbonCubesServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/CarbonCubesServiceImpl.java
index dd61580..301e5e0 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/CarbonCubesServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/CarbonCubesServiceImpl.java
@@ -1,7 +1,9 @@
package com.ruoyi.business.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.entity.CoalInfo;
import com.ruoyi.basic.mapper.CoalInfoMapper;
@@ -22,7 +24,8 @@
public class CarbonCubesServiceImpl extends ServiceImpl<CarbonCubesMapper, CarbonCubes> implements CarbonCubesService {
@Autowired
private final CoalInfoMapper coalInfoMapper;
-
+ @Autowired
+ private CarbonCubesMapper carbonCubesMapper;
@Override
@@ -52,4 +55,9 @@
}
return R.ok();
}
+
+ @Override
+ public IPage<CarbonCubes> pageCarbonCubes(Page<CarbonCubes> page, CarbonCubes carbonCubes) {
+ return carbonCubesMapper.pageCarbonCubes(page, carbonCubes);
+ }
}
diff --git a/main-business/src/main/resources/mapper/CarbonCubesMapper.xml b/main-business/src/main/resources/mapper/CarbonCubesMapper.xml
new file mode 100644
index 0000000..5d37469
--- /dev/null
+++ b/main-business/src/main/resources/mapper/CarbonCubesMapper.xml
@@ -0,0 +1,17 @@
+<?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.ruoyi.business.mapper.CarbonCubesMapper">
+
+
+ <select id="pageCarbonCubes" resultType="com.ruoyi.business.entity.CarbonCubes">
+ select * from carbon_cubes
+ <where>
+ <if test="ew.coal != null and ew.coal != null ">
+ and coal like concat('%',#{ew.coal},'%')
+ </if>
+ <if test="ew.orderType != null and ew.orderType != ''">
+ and order_type = #{ew.orderType}
+ </if>
+ </where>
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3