guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

一公司驾驶舱 地图 新动火标点

pull/5/head
limingyu 2023-12-27 19:48:00 +08:00
parent d13f438573
commit 70f17b2515
5 changed files with 88 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zcloud/controller/home/HomeHighRiskWorkController.java
View File

@ -138,7 +138,12 @@ public class HomeHighRiskWorkController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
List<PageData> varList = highworkService.listAllHighRiskWorkLocation(pd);
List<PageData> varList = new ArrayList<>();
if (StringUtils.equals("035958e685cf4850bc40151c5e0617a6",pd.getString("CORPINFO_ID"))) { // 一公司
varList = highworkService.listAllHighRiskWorkLocationFirst(pd);
}else {
varList = highworkService.listAllHighRiskWorkLocation(pd);
}
map.put("varList", varList);
map.put("result", errInfo);
return map;

2
src/main/java/com/zcloud/mapper/datasource/highriskwork/HighWorkMapper.java
View File

@ -112,5 +112,7 @@ public interface HighWorkMapper{
* @throws Exception
*/
List<PageData> statisticsAllHighRiskWorkFirst(PageData pd);
List<PageData> listAllHighRiskWorkLocationFirst(PageData pd);
}

2
src/main/java/com/zcloud/service/highriskwork/HighWorkService.java
View File

@ -127,5 +127,7 @@ public interface HighWorkService{
* @throws Exception
*/
List<PageData> statisticsAllHighRiskWorkFirst(PageData pd)throws Exception;
List<PageData> listAllHighRiskWorkLocationFirst(PageData pd)throws Exception;
}

5
src/main/java/com/zcloud/service/highriskwork/impl/HighWorkServiceImpl.java
View File

@ -197,5 +197,10 @@ public class HighWorkServiceImpl implements HighWorkService {
public List<PageData> statisticsAllHighRiskWorkFirst(PageData pd) throws Exception {
return highworkMapper.statisticsAllHighRiskWorkFirst(pd);
}
@Override
public List<PageData> listAllHighRiskWorkLocationFirst(PageData pd) throws Exception {
return highworkMapper.listAllHighRiskWorkLocationFirst(pd);
}
}

73
src/main/resources/mybatis/datasource/highriskwork/HighWorkMapper.xml
View File

@ -1392,4 +1392,77 @@
SELECT count(*) COUNT FROM bus_hoisting f WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
</select>
<!-- 获取所有高危作业的位置坐标（有坐标数据）（一公司）-->
<select id="listAllHighRiskWorkLocationFirst" parameterType="pd" resultType="pd">
SELECT * FROM
(SELECT
'HOTWORK' TYPE,
f.HOTWORK_ID id,
CONCAT_WS("", '动火作业 编号：', f.CHECK_NO ) NAME,
f.WORK_LONGITUDE LONGITUDE,
f.WORK_LATITUDE LATITUDE,
'./bi/images/map/hotwork.png' IMAGE_FILE
FROM bus_hotwork_cfd f
WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL
AND f.APPLY_STATUS not in ('-99','8','-98','-2','-4','-5','-6','-7','-8') AND f.CORPINFO_ID = #{CORPINFO_ID}
UNION ALL
SELECT
'ELECTRICITY' TYPE,
f.ELECTRICITY_ID id,
CONCAT_WS("", '临时用电作业 编号：', f.CHECK_NO) NAME,
f.WORK_LONGITUDE LONGITUDE,
f.WORK_LATITUDE LATITUDE,
'./bi/images/map/electricity.png' IMAGE_FILE
FROM bus_electricity f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL
AND f.APPLY_STATUS NOT IN ('3','4') AND f.CORPINFO_ID = #{CORPINFO_ID}
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')
UNION ALL
SELECT
'BLINDBOARD' TYPE,
f.BLINDBOARD_ID id,
CONCAT_WS("", '盲板作业 编号：', f.CHECK_NO) NAME,
bb.LONGITUDE LONGITUDE,
bb.LATITUDE LATITUDE,
'./bi/images/map/blindboard.png' IMAGE_FILE
FROM bus_blindboard f
left join bus_blindboardinfo bb on bb.BLINDBOARD_ID = f.BLINDBOARD_ID
WHERE f.ISDELETE = '0' AND bb.LONGITUDE IS NOT NULL AND bb.LATITUDE IS NOT NULL
AND f.APPLY_STATUS NOT IN ('3','4') AND f.CORPINFO_ID = #{CORPINFO_ID}
AND date_format(now(),'%Y-%m-%d %H:%i') >= bb.BOARD_INSTALL_TIME AND bb.BOARD_DISASSEMBLE_TIME >= date_format(now(),'%Y-%m-%d %H:%i')
UNION ALL
SELECT
'HIGHWORK' TYPE,
f.HIGHWORK_ID id,
CONCAT_WS("", '高处作业 编号：', f.CHECK_NO) NAME,
f.WORK_LONGITUDE LONGITUDE,
f.WORK_LATITUDE LATITUDE,
'./bi/images/map/highwork.png' IMAGE_FILE
FROM bus_highwork f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL
AND f.APPLY_STATUS NOT IN ('4','5','55','-5') AND f.CORPINFO_ID = #{CORPINFO_ID}
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')
UNION ALL
SELECT
'CONFINEDSPACE' TYPE,
f.CONFINEDSPACE_ID id,
CONCAT_WS("", '有限空间作业 编号：', f.WORK_PERMIT_NUMBER) NAME,
f.WORK_LONGITUDE LONGITUDE,
f.WORK_LATITUDE LATITUDE,
'./bi/images/map/confinedspace.png' IMAGE_FILE
FROM bus_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 f.CORPINFO_ID = #{CORPINFO_ID}
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')
UNION ALL
SELECT
'HOISTING' TYPE,
f.HOISTING_ID id,
CONCAT_WS("", '吊装作业 编号：', f.NUMBERING) NAME,
f.WORK_LONGITUDE LONGITUDE,
f.WORK_LATITUDE LATITUDE,
'./bi/images/map/hoisting.png' IMAGE_FILE
FROM bus_hoisting f WHERE f.ISDELETE = '0' AND f.WORK_LONGITUDE IS NOT NULL AND f.WORK_LATITUDE IS NOT NULL
AND f.APPLY_STATUS NOT IN ('4','5','55','-5') AND f.CORPINFO_ID = #{CORPINFO_ID}
AND date_format(now(),'%Y-%m-%d %H:%i') >= f.JOB_START_TIME AND f.JOB_END_TIME >= date_format(now(),'%Y-%m-%d %H:%i')
) f
</select>
</mapper>