八项作业bug修复

src/main/java/com/zcloud/mapper/datasource/map/MapEightMapper.java

@@ -15,7 +15,7 @@ import java.util.Map;
 public interface MapEightMapper {
 
 
-    List<String> getCorpinfoIds(String[] ArrayDATA_IDS);
+	List<String> getCorpinfoIds(String[] ArrayDATA_IDS);
 
 	/**
 	 * 获取柱状图
@@ -359,11 +359,11 @@ public interface MapEightMapper {
 	 */
 	List<PageData> listAllMeasuresCUTROADOrder(PageData pd);
 
-    /**
+	/**
-     * 动火获取字典展示
+	 * 动火获取字典展示
-     * @param shuzu
+	 * @param shuzu
-     * @return
+	 * @return
-     */
+	 */
 	List<String> getListDongHuo(List<String> shuzu);
 
 	/**
@@ -397,5 +397,45 @@ public interface MapEightMapper {
 	List<PageData> findByHOISTINGAcceptuserId(PageData pd);
 
 	List<PageData> findByHOISTINGAcceptuserIds(PageData pd);
+
+	/**有限空间作业查询
+	 * @param pd
+	 * @throws Exception
+	 */
+	PageData findByIdCONFINEDSPACEOrder(PageData pd);
+
+	/**有限空间作业措施查询
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAllMeasuresCONFINEDSPACEOrder(PageData pd);
+
+	/**
+	 * 有限空间
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> listAllCONFINEDSPACEOrder(PageData pd);
+
+	/**
+	 * 有限空间
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> findByIdCONFINEDSPACEAcceptuser(PageData pd);
+
+	/**
+	 * 有限空间
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> findByIdCONFINEDSPACEAcceptusers(PageData pd);
+
+	/**
+	 * 有限空间气体检测
+	 * @param pd
+	 * @return
+	 */
+	PageData findByIdCONFINEDSPACEGasWH(PageData pd);
 }
 

src/main/java/com/zcloud/service/map/impl/MapEightServiceImpl.java

@@ -3,6 +3,7 @@ package com.zcloud.service.map.impl;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.mapper.datasource.map.MapEightMapper;
+import com.zcloud.service.bus.CorpInfoService;
 import com.zcloud.service.map.MapEightService;
 import com.zcloud.util.Tools;
 import org.apache.commons.lang.StringUtils;
