diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesMultiClassifyController.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesMultiClassifyController.java new file mode 100644 index 0000000..c73d5a2 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesMultiClassifyController.java @@ -0,0 +1,108 @@ +package com.bonus.web.controller.tool; + +import com.bonus.common.annotation.RequiresPermissions; +import com.bonus.common.annotation.SysLog; +import com.bonus.common.core.controller.BaseController; +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.page.TableDataInfo; +import com.bonus.common.enums.OperaType; +import com.bonus.common.utils.DateUtils; +import com.bonus.system.domain.KyDataClassify; +import com.bonus.system.domain.KyFilesMultiClassify; +import com.bonus.system.service.FilesMultiClassifyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 档案多维度分类管理 + * @author 马三炮 + * @date 2025/9/11 + */ +@RestController +@RequestMapping("/files/multi") +@Slf4j +public class FilesMultiClassifyController extends BaseController { + + @Resource + private FilesMultiClassifyService filesMultiClassifyService; + + /** + * 获取档案多维度分类管理列表 + * @param kyFilesMultiClassify + * @return + */ + @SysLog(title = "档案多维度分类管理", businessType = OperaType.QUERY, module = "档案多维度分类管理->获取档案多维度分类管理列表", details = "获取档案多维度分类管理列表") + @RequiresPermissions("data:classify:list") + @GetMapping("/getKyFilesMultiClassifyList") + public TableDataInfo list(KyFilesMultiClassify kyFilesMultiClassify) + { + startPage(); + List list = filesMultiClassifyService.selectKyFilesMultiClassifyList(kyFilesMultiClassify); + return getDataTable(list); + } + + /** + * 新增档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + @SysLog(title = "档案多维度分类管理", businessType = OperaType.QUERY, module = "档案多维度分类管理->新增档案多维度分类管理", details = "新增档案多维度分类管理") + @RequiresPermissions("data:classify:add") + @GetMapping("/addKyFilesMultiClassify") + public AjaxResult addKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify) + { + + kyFilesMultiClassify.setCreateUserId(getUserId()); + kyFilesMultiClassify.setCreateUserName(getUsername()); + kyFilesMultiClassify.setCreateTime(DateUtils.getNowDate()); + kyFilesMultiClassify.setUpdateUserId(getUserId()); + kyFilesMultiClassify.setUpdateUserName(getUsername()); + kyFilesMultiClassify.setUpdateTime(DateUtils.getNowDate()); + int res = filesMultiClassifyService.addKyFilesMultiClassify(kyFilesMultiClassify); + if (res==1){ + return toAjax(res); + }else { + return error("分类名称已存在"); + } + } + + /** + * 修改档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + @SysLog(title = "档案多维度分类管理", businessType = OperaType.QUERY, module = "档案多维度分类管理->新增档案多维度分类管理", details = "新增档案多维度分类管理") + @RequiresPermissions("data:classify:update") + @GetMapping("/updateKyFilesMultiClassify") + public AjaxResult updateKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify) + { + kyFilesMultiClassify.setUpdateUserId(getUserId()); + kyFilesMultiClassify.setUpdateUserName(getUsername()); + kyFilesMultiClassify.setUpdateTime(DateUtils.getNowDate()); + int res = filesMultiClassifyService.updateKyFilesMultiClassify(kyFilesMultiClassify); + if (res==1){ + return toAjax(res); + }else { + return error("分类名称已存在"); + } + } + + /** + * 删除档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + @SysLog(title = "档案多维度分类管理", businessType = OperaType.QUERY, module = "档案多维度分类管理->删除档案多维度分类管理", details = "删除档案多维度分类管理") + @RequiresPermissions("data:classify:del") + @GetMapping("/delKyFilesMultiClassify") + public AjaxResult delKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify) + { + return toAjax(filesMultiClassifyService.delKyFilesMultiClassify(kyFilesMultiClassify)); + } + +} diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/KyDataClassifyController.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/KyDataClassifyController.java index 52c20e9..72d9c71 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/tool/KyDataClassifyController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/KyDataClassifyController.java @@ -69,7 +69,13 @@ public class KyDataClassifyController extends BaseController { kyDataClassify.setUpdateUserId(getUserId()); kyDataClassify.setUpdateUserName(getUsername()); kyDataClassify.setUpdateTime(DateUtils.getNowDate()); - return toAjax(kyDataClassifyService.addKyDataClassify(kyDataClassify)); + int res = kyDataClassifyService.addKyDataClassify(kyDataClassify); + if (res==1){ + return toAjax(res); + }else { + return error("数据类型名称已存在"); + } + } /** diff --git a/bonus-system/src/main/java/com/bonus/system/domain/KyDataClassify.java b/bonus-system/src/main/java/com/bonus/system/domain/KyDataClassify.java index 256ab05..01c6c6b 100644 --- a/bonus-system/src/main/java/com/bonus/system/domain/KyDataClassify.java +++ b/bonus-system/src/main/java/com/bonus/system/domain/KyDataClassify.java @@ -84,11 +84,12 @@ public class KyDataClassify { this.dataTypeName = dataTypeName; } + @Size(min = 0, max = 255, message = "备注不能超过255个字符") public String getRemark() { return remark; } - @Size(min = 0, max = 255, message = "备注不能超过255个字符") + public void setRemark(String remark) { this.remark = remark; } diff --git a/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java index c8f7b52..11f196b 100644 --- a/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java +++ b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesMultiClassify.java @@ -26,6 +26,11 @@ public class KyFilesMultiClassify { */ private String dimension; + + /** + * 维度（字典表配置） + */ + private String dictLabel; /** * 分类描述 */ diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataMapper.java index 70ae43e..f2337ab 100644 --- a/bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataMapper.java +++ b/bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataMapper.java @@ -5,5 +5,10 @@ import com.bonus.system.domain.KyDataCollectData; import java.util.List; public interface DataCollectDataMapper { + /** + * 根据数据类型数据汇集管理列表 + * @param kyDataCollectData + * @return + */ List selectKyDataCollectDataList(KyDataCollectData kyDataCollectData); } diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/FilesMultiClassifyMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/FilesMultiClassifyMapper.java new file mode 100644 index 0000000..15ea3e6 --- /dev/null +++ b/bonus-system/src/main/java/com/bonus/system/mapper/FilesMultiClassifyMapper.java @@ -0,0 +1,44 @@ +package com.bonus.system.mapper; + + +import com.bonus.system.domain.KyFilesMultiClassify; + +import java.util.List; + +public interface FilesMultiClassifyMapper { + + /** + * 获取档案多维度分类管理列表 + * @param kyFilesMultiClassify + * @return + */ + List selectKyFilesMultiClassifyList(KyFilesMultiClassify kyFilesMultiClassify); + + /** + * 新增档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + int addKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify); + + /** + * 根据名称查询档案多维度分类 + * @param kyFilesMultiClassify + * @return + */ + KyFilesMultiClassify getKyFilesMultiClassifyByClassifyName(KyFilesMultiClassify kyFilesMultiClassify); + + /** + * 修改档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + int updateKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify); + + /** + * 删除档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + int delKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify); +} diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java index 4d6cb2b..2221c63 100644 --- a/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java +++ b/bonus-system/src/main/java/com/bonus/system/mapper/KyDataClassifyMapper.java @@ -40,4 +40,11 @@ public interface KyDataClassifyMapper { * @return */ List listAll(KyDataClassify kyDataClassify); + + /** + * 根据名称查看数据 + * @param kyDataClassify + * @return + */ + KyDataClassify selectKyDataClassifyByDataTypeName(KyDataClassify kyDataClassify); } diff --git a/bonus-system/src/main/java/com/bonus/system/service/DataCollectDataService.java b/bonus-system/src/main/java/com/bonus/system/service/DataCollectDataService.java index 5848a88..1473ad4 100644 --- a/bonus-system/src/main/java/com/bonus/system/service/DataCollectDataService.java +++ b/bonus-system/src/main/java/com/bonus/system/service/DataCollectDataService.java @@ -5,5 +5,10 @@ import com.bonus.system.domain.KyDataCollectData; import java.util.List; public interface DataCollectDataService { + /** + * 根据数据类型数据汇集管理列表 + * @param kyDataCollectData + * @return + */ List selectKyDataCollectDataList(KyDataCollectData kyDataCollectData); } diff --git a/bonus-system/src/main/java/com/bonus/system/service/FilesMultiClassifyService.java b/bonus-system/src/main/java/com/bonus/system/service/FilesMultiClassifyService.java new file mode 100644 index 0000000..f63b049 --- /dev/null +++ b/bonus-system/src/main/java/com/bonus/system/service/FilesMultiClassifyService.java @@ -0,0 +1,36 @@ +package com.bonus.system.service; + +import com.bonus.system.domain.KyDataClassify; +import com.bonus.system.domain.KyFilesMultiClassify; + +import java.util.List; + +public interface FilesMultiClassifyService { + /** + * 获取档案多维度分类管理列表 + * @param kyFilesMultiClassify + * @return + */ + List selectKyFilesMultiClassifyList(KyFilesMultiClassify kyFilesMultiClassify); + + /** + * 新增档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + int addKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify); + + /** + * 修改档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + int updateKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify); + + /** + * 删除档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + int delKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify); +} diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/DataCollectDataServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/DataCollectDataServiceImpl.java index 46aa230..e3a15b9 100644 --- a/bonus-system/src/main/java/com/bonus/system/service/impl/DataCollectDataServiceImpl.java +++ b/bonus-system/src/main/java/com/bonus/system/service/impl/DataCollectDataServiceImpl.java @@ -20,6 +20,11 @@ public class DataCollectDataServiceImpl implements DataCollectDataService { @Resource private DataCollectDataMapper dataCollectDataMapper; + /** + * 根据数据类型数据汇集管理列表 + * @param kyDataCollectData + * @return + */ @Override public List selectKyDataCollectDataList(KyDataCollectData kyDataCollectData) { return dataCollectDataMapper.selectKyDataCollectDataList(kyDataCollectData); diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/FilesMultiClassifyServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/FilesMultiClassifyServiceImpl.java new file mode 100644 index 0000000..b8f8267 --- /dev/null +++ b/bonus-system/src/main/java/com/bonus/system/service/impl/FilesMultiClassifyServiceImpl.java @@ -0,0 +1,74 @@ +package com.bonus.system.service.impl; + +import com.bonus.common.utils.StringUtils; +import com.bonus.system.domain.KyDataClassify; +import com.bonus.system.domain.KyFilesMultiClassify; +import com.bonus.system.mapper.FilesMultiClassifyMapper; +import com.bonus.system.service.FilesMultiClassifyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/9/11 + */ +@Service +@Slf4j +public class FilesMultiClassifyServiceImpl implements FilesMultiClassifyService { + + @Resource + private FilesMultiClassifyMapper filesMultiClassifyMapper; + + /** + * 获取档案多维度分类管理列表 + * @param kyFilesMultiClassify + * @return + */ + @Override + public List selectKyFilesMultiClassifyList(KyFilesMultiClassify kyFilesMultiClassify) { + return filesMultiClassifyMapper.selectKyFilesMultiClassifyList(kyFilesMultiClassify); + } + + /** + * 新增档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + @Override + public int addKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify) { + //查看分类名称是否存在 + KyFilesMultiClassify kyFilesMultiClassifyOld = filesMultiClassifyMapper.getKyFilesMultiClassifyByClassifyName(kyFilesMultiClassify); + if (StringUtils.isNotNull(kyFilesMultiClassifyOld)){ + return 0; + } + return filesMultiClassifyMapper.addKyFilesMultiClassify(kyFilesMultiClassify); + } + + /** + * 修改档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + @Override + public int updateKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify) { + //查看分类名称是否存在 + KyFilesMultiClassify kyFilesMultiClassifyOld = filesMultiClassifyMapper.getKyFilesMultiClassifyByClassifyName(kyFilesMultiClassify); + if (StringUtils.isNotNull(kyFilesMultiClassifyOld) && !kyFilesMultiClassify.getId().equals(kyFilesMultiClassifyOld.getId())){ + return 0; + } + return filesMultiClassifyMapper.updateKyFilesMultiClassify(kyFilesMultiClassify); + } + + /** + * 删除档案多维度分类管理 + * @param kyFilesMultiClassify + * @return + */ + @Override + public int delKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify) { + return filesMultiClassifyMapper.delKyFilesMultiClassify(kyFilesMultiClassify); + } +} diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java index 380af4e..2467f04 100644 --- a/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java +++ b/bonus-system/src/main/java/com/bonus/system/service/impl/KyDataClassifyServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.system.service.impl; import com.bonus.common.core.domain.entity.SysUser; import com.bonus.common.utils.DateUtils; import com.bonus.common.utils.SecurityUtils; +import com.bonus.common.utils.StringUtils; import com.bonus.system.domain.KyDataClassify; import com.bonus.system.mapper.KyDataClassifyMapper; import com.bonus.system.service.KyDataClassifyService; @@ -40,6 +41,11 @@ public class KyDataClassifyServiceImpl implements KyDataClassifyService { */ @Override public int addKyDataClassify(KyDataClassify kyDataClassify) { + //判读数据名称是否存在 + KyDataClassify kyDataClassifyOld = kyDataClassifyMapper.selectKyDataClassifyByDataTypeName(kyDataClassify); + if (StringUtils.isNotNull(kyDataClassifyOld)){ + return 0; + } return kyDataClassifyMapper.addKyDataClassify(kyDataClassify); } diff --git a/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml b/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml new file mode 100644 index 0000000..19f3404 --- /dev/null +++ b/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml @@ -0,0 +1,57 @@ + + + + + insert into da_ky_data_classify + (classify_name,dimension,classify_desc,create_time,update_time,create_user_id,create_user_name,update_user_id,update_user_name) + values (#{classifyName},#{dimension},#{classifyDesc},#{createTime},#{updateTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName}) + + + update da_ky_files_multi_classify + + + classify_name =#{classifyName}, + + + dimension =#{dimension}, + + + classify_desc =#{classifyDesc}, + + + update_user_id =#{updateUserId}, + + + update_user_name =#{updateUserName}, + + + update_time =#{updateTime}, + + + where id = #{id} + + + update da_ky_files_multi_classify set del_flag='0' where id = #{id} + + + + + + diff --git a/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml b/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml index b33de85..90eaa04 100644 --- a/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/KyDataClassifyMapper.xml @@ -20,6 +20,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_user_name =#{updateUserName}, + + update_time =#{updateTime}, + + + remark =#{remark}, + where id = #{id} @@ -33,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and data_type_name LIKE CONCAT('%', #{dataTypeName}, '%') + order by create_time desc +