diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesCustomizeClassifyController.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesCustomizeClassifyController.java new file mode 100644 index 0000000..be33bd0 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/FilesCustomizeClassifyController.java @@ -0,0 +1,107 @@ +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.KyFilesCustomizeClassify; +import com.bonus.system.domain.KyFilesMultiClassify; +import com.bonus.system.service.FilesCustomizeClassifyService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 档案自定义分类 + * @author 马三炮 + * @date 2025/9/11 + */ +@RestController +@RequestMapping("/files/customize") +@Slf4j +public class FilesCustomizeClassifyController extends BaseController { + + @Resource + private FilesCustomizeClassifyService filesCustomizeClassifyService; + + /** + * 获取档案自定义分类管理列表 + * @param kyFilesCustomizeClassify + * @return + */ + @SysLog(title = "档案自定义分类管理", businessType = OperaType.QUERY, module = "档案自定义分类管理->获取档案自定义分类管理列表", details = "获取档案自定义分类管理列表") + @RequiresPermissions("files:customize:list") + @GetMapping("/getKyFilesCustomizeClassifyList") + public TableDataInfo getKyFilesCustomizeClassifyList(KyFilesCustomizeClassify kyFilesCustomizeClassify) + { + startPage(); + List list = filesCustomizeClassifyService.getKyFilesCustomizeClassifyList(kyFilesCustomizeClassify); + return getDataTable(list); + } + + /** + * 新增档案自定义分类管理 + * @param kyFilesCustomizeClassify + * @return + */ + @SysLog(title = "档案自定义分类管理", businessType = OperaType.QUERY, module = "档案自定义分类管理->新增档案自定义分类管理", details = "新增档案自定义分类管理") + @RequiresPermissions("files:customize:add") + @PostMapping("/addKyFilesCustomizeClassify") + public AjaxResult addKyFilesCustomizeClassify(@Validated @RequestBody KyFilesCustomizeClassify kyFilesCustomizeClassify) + { + + kyFilesCustomizeClassify.setCreateUserId(getUserId()); + kyFilesCustomizeClassify.setCreateUserName(getUsername()); + kyFilesCustomizeClassify.setCreateTime(DateUtils.getNowDate()); + kyFilesCustomizeClassify.setUpdateUserId(getUserId()); + kyFilesCustomizeClassify.setUpdateUserName(getUsername()); + kyFilesCustomizeClassify.setUpdateTime(DateUtils.getNowDate()); + int res = filesCustomizeClassifyService.addKyFilesCustomizeClassify(kyFilesCustomizeClassify); + if (res==1){ + return toAjax(res); + }else { + return error("分类名称已存在"); + } + } + + /** + * 修改档案自定义分类管理 + * @param kyFilesCustomizeClassify + * @return + */ + @SysLog(title = "档案自定义分类管理", businessType = OperaType.QUERY, module = "档案自定义分类管理->修改档案自定义分类管理", details = "修改档案自定义分类管理") + @RequiresPermissions("files:customize:update") + @PostMapping("/updateKyFilesCustomizeClassify") + public AjaxResult updateKyFilesCustomizeClassify(@Validated @RequestBody KyFilesCustomizeClassify kyFilesCustomizeClassify) + { + + kyFilesCustomizeClassify.setUpdateUserId(getUserId()); + kyFilesCustomizeClassify.setUpdateUserName(getUsername()); + kyFilesCustomizeClassify.setUpdateTime(DateUtils.getNowDate()); + int res = filesCustomizeClassifyService.updateKyFilesCustomizeClassify(kyFilesCustomizeClassify); + if (res==1){ + return toAjax(res); + }else { + return error("分类名称已存在"); + } + } + + /** + * 修改档案自定义分类管理 + * @param kyFilesCustomizeClassify + * @return + */ + @SysLog(title = "档案自定义分类管理", businessType = OperaType.QUERY, module = "档案自定义分类管理->修改档案自定义分类管理", details = "修改档案自定义分类管理") + @RequiresPermissions("files:customize:del") + @PostMapping("/delKyFilesCustomizeClassify") + public AjaxResult delKyFilesCustomizeClassify(@Validated @RequestBody KyFilesCustomizeClassify kyFilesCustomizeClassify) + { + return toAjax(filesCustomizeClassifyService.delKyFilesCustomizeClassify(kyFilesCustomizeClassify)); + } +} 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 index c73d5a2..c9701bf 100644 --- 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 @@ -11,9 +11,8 @@ 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 org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -37,9 +36,9 @@ public class FilesMultiClassifyController extends BaseController { * @return */ @SysLog(title = "档案多维度分类管理", businessType = OperaType.QUERY, module = "档案多维度分类管理->获取档案多维度分类管理列表", details = "获取档案多维度分类管理列表") - @RequiresPermissions("data:classify:list") + @RequiresPermissions("files:multi:list") @GetMapping("/getKyFilesMultiClassifyList") - public TableDataInfo list(KyFilesMultiClassify kyFilesMultiClassify) + public TableDataInfo getKyFilesMultiClassifyList(KyFilesMultiClassify kyFilesMultiClassify) { startPage(); List list = filesMultiClassifyService.selectKyFilesMultiClassifyList(kyFilesMultiClassify); @@ -52,9 +51,9 @@ public class FilesMultiClassifyController extends BaseController { * @return */ @SysLog(title = "档案多维度分类管理", businessType = OperaType.QUERY, module = "档案多维度分类管理->新增档案多维度分类管理", details = "新增档案多维度分类管理") - @RequiresPermissions("data:classify:add") - @GetMapping("/addKyFilesMultiClassify") - public AjaxResult addKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify) + @RequiresPermissions("files:multi:add") + @PostMapping("/addKyFilesMultiClassify") + public AjaxResult addKyFilesMultiClassify(@Validated @RequestBody KyFilesMultiClassify kyFilesMultiClassify) { kyFilesMultiClassify.setCreateUserId(getUserId()); @@ -77,9 +76,9 @@ public class FilesMultiClassifyController extends BaseController { * @return */ @SysLog(title = "档案多维度分类管理", businessType = OperaType.QUERY, module = "档案多维度分类管理->新增档案多维度分类管理", details = "新增档案多维度分类管理") - @RequiresPermissions("data:classify:update") - @GetMapping("/updateKyFilesMultiClassify") - public AjaxResult updateKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify) + @RequiresPermissions("files:multi:update") + @PostMapping("/updateKyFilesMultiClassify") + public AjaxResult updateKyFilesMultiClassify(@Validated @RequestBody KyFilesMultiClassify kyFilesMultiClassify) { kyFilesMultiClassify.setUpdateUserId(getUserId()); kyFilesMultiClassify.setUpdateUserName(getUsername()); @@ -98,9 +97,9 @@ public class FilesMultiClassifyController extends BaseController { * @return */ @SysLog(title = "档案多维度分类管理", businessType = OperaType.QUERY, module = "档案多维度分类管理->删除档案多维度分类管理", details = "删除档案多维度分类管理") - @RequiresPermissions("data:classify:del") - @GetMapping("/delKyFilesMultiClassify") - public AjaxResult delKyFilesMultiClassify(KyFilesMultiClassify kyFilesMultiClassify) + @RequiresPermissions("files:multi:del") + @PostMapping("/delKyFilesMultiClassify") + public AjaxResult delKyFilesMultiClassify(@Validated @RequestBody KyFilesMultiClassify kyFilesMultiClassify) { return toAjax(filesMultiClassifyService.delKyFilesMultiClassify(kyFilesMultiClassify)); } diff --git a/bonus-system/src/main/java/com/bonus/system/domain/KyFilesCustomizeClassify.java b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesCustomizeClassify.java new file mode 100644 index 0000000..5a0b1ed --- /dev/null +++ b/bonus-system/src/main/java/com/bonus/system/domain/KyFilesCustomizeClassify.java @@ -0,0 +1,157 @@ +package com.bonus.system.domain; + +import javax.validation.constraints.Size; +import java.util.Date; + +/** + * @author 马三炮 + * @date 2025/9/11 + */ +public class KyFilesCustomizeClassify { + + /** + * id + */ + private Long id; + + /** + * 自定义分类名称 + */ + private String customizeClassifyName; + + /** + * 分类描述 + */ + private String classifyDesc; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; + + /** + * 创建人 + */ + private Long createUserId; + + /** + * 创建人姓名 + */ + private String createUserName; + + /** + * 修改人 + */ + private Long updateUserId; + + /** + * 修改人姓名 + */ + private String updateUserName; + + /** + * 是否删除 0. 删除 1.未删除 + */ + private String delFlag; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + @Size(min = 0, max = 64, message = "自定义分类名称超过64个字符") + public String getCustomizeClassifyName() { + return customizeClassifyName; + } + + public void setCustomizeClassifyName(String customizeClassifyName) { + this.customizeClassifyName = customizeClassifyName; + } + @Size(min = 0, max = 255, message = "分类描述超过64个字符") + public String getClassifyDesc() { + return classifyDesc; + } + + public void setClassifyDesc(String classifyDesc) { + this.classifyDesc = classifyDesc; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Long getCreateUserId() { + return createUserId; + } + + public void setCreateUserId(Long createUserId) { + this.createUserId = createUserId; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public Long getUpdateUserId() { + return updateUserId; + } + + public void setUpdateUserId(Long updateUserId) { + this.updateUserId = updateUserId; + } + + public String getUpdateUserName() { + return updateUserName; + } + + public void setUpdateUserName(String updateUserName) { + this.updateUserName = updateUserName; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + @Override + public String toString() { + return "KyFilesCustomizeClassify{" + + "id=" + id + + ", customizeClassifyName='" + customizeClassifyName + '\'' + + ", classifyDesc='" + classifyDesc + '\'' + + ", createTime=" + createTime + + ", updateTime=" + updateTime + + ", createUserId=" + createUserId + + ", createUserName='" + createUserName + '\'' + + ", updateUserId=" + updateUserId + + ", updateUserName='" + updateUserName + '\'' + + ", delFlag='" + delFlag + '\'' + + '}'; + } +} diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/FilesCustomizeClassifyMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/FilesCustomizeClassifyMapper.java new file mode 100644 index 0000000..38568eb --- /dev/null +++ b/bonus-system/src/main/java/com/bonus/system/mapper/FilesCustomizeClassifyMapper.java @@ -0,0 +1,17 @@ +package com.bonus.system.mapper; + +import com.bonus.system.domain.KyFilesCustomizeClassify; + +import java.util.List; + +public interface FilesCustomizeClassifyMapper { + List getKyFilesCustomizeClassifyList(KyFilesCustomizeClassify kyFilesCustomizeClassify); + + KyFilesCustomizeClassify getKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify); + + int addKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify); + + int updateKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify); + + int delKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify); +} diff --git a/bonus-system/src/main/java/com/bonus/system/service/FilesCustomizeClassifyService.java b/bonus-system/src/main/java/com/bonus/system/service/FilesCustomizeClassifyService.java new file mode 100644 index 0000000..1ab1f2f --- /dev/null +++ b/bonus-system/src/main/java/com/bonus/system/service/FilesCustomizeClassifyService.java @@ -0,0 +1,15 @@ +package com.bonus.system.service; + +import com.bonus.system.domain.KyFilesCustomizeClassify; + +import java.util.List; + +public interface FilesCustomizeClassifyService { + List getKyFilesCustomizeClassifyList(KyFilesCustomizeClassify kyFilesCustomizeClassify); + + int addKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify); + + int updateKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify); + + int delKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify); +} diff --git a/bonus-system/src/main/java/com/bonus/system/service/impl/FilesCustomizeClassifyServiceImpl.java b/bonus-system/src/main/java/com/bonus/system/service/impl/FilesCustomizeClassifyServiceImpl.java new file mode 100644 index 0000000..d45d718 --- /dev/null +++ b/bonus-system/src/main/java/com/bonus/system/service/impl/FilesCustomizeClassifyServiceImpl.java @@ -0,0 +1,51 @@ +package com.bonus.system.service.impl; + +import com.bonus.common.utils.StringUtils; +import com.bonus.system.domain.KyFilesCustomizeClassify; +import com.bonus.system.mapper.FilesCustomizeClassifyMapper; +import com.bonus.system.service.FilesCustomizeClassifyService; +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 FilesCustomizeClassifyServiceImpl implements FilesCustomizeClassifyService { + + @Resource + private FilesCustomizeClassifyMapper filesCustomizeClassifyMapper; + + @Override + public List getKyFilesCustomizeClassifyList(KyFilesCustomizeClassify kyFilesCustomizeClassify) { + return filesCustomizeClassifyMapper.getKyFilesCustomizeClassifyList(kyFilesCustomizeClassify); + } + + @Override + public int addKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify) { + KyFilesCustomizeClassify kyFilesCustomizeClassifyOld = filesCustomizeClassifyMapper.getKyFilesCustomizeClassify(kyFilesCustomizeClassify); + if (StringUtils.isNotNull(kyFilesCustomizeClassifyOld)){ + return 0; + } + return filesCustomizeClassifyMapper.addKyFilesCustomizeClassify(kyFilesCustomizeClassify); + } + + @Override + public int updateKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify) { + KyFilesCustomizeClassify kyFilesCustomizeClassifyOld = filesCustomizeClassifyMapper.getKyFilesCustomizeClassify(kyFilesCustomizeClassify); + if (StringUtils.isNotNull(kyFilesCustomizeClassifyOld) && !kyFilesCustomizeClassify.getId().equals(kyFilesCustomizeClassifyOld.getId())){ + return 0; + } + return filesCustomizeClassifyMapper.updateKyFilesCustomizeClassify(kyFilesCustomizeClassify); + } + + @Override + public int delKyFilesCustomizeClassify(KyFilesCustomizeClassify kyFilesCustomizeClassify) { + return filesCustomizeClassifyMapper.delKyFilesCustomizeClassify(kyFilesCustomizeClassify); + } +} 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 2467f04..85811b2 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 @@ -56,6 +56,11 @@ public class KyDataClassifyServiceImpl implements KyDataClassifyService { */ @Override public int updateKyDataClassify(KyDataClassify kyDataClassify) { + //判读数据名称是否存在 + KyDataClassify kyDataClassifyOld = kyDataClassifyMapper.selectKyDataClassifyByDataTypeName(kyDataClassify); + if (StringUtils.isNotNull(kyDataClassifyOld) && !kyDataClassify.getId().equals(kyDataClassifyOld.getId())){ + return 0; + } return kyDataClassifyMapper.updateKyDataClassify(kyDataClassify); } diff --git a/bonus-system/src/main/resources/mapper/system/FilesCustomizeClassifyMapper.xml b/bonus-system/src/main/resources/mapper/system/FilesCustomizeClassifyMapper.xml new file mode 100644 index 0000000..e52e025 --- /dev/null +++ b/bonus-system/src/main/resources/mapper/system/FilesCustomizeClassifyMapper.xml @@ -0,0 +1,50 @@ + + + + + insert into da_ky_files_customize_classify + (customize_classify_name,classify_desc,create_time,update_time,create_user_id,create_user_name,update_user_id,update_user_name) + values (#{customizeClassifyName},#{classifyDesc},#{classifyDesc},#{createTime},#{updateTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName}) + + + + update da_ky_files_customize_classify + + + customize_classify_name =#{customizeClassifyName}, + + + classify_desc =#{classifyDesc}, + + + update_user_id =#{updateUserId}, + + + update_user_name =#{updateUserName}, + + + update_time =#{updateTime}, + + + where id = #{id} + + + update da_ky_files_customize_classify set del_flag = '0' where id = #{id} + + + + + diff --git a/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml b/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml index 19f3404..6844533 100644 --- a/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/FilesMultiClassifyMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - insert into da_ky_data_classify + insert into da_ky_files_multi_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})