From 1a3ea4d4c4f4445f73bf7641b8353ebd0563ae0b Mon Sep 17 00:00:00 2001 From: itcast Date: Tue, 14 Oct 2025 22:22:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=B1=BB=E5=9E=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=89=B9=E5=BE=81=E5=80=BC?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=BF=98=E6=9C=89=E9=83=A8=E5=88=86=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentPropertyController.java | 4 +- .../mapper/EquipmentPropertyMapper.java | 11 ++--- .../service/EquipmentPropertyService.java | 2 +- .../impl/EquipmentPropertyServiceImpl.java | 2 +- .../devConfig/EquipmentPropertyMapper.xml | 40 +++++++++++-------- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java index e6f72bb..92782a7 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java @@ -14,7 +14,7 @@ import java.util.List; * 装备特征值管理 */ @RestController -@RequestMapping("/equipment/type/property") +@RequestMapping("/equipment/property") public class EquipmentPropertyController { @Autowired @@ -96,7 +96,7 @@ public class EquipmentPropertyController { * 删除特征值 */ @DeleteMapping("/{id}") - public AjaxResult delete(@PathVariable Integer id) { + public AjaxResult delete(@PathVariable Long id) { equipmentPropertyService.delete(id); return AjaxResult.success(); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java index 6dc71c3..b15222b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java @@ -4,26 +4,27 @@ import com.bonus.material.devConfig.domain.EquipmentProperty; import com.bonus.material.devConfig.domain.EquipmentPropertyDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface EquipmentPropertyMapper { - void deleteById(Integer id); + void deleteById(@Param("id") Long id); void update(EquipmentProperty equipmentProperty); void insert(EquipmentProperty equipmentProperty); - List selectByTypeId(Long typeId); + List selectByTypeId(@Param("typeId") Long typeId); - EquipmentProperty selectById(Long id); + EquipmentProperty selectById(@Param("typeId") Long id); List selectAll(); // 新增关联查询方法 - List selectTypeWithProperties(Long typeId); + List selectTypeWithProperties(@Param("typeId") Long typeId); List selectAllTypesWithProperties(); - EquipmentPropertyDTO selectTypeDetailWithProperties(Long typeId); + EquipmentPropertyDTO selectTypeDetailWithProperties(@Param("typeId") Long typeId); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/EquipmentPropertyService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/EquipmentPropertyService.java index 6c0dab9..aed53b4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/EquipmentPropertyService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/EquipmentPropertyService.java @@ -16,7 +16,7 @@ public interface EquipmentPropertyService { void update(EquipmentProperty equipmentProperty); - void delete(Integer id); + void delete(Long id); List getTypeWithProperties(Long typeId); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java index 5417ed5..72b83ea 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java @@ -49,7 +49,7 @@ public class EquipmentPropertyServiceImpl implements EquipmentPropertyService { } @Override - public void delete(Integer id) { + public void delete(Long id) { equipmentPropertyMapper.deleteById(id); } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml index 10e821e..efe8c8a 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml @@ -68,22 +68,30 @@ - SELECT id, type_id, must_have, input_type, property_name, property_value, create_time - FROM equipment_property + FROM ma_type_properties WHERE id = #{id} - SELECT id, type_id, must_have, input_type, property_name, property_value, create_time - FROM equipment_property + FROM ma_type_properties WHERE type_id = #{typeId} ORDER BY create_time DESC @@ -104,8 +112,8 @@ ep.property_name, ep.property_value, ep.create_time as property_create_time - FROM equipment_type et - LEFT JOIN equipment_property ep ON et.type_id = ep.type_id + FROM ma_type et + LEFT JOIN ma_type_propertis ep ON et.type_id = ep.type_id WHERE et.type_id = #{typeId} ORDER BY ep.create_time DESC @@ -126,8 +134,8 @@ ep.property_name, ep.property_value, ep.create_time as property_create_time - FROM equipment_type et - LEFT JOIN equipment_property ep ON et.type_id = ep.type_id + FROM ma_type et + LEFT JOIN ma_type_properties ep ON et.type_id = ep.type_id WHERE et.status = '0' ORDER BY et.type_id, ep.create_time DESC @@ -149,8 +157,8 @@ ep.property_name, ep.property_value, ep.create_time - FROM equipment_type et - LEFT JOIN equipment_property ep ON et.type_id = ep.type_id + FROM ma_type et + LEFT JOIN ma_type_properties ep ON et.type_id = ep.type_id WHERE et.type_id = #{typeId} ORDER BY ep.create_time DESC @@ -158,7 +166,7 @@ - INSERT INTO equipment_property ( + INSERT INTO ma_type_properties ( type_id, must_have, input_type, @@ -177,7 +185,7 @@ - UPDATE equipment_property + UPDATE ma_type_properties type_id = #{typeId}, must_have = #{mustHave}, @@ -189,8 +197,8 @@ - - DELETE FROM equipment_property + + DELETE FROM ma_type_properties WHERE id = #{id}