From 05a5ac6f4fc67ee9445c2a8a7ed4dd8c67c8195c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 03 六月 2025 15:42:21 +0800
Subject: [PATCH] 1.煤质 2.其他优化
---
basic-server/src/main/java/com/ruoyi/basic/service/CoalInfoService.java | 2
basic-server/src/main/resources/db/migration/postgresql/V20250603151801__create_table_coal_quality.sql | 44 +++++
basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java | 4
basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql | 15 +
basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java | 22 ++
basic-server/src/main/java/com/ruoyi/basic/service/CustomerService.java | 2
basic-server/src/main/java/com/ruoyi/basic/entity/CoalQuality.java | 79 +++++++++
basic-server/src/main/resources/mapper/CoalQualityMapper.xml | 35 ++++
basic-server/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 24 +-
basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java | 4
basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalQualityServiceImpl.java | 63 +++++++
basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java | 5
basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java | 6
basic-server/src/main/java/com/ruoyi/basic/dto/CoalQualityDto.java | 8 +
basic-server/src/main/java/com/ruoyi/basic/controller/CoalQualityController.java | 54 ++++++
basic-server/src/main/java/com/ruoyi/basic/service/CoalQualityService.java | 24 +++
basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java | 4
basic-server/src/main/resources/db/migration/postgresql/V20250530171701__create_table_customer.sql | 0
basic-server/src/main/java/com/ruoyi/basic/mapper/CoalQualityMapper.java | 18 ++
basic-server/src/main/resources/mapper/SupplyMapper.xml | 9
20 files changed, 380 insertions(+), 42 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java
index e713fe8..abc2035 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CoalInfoController.java
@@ -3,13 +3,11 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.CoalInfoDto;
-import com.ruoyi.basic.dto.SupplyDto;
import com.ruoyi.basic.entity.CoalInfo;
-import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.service.CoalInfoService;
import com.ruoyi.common.core.domain.R;
-import org.springframework.web.bind.annotation.*;
import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CoalQualityController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/CoalQualityController.java
new file mode 100644
index 0000000..29e6ac5
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/CoalQualityController.java
@@ -0,0 +1,54 @@
+package com.ruoyi.basic.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.CoalQualityDto;
+import com.ruoyi.basic.entity.CoalQuality;
+import com.ruoyi.basic.service.CoalQualityService;
+import com.ruoyi.common.core.domain.R;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 鐓よ川淇℃伅琛紝璁板綍鐓ょ偔璐ㄩ噺妫�娴嬬浉鍏虫暟鎹� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author ruoyi
+ * @since 2025-06-03
+ */
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basic/coalQuality")
+public class CoalQualityController {
+
+ private CoalQualityService coalQualityService;
+
+ /**
+ * 鏌ヨ
+ */
+ @GetMapping("/list")
+ public R<IPage<CoalQuality>> list(Page page, CoalQualityDto coalQualityDto) {
+ IPage<CoalQuality> list = coalQualityService.selectCoalQualityList(page,coalQualityDto);
+ return R.ok(list);
+ }
+
+ /**
+ * 鏂板淇敼
+ */
+ @PostMapping("/addOrEditCoalQuality")
+ public R addOrEditCoalQuality(@RequestBody CoalQualityDto coalQualityDto) {
+ return R.ok(coalQualityService.addOrEditCoalQuality(coalQualityDto));
+ }
+
+ /**
+ * 鍒犻櫎
+ */
+ @DeleteMapping("/delSupply")
+ public R remove(@RequestBody Long[] ids) {
+ return R.ok(coalQualityService.delCoalQualityByIds(ids));
+ }
+
+
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java
index 700cbb4..2f6591f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/SupplyController.java
@@ -6,10 +6,8 @@
import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.service.SupplyService;
import com.ruoyi.common.core.domain.R;
-import org.springframework.web.bind.annotation.*;
import lombok.AllArgsConstructor;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/CoalQualityDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/CoalQualityDto.java
new file mode 100644
index 0000000..ea6ff9a
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/CoalQualityDto.java
@@ -0,0 +1,8 @@
+package com.ruoyi.basic.dto;
+
+import com.ruoyi.basic.entity.CoalQuality;
+import lombok.Data;
+
+@Data
+public class CoalQualityDto extends CoalQuality {
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/entity/CoalQuality.java b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalQuality.java
new file mode 100644
index 0000000..b3c1fd5
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/entity/CoalQuality.java
@@ -0,0 +1,79 @@
+package com.ruoyi.basic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.MyBaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 鐓よ川淇℃伅琛紝璁板綍鐓ょ偔璐ㄩ噺妫�娴嬬浉鍏虫暟鎹� 瀹炰綋绫�
+ *
+ * @author ruoyi
+ * @date 2025-06-03
+ */
+@Data
+@TableName("coal_quality")
+public class CoalQuality extends MyBaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ /**
+ * 鐓ょ绫诲瀷id
+ */
+ @TableField(value = "coal_id")
+ private Long coalId;
+ /**
+ * 鐓ょ绫诲瀷
+ */
+ @TableField(value = "coal")
+ private String coal;
+ /**
+ * 鍏ㄦ按鍚噺鐧惧垎姣� (%)
+ */
+ @TableField(value = "total_moisture")
+ private BigDecimal totalMoisture;
+ /**
+ * 鍒嗘瀽姘村惈閲忕櫨鍒嗘瘮 (%)
+ */
+ @TableField(value = "analysis_moisture")
+ private BigDecimal analysisMoisture;
+ /**
+ * 鎸ュ彂鍒嗙櫨鍒嗘瘮 (%)
+ */
+ @TableField(value = "volatile_matter")
+ private BigDecimal volatileMatter;
+ /**
+ * 鍥哄畾纰崇櫨鍒嗘瘮 (%)
+ */
+ @TableField(value = "fixed_carbon")
+ private BigDecimal fixedCarbon;
+ /**
+ * 浣庝綅鍙戠儹閲忥紙鍗曚綅锛氬崈鍗�/鍗冨厠锛�
+ */
+ @TableField(value = "lower_heat_value")
+ private BigDecimal lowerHeatValue;
+ /**
+ * 楂樹綅鍙戠儹閲忥紙鍗曚綅锛氬崈鍗�/鍗冨厠锛�
+ */
+ @TableField(value = "higher_heat_value")
+ private BigDecimal higherHeatValue;
+ /**
+ * 鐏板垎鐧惧垎姣� (%)
+ */
+ @TableField(value = "ash_content")
+ private BigDecimal ashContent;
+ /**
+ * 纭惈閲忕櫨鍒嗘瘮 (%)
+ */
+ @TableField(value = "sulfur_content")
+ private BigDecimal sulfurContent;
+}
\ No newline at end of file
diff --git a/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java b/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java
index f174c36..1cb47fa 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/entity/Supply.java
@@ -60,15 +60,31 @@
* 渚涘簲鍟嗘墍鍦ㄧ渷浠界殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0
*/
@TableField(value = "province_id")
- private Long provinceId;
+ private Long BProvinceId;
/**
* 渚涘簲鍟嗘墍鍦ㄥ煄甯傜殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0
*/
@TableField(value = "city_id")
- private Long cityId;
+ private Long BCityId;
/**
* 渚涘簲鍟嗘墍鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎
*/
@TableField(value = "district_id")
- private Long districtId;
+ private Long BDistrictId;
+
+ /**
+ * 鑱旂郴鍦板潃 鐪佷唤鐨処D
+ */
+ @TableField(value = "province_id")
+ private Long CProvinceId;
+ /**
+ * 鑱旂郴鍦板潃鎵�鍦ㄥ煄甯傜殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0
+ */
+ @TableField(value = "city_id")
+ private Long CCityId;
+ /**
+ * 鑱旂郴鍦板潃鎵�鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎
+ */
+ @TableField(value = "district_id")
+ private Long CDistrictId;
}
\ No newline at end of file
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/CoalQualityMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/CoalQualityMapper.java
new file mode 100644
index 0000000..2c973f4
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/CoalQualityMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.basic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.basic.entity.CoalQuality;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 鐓よ川淇℃伅琛紝璁板綍鐓ょ偔璐ㄩ噺妫�娴嬬浉鍏虫暟鎹� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author ruoyi
+ * @since 2025-06-03
+ */
+@Mapper
+public interface CoalQualityMapper extends BaseMapper<CoalQuality> {
+
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/CoalInfoService.java b/basic-server/src/main/java/com/ruoyi/basic/service/CoalInfoService.java
index 495de1a..a1a1439 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/CoalInfoService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/CoalInfoService.java
@@ -2,9 +2,9 @@
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.basic.dto.CoalInfoDto;
import com.ruoyi.basic.entity.CoalInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/CoalQualityService.java b/basic-server/src/main/java/com/ruoyi/basic/service/CoalQualityService.java
new file mode 100644
index 0000000..4988504
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/CoalQualityService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.basic.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.CoalQualityDto;
+import com.ruoyi.basic.entity.CoalQuality;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鐓よ川淇℃伅琛紝璁板綍鐓ょ偔璐ㄩ噺妫�娴嬬浉鍏虫暟鎹� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author ruoyi
+ * @since 2025-06-03
+ */
+public interface CoalQualityService extends IService<CoalQuality> {
+
+ IPage<CoalQuality> selectCoalQualityList(Page page, CoalQualityDto coalQualityDto);
+
+ int addOrEditCoalQuality(CoalQualityDto coalQualityDto);
+
+ int delCoalQualityByIds(Long[] ids);
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/CustomerService.java b/basic-server/src/main/java/com/ruoyi/basic/service/CustomerService.java
index c7c2a2e..3d3985b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/CustomerService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/CustomerService.java
@@ -1,7 +1,7 @@
package com.ruoyi.basic.service;
-import com.ruoyi.basic.entity.Customer;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.basic.entity.Customer;
/**
* <p>
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java b/basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java
index bb36ad7..5165bde 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/SupplyService.java
@@ -2,11 +2,9 @@
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.basic.dto.SupplyDto;
import com.ruoyi.basic.entity.Supply;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
/**
* <p>
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java
index 8b31c3a..9f0a72f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalInfoServiceImpl.java
@@ -4,16 +4,14 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.CoalInfoDto;
import com.ruoyi.basic.entity.CoalInfo;
-import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.mapper.CoalInfoMapper;
import com.ruoyi.basic.service.CoalInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.bean.BeanUtils;
-import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
-import org.springframework.util.StringUtils;
+import org.springframework.stereotype.Service;
import java.util.Objects;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalQualityServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalQualityServiceImpl.java
new file mode 100644
index 0000000..25ba17b
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CoalQualityServiceImpl.java
@@ -0,0 +1,63 @@
+package com.ruoyi.basic.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.CoalQualityDto;
+import com.ruoyi.basic.entity.CoalQuality;
+import com.ruoyi.basic.mapper.CoalQualityMapper;
+import com.ruoyi.basic.service.CoalQualityService;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ * 鐓よ川淇℃伅琛紝璁板綍鐓ょ偔璐ㄩ噺妫�娴嬬浉鍏虫暟鎹� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author ruoyi
+ * @since 2025-06-03
+ */
+@Service
+@RequiredArgsConstructor
+public class CoalQualityServiceImpl extends ServiceImpl<CoalQualityMapper, CoalQuality> implements CoalQualityService {
+
+ private final CoalQualityMapper coalQualityMapper;
+
+ @Override
+ public IPage<CoalQuality> selectCoalQualityList(Page page, CoalQualityDto coalQualityDto) {
+ LambdaQueryWrapper<CoalQuality> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.orderByDesc(CoalQuality::getCreateTime);
+ return coalQualityMapper.selectPage(page, queryWrapper);
+ }
+
+ @Override
+ public int addOrEditCoalQuality(CoalQualityDto coalQualityDto) {
+ CoalQuality coalQuality = new CoalQuality();
+ BeanUtils.copyProperties(coalQualityDto, coalQuality);
+ if (Objects.isNull(coalQualityDto.getId())) {
+ return coalQualityMapper.insert(coalQuality);
+ } else {
+ return coalQualityMapper.updateById(coalQuality);
+ }
+ }
+
+ @Override
+ public int delCoalQualityByIds(Long[] ids) {
+ // 妫�鏌ュ弬鏁�
+ if (ids == null || ids.length == 0) {
+ return 0;
+ }
+ // 鏋勯�犳洿鏂版潯浠�
+ UpdateWrapper<CoalQuality> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.in("id", ids)
+ .set("deleted", 1); // 璁剧疆 deleted 涓� 1 琛ㄧず宸插垹闄�
+ // 鎵ц鎵归噺閫昏緫鍒犻櫎
+ return coalQualityMapper.update(null, updateWrapper);
+ }
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index 87042cf..dc873b3 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -1,22 +1,22 @@
package com.ruoyi.basic.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.entity.Customer;
import com.ruoyi.basic.mapper.CustomerMapper;
- import com.ruoyi.basic.service.CustomerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
+import com.ruoyi.basic.service.CustomerService;
import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
/**
-* <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
-*
-* @author ruoyi
-* @since 2025-06-03
-*/
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author ruoyi
+ * @since 2025-06-03
+ */
@Service
@RequiredArgsConstructor
- public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements CustomerService {
+public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements CustomerService {
- }
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
index d3ee17e..b885fe7 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java
@@ -4,17 +4,16 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.SupplyDto;
import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.mapper.SupplyMapper;
import com.ruoyi.basic.service.SupplyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.bean.BeanUtils;
-import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
-import java.util.List;
import java.util.Objects;
/**
diff --git a/basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql b/basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql
index a4f4916..314bed4 100644
--- a/basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql
+++ b/basic-server/src/main/resources/db/migration/postgresql/V20250530152701__create_table_supply.sql
@@ -10,9 +10,12 @@
bank_name VARCHAR(255) NOT NULL DEFAULT '', -- 寮�鎴疯
contact_person VARCHAR(255) NOT NULL DEFAULT '', -- 鑱旂郴浜�
contact_address VARCHAR(255) NOT NULL DEFAULT '', -- 鑱旂郴鍦板潃
- province_id BIGINT NOT NULL DEFAULT 0,
- city_id BIGINT NOT NULL DEFAULT 0,
- district_id BIGINT NOT NULL DEFAULT 0,
+ b_province_id BIGINT NOT NULL DEFAULT 0, -- 缁忚惀鍦板潃鐪乮d
+ b_city_id BIGINT NOT NULL DEFAULT 0, -- 缁忚惀鍦板潃甯俰d
+ b_district_id BIGINT NOT NULL DEFAULT 0, -- 缁忚惀鍦板潃鍖篿d
+ c_province_id BIGINT NOT NULL DEFAULT 0, -- 鑱旂郴鍦板潃鐪乮d
+ c_city_id BIGINT NOT NULL DEFAULT 0, -- 鑱旂郴鍦板潃甯俰d
+ c_district_id BIGINT NOT NULL DEFAULT 0, -- 鑱旂郴鍦板潃鍖篿d
deleted int4 NOT NULL DEFAULT 0, -- 鏄惁鍒犻櫎锛堣蒋鍒犻櫎鏍囧織锛�
create_by VARCHAR(255), -- 鍒涘缓浜�
create_time TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, -- 鍒涘缓鏃堕棿锛岄粯璁ゅ綋鍓嶆椂闂�
@@ -48,13 +51,13 @@
COMMENT ON COLUMN supply.contact_address IS '渚涘簲鍟嗚仈绯讳汉鐨勮仈绯诲湴鍧�';
-- 鐪佷唤ID锛堥粯璁�0锛岄潪绌猴紝鍏宠仈鍦板潃瀛楀吀锛�
-COMMENT ON COLUMN supply.province_id IS '渚涘簲鍟嗘墍鍦ㄧ渷浠界殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0';
+COMMENT ON COLUMN supply.b_province_id IS '渚涘簲鍟嗘墍鍦ㄧ渷浠界殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0';
-- 鍩庡競ID锛堥粯璁�0锛岄潪绌猴紝鍏宠仈鍦板潃瀛楀吀锛�
-COMMENT ON COLUMN supply.city_id IS '渚涘簲鍟嗘墍鍦ㄥ煄甯傜殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0';
+COMMENT ON COLUMN supply.b_city_id IS '渚涘簲鍟嗘墍鍦ㄥ煄甯傜殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0';
-- 鍖哄幙ID锛堥粯璁�0锛岄潪绌猴紝鍏宠仈鍦板潃瀛楀吀锛�
-COMMENT ON COLUMN supply.district_id IS '渚涘簲鍟嗘墍鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎';
+COMMENT ON COLUMN supply.b_district_id IS '渚涘簲鍟嗘墍鍦ㄥ尯鍘跨殑ID锛堝叧鑱斿湴鍧�瀛楀吀琛級锛岄粯璁�0锛岀敤浜庡湴鍧�灞傜骇鍒掑垎';
COMMENT ON COLUMN supply.deleted IS '杞垹闄ゆ爣蹇楋紝true琛ㄧず宸插垹闄�';
COMMENT ON COLUMN supply.create_by IS '鍒涘缓浜虹敤鎴峰悕';
diff --git a/ruoyi-common/src/main/resources/db/migration/postgresql/V20250530171701__create_table_customer.sql b/basic-server/src/main/resources/db/migration/postgresql/V20250530171701__create_table_customer.sql
similarity index 100%
rename from ruoyi-common/src/main/resources/db/migration/postgresql/V20250530171701__create_table_customer.sql
rename to basic-server/src/main/resources/db/migration/postgresql/V20250530171701__create_table_customer.sql
diff --git a/basic-server/src/main/resources/db/migration/postgresql/V20250603151801__create_table_coal_quality.sql b/basic-server/src/main/resources/db/migration/postgresql/V20250603151801__create_table_coal_quality.sql
new file mode 100644
index 0000000..7ba1669
--- /dev/null
+++ b/basic-server/src/main/resources/db/migration/postgresql/V20250603151801__create_table_coal_quality.sql
@@ -0,0 +1,44 @@
+-- 鍒涘缓鐓よ川淇℃伅琛�
+CREATE TABLE coal_quality
+(
+ id BIGSERIAL PRIMARY KEY, -- 涓婚敭ID锛岃嚜鍔ㄩ�掑
+
+ coal_id bigint DEFAULT 0 NOT NULL,
+ coal VARCHAR(255) NOT NULL, -- 鐓ょ绫诲瀷锛屼笉鍏佽涓虹┖
+
+ total_moisture DECIMAL(10, 2), -- 鍏ㄦ按鍚噺 (%)
+ analysis_moisture DECIMAL(10, 2), -- 鍒嗘瀽姘村惈閲� (%)
+ volatile_matter DECIMAL(10, 2), -- 鎸ュ彂鍒� (%)
+ fixed_carbon DECIMAL(10, 2), -- 鍥哄畾纰� (%)
+ lower_heat_value DECIMAL(10, 2), -- 浣庝綅鍙戠儹閲� (kcal/kg)
+ higher_heat_value DECIMAL(10, 2), -- 楂樹綅鍙戠儹閲� (kcal/kg)
+ ash_content DECIMAL(10, 2), -- 鐏板垎 (%)
+ sulfur_content DECIMAL(10, 2), -- 纭惈閲� (%)
+
+ deleted INT NOT NULL DEFAULT 0, -- 杞垹闄ゆ爣蹇楋細0=鏈垹闄わ紝1=宸插垹闄�
+ create_by VARCHAR(255), -- 鍒涘缓浜虹敤鎴峰悕
+ create_time TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP, -- 鍒涘缓鏃堕棿锛岄粯璁ゅ綋鍓嶆椂闂�
+ update_by VARCHAR(255), -- 鏈�鍚庢洿鏂颁汉鐢ㄦ埛鍚�
+ update_time TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP -- 鏈�鍚庢洿鏂版椂闂达紝榛樿褰撳墠鏃堕棿
+);
+
+-- 琛ㄦ敞閲�
+COMMENT ON TABLE coal_quality IS '鐓よ川淇℃伅琛紝璁板綍鐓ょ偔璐ㄩ噺妫�娴嬬浉鍏虫暟鎹�';
+
+-- 瀛楁娉ㄩ噴
+COMMENT ON COLUMN coal_quality.id IS '涓婚敭ID';
+COMMENT ON COLUMN coal_quality.coal_id IS '鐓ょ绫诲瀷id';
+COMMENT ON COLUMN coal_quality.coal IS '鐓ょ绫诲瀷';
+COMMENT ON COLUMN coal_quality.total_moisture IS '鍏ㄦ按鍚噺鐧惧垎姣� (%)';
+COMMENT ON COLUMN coal_quality.analysis_moisture IS '鍒嗘瀽姘村惈閲忕櫨鍒嗘瘮 (%)';
+COMMENT ON COLUMN coal_quality.volatile_matter IS '鎸ュ彂鍒嗙櫨鍒嗘瘮 (%)';
+COMMENT ON COLUMN coal_quality.fixed_carbon IS '鍥哄畾纰崇櫨鍒嗘瘮 (%)';
+COMMENT ON COLUMN coal_quality.lower_heat_value IS '浣庝綅鍙戠儹閲忥紙鍗曚綅锛氬崈鍗�/鍗冨厠锛�';
+COMMENT ON COLUMN coal_quality.higher_heat_value IS '楂樹綅鍙戠儹閲忥紙鍗曚綅锛氬崈鍗�/鍗冨厠锛�';
+COMMENT ON COLUMN coal_quality.ash_content IS '鐏板垎鐧惧垎姣� (%)';
+COMMENT ON COLUMN coal_quality.sulfur_content IS '纭惈閲忕櫨鍒嗘瘮 (%)';
+COMMENT ON COLUMN coal_quality.deleted IS '杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�';
+COMMENT ON COLUMN coal_quality.create_by IS '鍒涘缓璇ヨ褰曠殑鐢ㄦ埛';
+COMMENT ON COLUMN coal_quality.create_time IS '璁板綍鍒涘缓鏃堕棿';
+COMMENT ON COLUMN coal_quality.update_by IS '鏈�鍚庝慨鏀硅璁板綍鐨勭敤鎴�';
+COMMENT ON COLUMN coal_quality.update_time IS '璁板綍鏈�鍚庢洿鏂版椂闂�';
\ No newline at end of file
diff --git a/basic-server/src/main/resources/mapper/CoalQualityMapper.xml b/basic-server/src/main/resources/mapper/CoalQualityMapper.xml
new file mode 100644
index 0000000..8b9da03
--- /dev/null
+++ b/basic-server/src/main/resources/mapper/CoalQualityMapper.xml
@@ -0,0 +1,35 @@
+<?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.basic.mapper.CoalQualityMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.entity.CoalQuality">
+ <id column="id" property="id" />
+ <result column="deleted" property="deleted" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="coal_id" property="coalId" />
+ <result column="coal" property="coal" />
+ <result column="total_moisture" property="totalMoisture" />
+ <result column="analysis_moisture" property="analysisMoisture" />
+ <result column="volatile_matter" property="volatileMatter" />
+ <result column="fixed_carbon" property="fixedCarbon" />
+ <result column="lower_heat_value" property="lowerHeatValue" />
+ <result column="higher_heat_value" property="higherHeatValue" />
+ <result column="ash_content" property="ashContent" />
+ <result column="sulfur_content" property="sulfurContent" />
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ deleted,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ id, coal_id, coal, total_moisture, analysis_moisture, volatile_matter, fixed_carbon, lower_heat_value, higher_heat_value, ash_content, sulfur_content
+ </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/basic-server/src/main/resources/mapper/SupplyMapper.xml b/basic-server/src/main/resources/mapper/SupplyMapper.xml
index 13ba9a6..f81032b 100644
--- a/basic-server/src/main/resources/mapper/SupplyMapper.xml
+++ b/basic-server/src/main/resources/mapper/SupplyMapper.xml
@@ -17,9 +17,12 @@
<result column="bank_name" property="bankName" />
<result column="contact_person" property="contactPerson" />
<result column="contact_address" property="contactAddress" />
- <result column="province_id" property="provinceId" />
- <result column="city_id" property="cityId" />
- <result column="district_id" property="districtId" />
+ <result column="b_province_id" property="BProvinceId" />
+ <result column="b_city_id" property="BCityId" />
+ <result column="b_district_id" property="BDistrictId" />
+ <result column="c_province_id" property="CProvinceId" />
+ <result column="c_city_id" property="CCityId" />
+ <result column="c_district_id" property="CDistrictId" />
</resultMap>
<!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
--
Gitblit v1.9.3