bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

装备类型配置页面，特征值设置还有部分未完成

This commit is contained in:
itcast 2025-10-14 22:22:03 +08:00
parent f55cd76970
commit 1a3ea4d4c4
5 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java
View File

@ -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();
}

11
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java
View File

@ -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<EquipmentProperty> selectByTypeId(Long typeId);
List<EquipmentProperty> selectByTypeId(@Param("typeId") Long typeId);
EquipmentProperty selectById(Long id);
EquipmentProperty selectById(@Param("typeId") Long id);
List<EquipmentProperty> selectAll();
// 新增关联查询方法
List<EquipmentPropertyDTO> selectTypeWithProperties(Long typeId);
List<EquipmentPropertyDTO> selectTypeWithProperties(@Param("typeId") Long typeId);
List<EquipmentPropertyDTO> selectAllTypesWithProperties();
EquipmentPropertyDTO selectTypeDetailWithProperties(Long typeId);
EquipmentPropertyDTO selectTypeDetailWithProperties(@Param("typeId") Long typeId);
}

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/EquipmentPropertyService.java
View File

@ -16,7 +16,7 @@ public interface EquipmentPropertyService {
void update(EquipmentProperty equipmentProperty);
void delete(Integer id);
void delete(Long id);
List<EquipmentPropertyDTO> getTypeWithProperties(Long typeId);

2
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java
View File

@ -49,7 +49,7 @@ public class EquipmentPropertyServiceImpl implements EquipmentPropertyService {
}
@Override
public void delete(Integer id) {
public void delete(Long id) {
equipmentPropertyMapper.deleteById(id);
}

40
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml
View File

@ -68,22 +68,30 @@
<!-- 查询所有特征值 -->
<select id="selectAll" resultMap="EquipmentPropertyResult">
SELECT id, type_id, must_have, input_type, property_name, property_value, create_time
FROM equipment_property
SELECT
MIN(id) as id,
'' as type_id,
must_have,
input_type,
property_name,
'' as property_value,
MAX(create_time) as create_time
FROM ma_type_properties
GROUP BY property_name
ORDER BY create_time DESC
</select>
<!-- 根据ID查询特征值 -->
<select id="selectById" parameterType="java.lang.Integer" resultMap="EquipmentPropertyResult">
<select id="selectById" resultMap="EquipmentPropertyResult">
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查询特征值 -->
<select id="selectByTypeId" parameterType="java.lang.Integer" resultMap="EquipmentPropertyResult">
<select id="selectByTypeId" resultMap="EquipmentPropertyResult">
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
</select>
@ -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
</select>
@ -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
</select>
@ -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
</select>
@ -158,7 +166,7 @@
<!-- 新增特征值 -->
<insert id="insert" parameterType="com.bonus.material.devConfig.domain.EquipmentProperty"
useGeneratedKeys="true" keyProperty="id">
INSERT INTO equipment_property (
INSERT INTO ma_type_properties (
type_id,
must_have,
input_type,
@ -177,7 +185,7 @@
<!-- 更新特征值 -->
<update id="update" parameterType="com.bonus.material.devConfig.domain.EquipmentProperty">
UPDATE equipment_property
UPDATE ma_type_properties
<set>
<if test="typeId != null">type_id = #{typeId},</if>
<if test="mustHave != null and mustHave != ''">must_have = #{mustHave},</if>
@ -189,8 +197,8 @@
</update>
<!-- 根据ID删除特征值 -->
<delete id="deleteById" parameterType="java.lang.Integer">
DELETE FROM equipment_property
<delete id="deleteById" >
DELETE FROM ma_type_properties
WHERE id = #{id}
</delete>