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 6619121..8eec60b 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 @@ -3,6 +3,7 @@ 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; @@ -14,9 +15,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; +import java.util.Map; /** * 数据汇集管理 + * * @author 马三炮 * @date 2025/9/10 */ @@ -30,17 +33,24 @@ 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 list = dataCollectDataService.selectKyDataCollectDataList(kyDataCollectData); return getDataTable(list); } + @SysLog(title = "数据汇集管理详情", businessType = OperaType.QUERY, module = "数据汇集管理->数据汇集管理", details = "数据汇集管理详情") + @RequiresPermissions("data:Collect:query") + @GetMapping("/queryById") + public AjaxResult queryById(KyDataCollectData kyDataCollectData) { + Map map = dataCollectDataService.queryDetailById(kyDataCollectData); + return AjaxResult.success(map); + } } 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 477dd5e..27e89cb 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 @@ -15,6 +15,7 @@ public class KyDataCollectData { * id */ private Integer id; + private Integer jsonId; /** * 数据分类id 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 f2337ab..53f9d0e 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 @@ -3,6 +3,7 @@ package com.bonus.system.mapper; import com.bonus.system.domain.KyDataCollectData; import java.util.List; +import java.util.Map; public interface DataCollectDataMapper { /** @@ -11,4 +12,6 @@ public interface DataCollectDataMapper { * @return */ List selectKyDataCollectDataList(KyDataCollectData kyDataCollectData); + + String queryDetailById(KyDataCollectData kyDataCollectData); } 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 1473ad4..ed2f566 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 @@ -3,6 +3,7 @@ package com.bonus.system.service; import com.bonus.system.domain.KyDataCollectData; import java.util.List; +import java.util.Map; public interface DataCollectDataService { /** @@ -11,4 +12,6 @@ public interface DataCollectDataService { * @return */ List selectKyDataCollectDataList(KyDataCollectData kyDataCollectData); + + Map queryDetailById(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 e3a15b9..837058a 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,5 +1,8 @@ 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; @@ -8,6 +11,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; +import java.util.Map; /** * @author 马三炮 @@ -22,6 +26,7 @@ public class DataCollectDataServiceImpl implements DataCollectDataService { /** * 根据数据类型数据汇集管理列表 + * * @param kyDataCollectData * @return */ @@ -29,4 +34,23 @@ public class DataCollectDataServiceImpl implements DataCollectDataService { public List selectKyDataCollectDataList(KyDataCollectData kyDataCollectData) { return dataCollectDataMapper.selectKyDataCollectDataList(kyDataCollectData); } + + @Override + public Map 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 map = (Map) object; + return map; + } + } + } + } + return null; + } } diff --git a/bonus-system/src/main/resources/mapper/system/DataCollectDataMapper.xml b/bonus-system/src/main/resources/mapper/system/DataCollectDataMapper.xml index e0319dd..cd7c0b1 100644 --- a/bonus-system/src/main/resources/mapper/system/DataCollectDataMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/DataCollectDataMapper.xml @@ -12,4 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND data_classify_id = #{dataClassifyId} +