diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/DictController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/DictController.java index 3c21c54..2761a3c 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/DictController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/DictController.java @@ -9,6 +9,7 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.sql.DataTruncation; import java.util.List; @RestController @@ -86,4 +87,39 @@ public class DictController extends BaseController { } } + /** + * 删除字典 + * @param dictType + * @return + */ + @PostMapping("deleteDictType") + public Result deleteDictType(@RequestParam String dictType){ + Integer id; + Integer i1 = service.deleteDictType(dictType); + Integer i2 = service.deleteDictDatas(dictType); + if (i1>0&&i2>0){ + id = 1; + }else{ + id = 0; + } + if (id>0){ + return success("成功"); + }else{ + return error("失败"); + } + } + + /** + * 查看详情字典 + * @param dictType + * @return + */ + @PostMapping("selectDictType") + public Result selectDictType(@RequestParam String dictType){ + DictType type = service.selectDictType(dictType); + List list = service.selDictData(dictType); + type.setDictDataList(list); + return success(type); + } + } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/DictData.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/DictData.java index d31bebc..8cf760a 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/DictData.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/DictData.java @@ -7,7 +7,7 @@ public class DictData { /** * 字典编码 */ - private Long dictDode; + private Long dictCode; /** * 字典标签 */ diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/DictMapper.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/DictMapper.java index ca4099c..e12a0e1 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/DictMapper.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/DictMapper.java @@ -20,4 +20,12 @@ public interface DictMapper { Integer deleteDictData(DictData dictData); DictData selectDictData(DictData dictData); + + Integer updDictData(DictData dictData); + + Integer deleteDictType(@Param("dictType") String dictType); + + Integer deleteDictDatas(@Param("dictType") String dictType); + + DictType selectDictType(@Param("dictType") String dictType); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/DictService.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/DictService.java index 1af480d..a16a2a0 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/DictService.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/DictService.java @@ -17,4 +17,10 @@ public interface DictService { Integer deleteDictData(DictData dictData); DictData selectDictData(DictData dictData); + + Integer deleteDictType(String dictType); + + Integer deleteDictDatas(String dictType); + + DictType selectDictType(String dictType); } diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/DictServiceImpl.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/DictServiceImpl.java index 023e1f6..50bfecf 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/DictServiceImpl.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/DictServiceImpl.java @@ -42,7 +42,12 @@ public class DictServiceImpl implements DictService { @Override public Integer indexDictData(DictData dictData) { + if (dictData.getDictCode() == 0){ return mapper.indexDictData(dictData); + }else { + return mapper.updDictData(dictData); + } + } @Override @@ -54,4 +59,20 @@ public class DictServiceImpl implements DictService { public DictData selectDictData(DictData dictData) { return mapper.selectDictData(dictData); } + + @Override + public Integer deleteDictType(String dictType) { + return mapper.deleteDictType(dictType); + } + + @Override + public Integer deleteDictDatas(String dictType) { + return mapper.deleteDictDatas(dictType); + } + + @Override + public DictType selectDictType(String dictType) { + return mapper.selectDictType(dictType); + } + } diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/DictMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/DictMapper.xml index 2b56352..c1c6f51 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/DictMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/DictMapper.xml @@ -11,11 +11,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into dict_data (dict_label,dict_value,dict_type) values (#{dictLabel},#{dictValue},#{dictType}); + + update dict_data + set dict_label = #{dictLabel},dict_value=#{dictValue} + where dict_type = #{dictType} and dict_code = #{dictCode}; + delete from dict_data where dict_label = #{dictLabel} and dict_value = #{dictValue} and dict_type=#{dictType}; + + delete + from dict_type + where dict_type = #{dictType}; + + + delete + from dict_data + where dict_type = #{dictType}; + +