ard-work/src/main/java/com/ruoyi/plan/controller/ArdEplanController.java
@@ -64,12 +64,7 @@ { startPage(); List<ArdEplan> list = ardEplanService.selectArdEplanList(ardEplan); List<Map<String,Object>> result = new ArrayList(); for(ArdEplan para : list){ Map<String,Object> map = new HashMap(); map.put("id",para.getId()); map.put("name",para.getName()); map.put("time",para.getTime()); String info = para.getInfo(); String[] infoArr = info.split(";"); List<Map<String,String>> infoList = new ArrayList(); @@ -81,20 +76,16 @@ infoMap.put("text",str.split(",")[3]); infoList.add(infoMap); } map.put("obj",infoList); map.put("userId",para.getUserId()); map.put("deptId",para.getDeptId()); map.put("createBy",para.getCreateBy()); result.add(map); para.setInfoList(infoList); } return getDataTable(result); return getDataTable(list); } /** * 导出应急预案列表 */ @PreAuthorize("@ss.hasPermi('plan:eplan:export')") /*@PreAuthorize("@ss.hasPermi('plan:eplan:export')") @Log(title = "应急预案", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ArdEplan ardEplan) @@ -102,7 +93,7 @@ List<ArdEplan> list = ardEplanService.selectArdEplanList(ardEplan); ExcelUtil<ArdEplan> util = new ExcelUtil<ArdEplan>(ArdEplan.class); util.exportExcel(response, list, "应急预案数据"); } }*/ /** * 获取应急预案详细信息 ard-work/src/main/java/com/ruoyi/plan/domain/ArdEplan.java
@@ -5,6 +5,10 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import java.util.ArrayList; import java.util.List; import java.util.Map; /** * 应急预案对象 ard_eplan * @@ -40,6 +44,8 @@ /** 删除标记 */ private String delFlag; private List<Map<String,String>> infoList = new ArrayList(); public void setId(String id) { @@ -105,6 +111,14 @@ return delFlag; } public List<Map<String, String>> getInfoList() { return infoList; } public void setInfoList(List<Map<String, String>> infoList) { this.infoList = infoList; } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) ard-work/src/main/java/com/ruoyi/plan/service/IArdEplanService.java
@@ -1,6 +1,8 @@ package com.ruoyi.plan.service; import java.util.List; import java.util.Map; import com.ruoyi.plan.domain.ArdEplan; /** @@ -26,6 +28,7 @@ * @return 应急预案集合 */ public List<ArdEplan> selectArdEplanList(ArdEplan ardEplan); //public List<Map<String,Object>> selectArdEplanList(ArdEplan ardEplan); /** * 新增应急预案 ard-work/src/main/java/com/ruoyi/plan/service/impl/ArdEplanServiceImpl.java
@@ -1,5 +1,6 @@ package com.ruoyi.plan.service.impl; import java.util.HashMap; import java.util.List; import com.ruoyi.common.utils.DateUtils; @@ -7,11 +8,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Map; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.plan.mapper.ArdEplanMapper; import com.ruoyi.plan.domain.ArdEplan; import com.ruoyi.plan.service.IArdEplanService; import javax.annotation.Resource; /** * 应急预案Service业务层处理 @@ -21,7 +26,7 @@ */ @Service public class ArdEplanServiceImpl implements IArdEplanService { @Autowired @Resource private ArdEplanMapper ardEplanMapper; /** @@ -43,6 +48,32 @@ */ @Override public List<ArdEplan> selectArdEplanList(ArdEplan ardEplan) { //public List<Map<String,Object>> selectArdEplanList(ArdEplan ardEplan) { /*List<ArdEplan> list = ardEplanMapper.selectArdEplanList(ardEplan); List<Map<String,Object>> result = new ArrayList(); for(ArdEplan para : list){ Map<String,Object> map = new HashMap(); map.put("id",para.getId()); map.put("name",para.getName()); map.put("time",para.getTime()); String info = para.getInfo(); String[] infoArr = info.split(";"); List<Map<String,String>> infoList = new ArrayList(); for(String str : infoArr){ Map<String,String> infoMap = new HashMap(); infoMap.put("longitude",str.split(",")[0]); infoMap.put("latitude",str.split(",")[1]); infoMap.put("altitude",str.split(",")[2]); infoMap.put("text",str.split(",")[3]); infoList.add(infoMap); } map.put("obj",infoList); map.put("userId",para.getUserId()); map.put("deptId",para.getDeptId()); map.put("createBy",para.getCreateBy()); result.add(map); } return result;*/ return ardEplanMapper.selectArdEplanList(ardEplan); }