bonus
/
smart_archives_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2025-09-11 11:23:57 +08:00
parent 6bf75eeb6a dee6f88816
commit 088b8833fc
9 changed files with 171 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bonus-admin/src/main/java/com/bonus/web/controller/tool/DataCollectDataController.java
View File

@ -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,23 @@ 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)
{
List<KyDataCollectData> list = dataCollectDataService.selectKyDataCollectDataList(kyDataCollectData);
return getDataTable(list);
}
}

8
bonus-admin/src/main/java/com/bonus/web/controller/tool/KyDataClassifyController.java
View File

@ -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)
{

100
bonus-system/src/main/java/com/bonus/system/domain/KyDataClassify.java
View File

@ -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 + '\'' +
'}';
}
}

5
bonus-system/src/main/java/com/bonus/system/domain/KyDataCollectData.java
View File

@ -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;
/**

9
bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataMapper.java Normal file
View File

@ -0,0 +1,9 @@
package com.bonus.system.mapper;
import com.bonus.system.domain.KyDataCollectData;
import java.util.List;
public interface DataCollectDataMapper {
List<KyDataCollectData> selectKyDataCollectDataList(KyDataCollectData kyDataCollectData);
}

4
bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataServiceMapper.java
View File

@ -1,4 +0,0 @@
package com.bonus.system.mapper;
public interface DataCollectDataServiceMapper {
}

5
bonus-system/src/main/java/com/bonus/system/service/DataCollectDataService.java
View File

@ -1,4 +1,9 @@
package com.bonus.system.service;
import com.bonus.system.domain.KyDataCollectData;
import java.util.List;
public interface DataCollectDataService {
List<KyDataCollectData> selectKyDataCollectDataList(KyDataCollectData kyDataCollectData);
}

12
bonus-system/src/main/java/com/bonus/system/service/impl/DataCollectDataServiceImpl.java
View File

@ -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<KyDataCollectData> selectKyDataCollectDataList(KyDataCollectData kyDataCollectData) {
return dataCollectDataMapper.selectKyDataCollectDataList(kyDataCollectData);
}
}

10
bonus-system/src/main/resources/mapper/system/DataCollectDataMapper.xml
View File

@ -2,6 +2,14 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.system.mapper.DataCollectDataServiceMapper">
<mapper namespace="com.bonus.system.mapper.DataCollectDataMapper">
<select id="selectKyDataCollectDataList" resultType="com.bonus.system.domain.KyDataCollectData">
select id,data_classify_id,data_json
from da_ky_data_collect_data
where del_flag = '1'
<if test="dataClassifyId!=null">
data_classify_id = #{dataClassifyId}
</if>
</select>
</mapper>