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

Compare commits

base: bonus:4a6e67f11f172b61d03ec7463c0b78959fbcd0d2
Branches Tags
bonus:master
..
compare: bonus:d7459f2be8383368b0b229ba1027c8467a6a20b5
Branches Tags
bonus:master

No commits in common. "4a6e67f11f172b61d03ec7463c0b78959fbcd0d2" and "d7459f2be8383368b0b229ba1027c8467a6a20b5" have entirely different histories.
4a6e67f11f ... d7459f2be8

6 changed files with 3 additions and 49 deletions
Show Stats Expand all files Collapse all files

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

@ -3,7 +3,6 @@ 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.system.domain.KyDataCollectData;
@ -15,11 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
* 数据汇集管理
*
* @author 马三炮
* @date 2025/9/10
*/
@ -33,24 +30,17 @@ public class DataCollectDataController extends BaseController {
/**
* 根据数据类型数据汇集管理列表
*
* @param kyDataCollectData
* @return
*/
@SysLog(title = "数据汇集管理", businessType = OperaType.QUERY, module = "数据汇集管理->数据汇集管理", details = "根据数据类型数据汇集管理列表")
@SysLog(title = "数据汇集管理", businessType = OperaType.QUERY,module = "数据汇集管理->数据汇集管理", details = "根据数据类型数据汇集管理列表")
@RequiresPermissions("data:Collect:list")
@GetMapping("/list")
public TableDataInfo list(KyDataCollectData kyDataCollectData) {
public TableDataInfo list(KyDataCollectData kyDataCollectData)
{
List<KyDataCollectData> list = dataCollectDataService.selectKyDataCollectDataList(kyDataCollectData);
return getDataTable(list);
}
@SysLog(title = "数据汇集管理详情", businessType = OperaType.QUERY, module = "数据汇集管理->数据汇集管理", details = "数据汇集管理详情")
@RequiresPermissions("data:Collect:share")
@GetMapping("/queryById")
public AjaxResult queryById(KyDataCollectData kyDataCollectData) {
Map map = dataCollectDataService.queryDetailById(kyDataCollectData);
return AjaxResult.success(map);
}
}

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

@ -15,7 +15,6 @@ public class KyDataCollectData {
* id
*/
private Integer id;
private Integer jsonId;
/**
* 数据分类id

3
bonus-system/src/main/java/com/bonus/system/mapper/DataCollectDataMapper.java
View File

@ -3,7 +3,6 @@ package com.bonus.system.mapper;
import com.bonus.system.domain.KyDataCollectData;
import java.util.List;
import java.util.Map;
public interface DataCollectDataMapper {
/**
@ -12,6 +11,4 @@ public interface DataCollectDataMapper {
* @return
*/
List<KyDataCollectData> selectKyDataCollectDataList(KyDataCollectData kyDataCollectData);
String queryDetailById(KyDataCollectData kyDataCollectData);
}

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

@ -3,7 +3,6 @@ package com.bonus.system.service;
import com.bonus.system.domain.KyDataCollectData;
import java.util.List;
import java.util.Map;
public interface DataCollectDataService {
/**
@ -12,6 +11,4 @@ public interface DataCollectDataService {
* @return
*/
List<KyDataCollectData> selectKyDataCollectDataList(KyDataCollectData kyDataCollectData);
Map queryDetailById(KyDataCollectData kyDataCollectData);
}

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

@ -1,8 +1,5 @@
package com.bonus.system.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.bonus.system.domain.KyDataCollectData;
import com.bonus.system.mapper.DataCollectDataMapper;
import com.bonus.system.service.DataCollectDataService;
@ -11,7 +8,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
* @author 马三炮
@ -26,7 +22,6 @@ public class DataCollectDataServiceImpl implements DataCollectDataService {
/**
* 根据数据类型数据汇集管理列表
*
* @param kyDataCollectData
* @return
*/
@ -34,23 +29,4 @@ public class DataCollectDataServiceImpl implements DataCollectDataService {
public List<KyDataCollectData> selectKyDataCollectDataList(KyDataCollectData kyDataCollectData) {
return dataCollectDataMapper.selectKyDataCollectDataList(kyDataCollectData);
}
@Override
public Map<String, Object> queryDetailById(KyDataCollectData kyDataCollectData) {
String jsonData = dataCollectDataMapper.queryDetailById(kyDataCollectData);
if (jsonData != null) {
JSONArray objects = JSON.parseArray(jsonData);
for (Object obj : objects) {
JSONObject object = (JSONObject) obj;
if (object != null) {
String id = object.getString("id");
if (id.equals(kyDataCollectData.getJsonId())) {
Map<String, Object> map = (Map<String, Object>) object;
return map;
}
}
}
}
return null;
}
}

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

@ -12,9 +12,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND data_classify_id = #{dataClassifyId}
</if>
</select>
<select id="queryDetailById" resultType="java.lang.String">
select data_json
from da_ky_data_collect_data
where id = #{id}
</select>
</mapper>