@@ -12,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 说明：实时地图八项工作
@@ -26,8 +28,8 @@ public class MapEightServiceImpl implements MapEightService {
 	@Autowired
 	private MapEightMapper mapEightMapper;
 
-    @Override
+	@Override
-    public List<String> getCorpinfoIds(PageData pd) {
+	public List<String> getCorpinfoIds(PageData pd) {
 		String area = pd.getString("AREA");
 		if(StringUtils.isNotBlank(area)){
 			String[] ArrayDATA_IDS = area.split(",");
@@ -39,12 +41,12 @@ public class MapEightServiceImpl implements MapEightService {
 			return mapEightMapper.getCorpinfoIds(ArrayDATA_IDS);
 		}
 		return new ArrayList<>();
-    }
+	}
 
-    @Override
+	@Override
 	public Object getEcharts(PageData pd) {
 		Map<String,Object> returnMap = new HashMap<>();
-        String errInfo = "success";
+		String errInfo = "success";
 
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(new Date());
@@ -108,28 +110,28 @@ public class MapEightServiceImpl implements MapEightService {
 
 	@Override
 	public List<PageData> listAllHighRiskWorkLocation(PageData pd) throws Exception {
-        List<PageData> r = new ArrayList<>();
+		List<PageData> r = new ArrayList<>();
-        String typeStr = pd.getString("TYPE");
+		String typeStr = pd.getString("TYPE");
-        //动火
+		//动火
-        if(StringUtils.equals(typeStr,"HOTWORK")){
+		if(StringUtils.equals(typeStr,"HOTWORK")){
 //            r = mapEightMapper.getHOTWORKHighRiskWorkLocation(pd);
 			r = mapEightMapper.getHOTWORKHighRiskWorkLocationCfd(pd);
-        //临时用电
+			//临时用电
-        }else if(StringUtils.equals(typeStr,"ELECTRICITY")){
+		}else if(StringUtils.equals(typeStr,"ELECTRICITY")){
-            r = mapEightMapper.getELECTRICITYHighRiskWorkLocation(pd);
+			r = mapEightMapper.getELECTRICITYHighRiskWorkLocationOrder(pd);
-        //盲板
+			//盲板
-        }else if(StringUtils.equals(typeStr,"BLINDBOARD")){
+		}else if(StringUtils.equals(typeStr,"BLINDBOARD")){
-            r = mapEightMapper.getBLINDBOARDHighRiskWorkLocation(pd);
+			r = mapEightMapper.getBLINDBOARDHighRiskWorkLocationOrder(pd);
-        // 高处
+			// 高处
-        }else if(StringUtils.equals(typeStr,"HIGHWORK")){
+		}else if(StringUtils.equals(typeStr,"HIGHWORK")){
-            r = mapEightMapper.getHIGHWORKHighRiskWorkLocation(pd);
+			r = mapEightMapper.getHIGHWORKHighRiskWorkLocationOrder(pd);
-        //有限空间
+			//有限空间
-        }else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){
+		}else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){
-            r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocation(pd);
+			r = mapEightMapper.getCONFINEDSPACEHighRiskWorkLocationOrder(pd);
-        //吊装
+			//吊装
-        }else if(StringUtils.equals(typeStr,"HOISTING")){
+		}else if(StringUtils.equals(typeStr,"HOISTING")){
-            r = mapEightMapper.getHOISTINGHighRiskWorkLocation(pd);
+			r = mapEightMapper.getHOISTINGHighRiskWorkLocationOrder(pd);
-        }
+		}
 		return r;
 	}
 
@@ -352,7 +354,7 @@ public class MapEightServiceImpl implements MapEightService {
 		}else if(StringUtils.equals(typeStr,"BLINDBOARD")){
 			pd.put("BLINDBOARD_ID",idStr);
 			pd = mapEightMapper.findByIdBLINDBOARDOrder(pd);
-            map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd));
+			map.put("measuresList", mapEightMapper.listAllMeasuresBLINDBOARDOrder(pd));
 			PageData Info =  mapEightMapper.findByIdJWDOrder(pd);
 			pd.put("TYPE",105);//盲板位置图
 			pd.put("FOREIGN_KEY",pd.getString("BLINDBOARD_ID"));
@@ -368,12 +370,13 @@ public class MapEightServiceImpl implements MapEightService {
 			map.put("imgList1",mapEightMapper.findByHIGHWORKAcceptuserId(pd));
 			map.put("imgList",mapEightMapper.findByHIGHWORKAcceptuserIds(pd));
 		}else if(StringUtils.equals(typeStr,"CONFINEDSPACE")){
-			//没有有限空间作业
+			pd.put("CONFINEDSPACE_ID",idStr);
-			//pd.put("CONFINEDSPACE_ID",idStr);
+			pd = mapEightMapper.findByIdCONFINEDSPACEOrder(pd);	//根据ID读取
-			//pd = mapEightMapper.findByIdCONFINEDSPACE(pd);
+			map.put("measuresList", mapEightMapper.listAllMeasuresCONFINEDSPACEOrder(pd));
-			pd = new PageData();
+			map.put("gasList", mapEightMapper.listAllCONFINEDSPACEOrder(pd));
-			map.put("measuresList", null);
+			map.put("gas", mapEightMapper.findByIdCONFINEDSPACEGasWH(pd));
-			map.put("gasList", null);
+			map.put("imgList",mapEightMapper.findByIdCONFINEDSPACEAcceptusers(pd));
+			map.put("imgList1",mapEightMapper.findByIdCONFINEDSPACEAcceptuser(pd));
 		}else if(StringUtils.equals(typeStr,"HOISTING")){
 			pd.put("HOISTING_ID",idStr);
 			pd = mapEightMapper.findByIdHOISTINGOrder(pd);
@@ -569,18 +572,18 @@ public class MapEightServiceImpl implements MapEightService {
 			}
 		}
 		pd.put("specialUserList", specialUserList);
-    	return pd;
+		return pd;
 	}
 
-    private PageData dianhuo(PageData pd){
+	private PageData dianhuo(PageData pd){
-        if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){
+		if(StringUtils.isBlank(pd.getString("HOT_WORK_METHOD_NAME"))){
-        	String zidian = pd.getString("HOT_WORK_METHOD_ID");
+			String zidian = pd.getString("HOT_WORK_METHOD_ID");
-        	List<String> shuzu = Arrays.asList(zidian.split(","));
+			List<String> shuzu = Arrays.asList(zidian.split(","));
 			List<String> wenzi = mapEightMapper.getListDongHuo(shuzu);
 			String pinjie = String.join(",",wenzi);
 			pd.put("HOT_WORK_METHOD_NAME",pinjie);
 		}
-        return pd;
+		return pd;
-    }
+	}
 }