diff --git a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java index a6957fe7..380055cf 100644 --- a/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java +++ b/src/main/java/com/zcloud/controller/czksmap/CzksMapEightController.java @@ -11,7 +11,6 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.client.RestTemplate; import java.util.HashMap; import java.util.List; @@ -22,7 +21,7 @@ import java.util.Map; * 官网:www.zcloudchina.com */ @Controller -@RequestMapping("/czks/Eight") +@RequestMapping("/czks/map/Eight") public class CzksMapEightController extends BaseController { @Autowired @@ -57,7 +56,6 @@ public class CzksMapEightController extends BaseController { PageData data = mapEightService.statisticsHighRiskWorkByStateOrder(pd); map.put("pd", data); - //pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java index 7b3f5160..6051ea30 100644 --- a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java +++ b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java @@ -5,6 +5,7 @@ import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.map.MapEightService; import com.zcloud.service.map.MapKetProjectService; +import com.zcloud.util.Jurisdiction; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -73,6 +74,7 @@ public class MapKeyProjectController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); //根据条件增加参数或减少参数 都没有 直接返回空 + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) { List ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd); if (ArrayDATA_IDS.size() == 0) { diff --git a/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java b/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java index b7c41272..80a0511f 100644 --- a/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java +++ b/src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java @@ -98,6 +98,7 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme @Override public List listAllForMap(PageData pd) { + pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); return platformvideomanagementMapper.listAllForMap(pd); } diff --git a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml index 6572b52b..ff526cc1 100644 --- a/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml +++ b/src/main/resources/mybatis/datasource/czksbimap/CzksMapEightMapper.xml @@ -2421,7 +2421,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/electricity.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '5' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2444,7 +2444,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/blindboard.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_blindboard f + FROM gf_blindboard f left join bus_blindboardinfo bb on bb.BLINDBOARD_ID = f.BLINDBOARD_ID WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '6' @@ -2470,7 +2470,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/highwork.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '6' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2494,7 +2494,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/confinedspace.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_confinedspace f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_confinedspace f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS != '7' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2518,7 +2518,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/hoisting.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_hoisting f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_hoisting f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS !='6' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2542,7 +2542,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/hoisting.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_breakground f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_breakground f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS !='6' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') @@ -2566,7 +2566,7 @@ f.WORK_LATITUDE LATITUDE, './bi/images/map/hoisting.png' IMAGE_FILE, f.CORPINFO_ID - FROM bus_cutroad f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL + FROM gf_cutroad f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL AND f.APPLY_STATUS !='6' AND date_format(now(),'%Y-%m-%d %H:%i') >= f.WORK_START_DATE AND f.WORK_END_DATE >= date_format(now(),'%Y-%m-%d %H:%i') diff --git a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml index 272fc837..93d7a71a 100644 --- a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml +++ b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml @@ -407,6 +407,9 @@ AND fcs.ISDELETE = 0 where frd.FIRE_RECORD_ID = #{FIRE_RECORD_ID} and fp.FIRE_POINT_ID = #{FIRE_POINT_ID} + + and d.CORPINFO_ID = #{pd.CORPINFO_ID} + GROUP BY frd.FIRE_RECORD_ID, fd.FIRE_DEVICE_ID