From 107d1f6eec099642e91cda8d43f690605add3342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 11 Sep 2025 09:57:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=EF=BC=8C=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tool/DataCollectDataController.java | 31 ++++++ .../tool/KyDataClassifyController.java | 8 +- .../bonus/system/domain/KyDataClassify.java | 100 +++++++++++++++++- .../system/domain/KyDataCollectData.java | 5 +- .../system/mapper/DataCollectDataMapper.java | 9 ++ .../mapper/DataCollectDataServiceMapper.java | 4 - .../service/DataCollectDataService.java | 5 + .../impl/DataCollectDataServiceImpl.java | 12 +++ .../mapper/system/DataCollectDataMapper.xml | 10 +- 9 files changed, 172 insertions(+), 12 deletions(-) create mode 100644 bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataMapper.java delete mode 100644 bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataServiceMapper.java diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/DataCollectDataController.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/DataCollectDataController.java index 8a700bd..0ed576f 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/tool/DataCollectDataController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/DataCollectDataController.java @@ -1,11 +1,22 @@ 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.page.TableDataInfo; +import com.bonus.common.enums.OperaType; +import com.bonus.system.domain.KyDataCollectData; +import com.bonus.system.service.DataCollectDataService; 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/10 */ @@ -13,4 +24,24 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/data/Collect") @Slf4j public class DataCollectDataController extends BaseController { + + @Resource + private DataCollectDataService dataCollectDataService; + + /** + * 根据数据类型数据汇集管理列表 + * @param kyDataCollectData + * @return + */ + @SysLog(title = "数据汇集管理", businessType = OperaType.QUERY,module = "数据汇集管理->数据汇集管理", details = "根据数据类型数据汇集管理列表") + @RequiresPermissions("data:Collect:list") + @GetMapping("/list") + public TableDataInfo list(KyDataCollectData kyDataCollectData) + { + startPage(); + List list = dataCollectDataService.selectKyDataCollectDataList(kyDataCollectData); + return getDataTable(list); + } + + } 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 43ac706..52c20e9 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 @@ -42,7 +42,7 @@ public class KyDataClassifyController extends BaseController { * @param kyDataClassify * @return */ - @SysLog(title = "数据集成", businessType = OperaType.QUERY, logType = 1, module = "数据集成->数据分类管理", details = "查询数据分类列表") + @SysLog(title = "数据集成", businessType = OperaType.QUERY, module = "数据集成->数据分类管理", details = "查询数据分类列表") @RequiresPermissions("data:classify:list") @GetMapping("/list") public TableDataInfo list(KyDataClassify kyDataClassify) @@ -58,7 +58,7 @@ public class KyDataClassifyController extends BaseController { * @return */ @RequiresPermissions("data:classify:add") - @SysLog(title = "数据集成", businessType = OperaType.QUERY, logType = 1, module = "数据集成->数据分类管理", details = "新增数据分类") + @SysLog(title = "数据集成", businessType = OperaType.QUERY,module = "数据集成->数据分类管理", details = "新增数据分类") @PostMapping("/addKyDataClassify") public AjaxResult addKyDataClassify(@Validated @RequestBody KyDataClassify kyDataClassify) { @@ -78,7 +78,7 @@ public class KyDataClassifyController extends BaseController { * @return */ @RequiresPermissions("data:classify:update") - @SysLog(title = "数据集成", businessType = OperaType.QUERY, logType = 1, module = "数据集成->数据分类管理", details = "修改数据分类") + @SysLog(title = "数据集成", businessType = OperaType.QUERY, module = "数据集成->数据分类管理", details = "修改数据分类") @PostMapping("/updateKyDataClassify") public AjaxResult updateKyDataClassify(@Validated @RequestBody KyDataClassify kyDataClassify) { @@ -95,7 +95,7 @@ public class KyDataClassifyController extends BaseController { * @return */ @RequiresPermissions("data:classify:del") - @SysLog(title = "数据集成", businessType = OperaType.QUERY, logType = 1, module = "数据集成->数据分类管理", details = "删除数据分类") + @SysLog(title = "数据集成", businessType = OperaType.QUERY, module = "数据集成->数据分类管理", details = "删除数据分类") @PostMapping("/delKyDataClassify") public AjaxResult delKyDataClassify(@Validated @RequestBody KyDataClassify kyDataClassify) { 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 16b3660..256ab05 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 @@ -4,13 +4,13 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.Size; import java.util.Date; /** * @author 马三炮 * @date 2025/9/1 */ -@Data public class KyDataClassify { /** @@ -66,4 +66,102 @@ public class KyDataClassify { * 是否删除 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 getDataTypeName() { + return dataTypeName; + } + + public void setDataTypeName(String dataTypeName) { + this.dataTypeName = dataTypeName; + } + + public String getRemark() { + return remark; + } + + @Size(min = 0, max = 255, message = "备注不能超过255个字符") + public void setRemark(String remark) { + this.remark = remark; + } + + 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 "KyDataClassify{" + + "id=" + id + + ", dataTypeName='" + dataTypeName + '\'' + + ", remark='" + remark + '\'' + + ", 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/domain/KyDataCollectData.java b/bonus-system/src/main/java/com/bonus/system/domain/KyDataCollectData.java index f6aa9fd..477dd5e 100644 --- a/bonus-system/src/main/java/com/bonus/system/domain/KyDataCollectData.java +++ b/bonus-system/src/main/java/com/bonus/system/domain/KyDataCollectData.java @@ -2,6 +2,7 @@ package com.bonus.system.domain; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @author 马三炮 @@ -28,13 +29,13 @@ public class KyDataCollectData { /** * 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String createTime; /** * 修改时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String updateTime; /** 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 new file mode 100644 index 0000000..70ae43e --- /dev/null +++ b/bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataMapper.java @@ -0,0 +1,9 @@ +package com.bonus.system.mapper; + +import com.bonus.system.domain.KyDataCollectData; + +import java.util.List; + +public interface DataCollectDataMapper { + List selectKyDataCollectDataList(KyDataCollectData kyDataCollectData); +} diff --git a/bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataServiceMapper.java b/bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataServiceMapper.java deleted file mode 100644 index b284047..0000000 --- a/bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataServiceMapper.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bonus.system.mapper; - -public interface DataCollectDataServiceMapper { -} 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 a5dd6f9..5848a88 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 @@ -1,4 +1,9 @@ package com.bonus.system.service; +import com.bonus.system.domain.KyDataCollectData; + +import java.util.List; + public interface DataCollectDataService { + List selectKyDataCollectDataList(KyDataCollectData kyDataCollectData); } 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 7699f7c..46aa230 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 @@ -1,9 +1,14 @@ package com.bonus.system.service.impl; +import com.bonus.system.domain.KyDataCollectData; +import com.bonus.system.mapper.DataCollectDataMapper; import com.bonus.system.service.DataCollectDataService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** * @author 马三炮 * @date 2025/9/10 @@ -12,4 +17,11 @@ import org.springframework.stereotype.Service; @Slf4j public class DataCollectDataServiceImpl implements DataCollectDataService { + @Resource + private DataCollectDataMapper dataCollectDataMapper; + + @Override + public List selectKyDataCollectDataList(KyDataCollectData kyDataCollectData) { + return dataCollectDataMapper.selectKyDataCollectDataList(kyDataCollectData); + } } diff --git a/bonus-system/src/main/resources/mapper/system/DataCollectDataMapper.xml b/bonus-system/src/main/resources/mapper/system/DataCollectDataMapper.xml index a42bc73..300d4ba 100644 --- a/bonus-system/src/main/resources/mapper/system/DataCollectDataMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/DataCollectDataMapper.xml @@ -2,6 +2,14 @@ - + + From dee6f888165e160b1830a6143258cc59dc5e8c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 11 Sep 2025 09:58:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=EF=BC=8C=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/web/controller/tool/DataCollectDataController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/DataCollectDataController.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/DataCollectDataController.java index 0ed576f..6619121 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/tool/DataCollectDataController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/DataCollectDataController.java @@ -38,7 +38,6 @@ public class DataCollectDataController extends BaseController { @GetMapping("/list") public TableDataInfo list(KyDataCollectData kyDataCollectData) { - startPage(); List list = dataCollectDataService.selectKyDataCollectDataList(kyDataCollectData); return getDataTable(list); }