Skip to content

A
amos-boot-biz
Commit ca572120 authored by chenzhao's avatar chenzhao
Browse files
Options

修改bug

parent ca854dae
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 48 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @ ca572120
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
ELSE '' END responseLevelCode ELSE '' END responseLevelCode
FROM jc_alert_called a FROM jc_alert_called a
where a.is_delete=0 where a.is_delete=0
AND a.coordinate_x IS NOT NULL /* AND a.coordinate_x IS NOT NULL
AND a.coordinate_y IS NOT NULL AND a.coordinate_y IS NOT NULL*/
<if test='par.isAid == null '> <if test='par.isAid == null '>
and a.alert_type_code <![CDATA[ <> ]]> 1214 and a.alert_type_code <![CDATA[ <> ]]> 1214
</if> </if>
...@@ -330,14 +330,14 @@ ...@@ -330,14 +330,14 @@
</where>) b </where>) b
</select> </select>
<!--bug 8954 历史警情数据缺失 过滤了经纬度导致--> <!--bug 8954 历史警情数据缺失 过滤了经纬度导致
/* AND a.coordinate_x IS NOT NULL
AND a.coordinate_y IS NOT NULL*/-->
<select id="alertCalledListByAlertStatusCount" resultType="Integer"> <select id="alertCalledListByAlertStatusCount" resultType="Integer">
SELECT SELECT
COUNT(*) COUNT(*)
FROM jc_alert_called a FROM jc_alert_called a
where a.is_delete=0 and a.alert_type_code <![CDATA[ <> ]]> 1214 where a.is_delete=0 and a.alert_type_code <![CDATA[ <> ]]> 1214
AND a.coordinate_x IS NOT NULL
AND a.coordinate_y IS NOT NULL
<if test='par.status==0'> <if test='par.status==0'>
and a.alert_status =0 and a.alert_status =0
</if> </if>
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @ ca572120
...@@ -428,16 +428,16 @@ public class CommandController extends BaseController { ...@@ -428,16 +428,16 @@ public class CommandController extends BaseController {
} }
} }
//集结点坐标 //集结点坐标
par.setLatitudeTwo(alertCalled.getCoordinateX()); par.setLatitudeTwo(alertCalled.getCoordinateY());
par.setLongitudeTwo(alertCalled.getCoordinateY()); par.setLongitudeTwo(alertCalled.getCoordinateX());
break; break;
case "229"://一般火灾 case "229"://一般火灾
par.setLatitude(alertCalled.getCoordinateX()); par.setLatitude(alertCalled.getCoordinateY());
par.setLongitude(alertCalled.getCoordinateY()); par.setLongitude(alertCalled.getCoordinateX());
if (alertCalled.getAlertSourceCode().equals("1326")){ //警情来源为物联报警的 if (alertCalled.getAlertSourceCode().equals("1326")){ //警情来源为物联报警的
result = this.getDetailsById(Long.valueOf(alertCalled.getRelationId()),null,null,null); result = this.getDetailsById(Long.valueOf(alertCalled.getRelationId()),null,null,null);
par.setLatitudeTwo(alertCalled.getCoordinateX()); par.setLatitudeTwo(alertCalled.getCoordinateY());
par.setLongitudeTwo(alertCalled.getCoordinateY()); par.setLongitudeTwo(alertCalled.getCoordinateX());
}else { }else {
for (AlertFormValue alertFormValue : list) { for (AlertFormValue alertFormValue : list) {
if (alertFormValue.getFieldCode().equals(KEYSITE) && !StringUtils.isEmpty(alertFormValue.getFieldValueCode())) { if (alertFormValue.getFieldCode().equals(KEYSITE) && !StringUtils.isEmpty(alertFormValue.getFieldValueCode())) {
...@@ -448,8 +448,8 @@ public class CommandController extends BaseController { ...@@ -448,8 +448,8 @@ public class CommandController extends BaseController {
} }
break; break;
case "235": case "235":
par.setLatitude(alertCalled.getCoordinateX()); par.setLatitude(alertCalled.getCoordinateY());
par.setLongitude(alertCalled.getCoordinateY()); par.setLongitude(alertCalled.getCoordinateX());
break; break;
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireExpertsController.java
View file @ ca572120
...@@ -238,7 +238,10 @@ public class FireExpertsController extends BaseController { ...@@ -238,7 +238,10 @@ public class FireExpertsController extends BaseController {
// QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>(); // QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("type", type); // queryWrapper.eq("type", type);
// queryWrapper.orderByAsc("sort_num"); // queryWrapper.orderByAsc("sort_num");
if (StringUtils.isEmpty(bizOrgCode)){
ReginParams reginParams = getSelectedOrgInfo();
bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
}
Collection<DataDictionary> list = dataDictionaryService.getDataDictionaryAndCount(bizOrgCode); Collection<DataDictionary> list = dataDictionaryService.getDataDictionaryAndCount(bizOrgCode);
list.forEach(i->{ list.forEach(i->{
i.setName(i.getName()+" ("+i.getCount()+")"); i.setName(i.getName()+" ("+i.getCount()+")");
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingController.java
View file @ ca572120
...@@ -122,6 +122,14 @@ public class BuildingController extends AbstractBaseController { ...@@ -122,6 +122,14 @@ public class BuildingController extends AbstractBaseController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation("无权限消防建筑树")
@GetMapping(value = "/treeNoAuth")
public List<BuildingTreeVo> getBuildingTreeNoAuth() {
String bizOrgCode = "";
return buildService.getBuildingTree(bizOrgCode);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation("消防建筑树 查询所在单位下的建筑") @ApiOperation("消防建筑树 查询所在单位下的建筑")
@GetMapping(value = "/treeCompany") @GetMapping(value = "/treeCompany")
public List<BuildingTreeVo> getBuildingTreeCompany() { public List<BuildingTreeVo> getBuildingTreeCompany() {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @ ca572120
...@@ -656,7 +656,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -656,7 +656,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
if(alertWay.equals(AlertBusinessTypeEnum.警情结案.getCode())) { if(alertWay.equals(AlertBusinessTypeEnum.警情结案.getCode())) {
besidesMap.put("startTime", DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN)); besidesMap.put("startTime", DateUtils.dateFormat(alertCalled.getCallTime(), DateUtils.DATE_TIME_PATTERN));
besidesMap.put("endTime", DateUtils.dateFormat(alertCalled.getRecDate(), DateUtils.DATE_TIME_PATTERN)); besidesMap.put("endTime", DateUtils.dateFormat(alertCalled.getUpdateTime(), DateUtils.DATE_TIME_PATTERN));
pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情结案.getCode(),besidesMap,smsParams,usIds, null); pushPowerTransferToAppAndWeb(AlertBusinessTypeEnum.警情结案.getCode(),besidesMap,smsParams,usIds, null);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @ ca572120
...@@ -853,7 +853,7 @@ public class ExcelServiceImpl { ...@@ -853,7 +853,7 @@ public class ExcelServiceImpl {
} }
} }
if (map.containsKey(key) && map.get(key) != null){ if (map.containsKey(key) && map.get(key) != null){
if ("birthdayTime".equals(key) ) { if ("birthdayTime".equals(key) || "holdingTime".equals(key) ) {
Date o = (Date) map.get(key); Date o = (Date) map.get(key);
SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
String format = dtf.format(o); String format = dtf.format(o);
...@@ -868,13 +868,16 @@ public class ExcelServiceImpl { ...@@ -868,13 +868,16 @@ public class ExcelServiceImpl {
DynamicFormInstance dynamicFormInstance = new DynamicFormInstance(); DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance); BeanUtils.copyProperties(dynamicFormInstanceDto, dynamicFormInstance);
String fieldCode = dynamicFormInstance.getFieldCode();
if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
}
if ("gender".equals(dynamicFormInstance.getFieldCode())){ if ("gender".equals(dynamicFormInstance.getFieldCode())){
dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女"); dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
} }
if ("positionType".equals(dynamicFormInstance.getFieldCode())){ if ("positionType".equals(dynamicFormInstance.getFieldCode())){
dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName()); dynamicFormInstance.setFieldValueLabel(dataDictionaryService.getById(dynamicFormInstance.getFieldValue()).getName());
} }
String fieldCode = dynamicFormInstance.getFieldCode();
if ("certificatesTypeCode".equals(fieldCode)){ if ("certificatesTypeCode".equals(fieldCode)){
String[] split = map1.get(fieldCode).toString().split("@"); String[] split = map1.get(fieldCode).toString().split("@");
dynamicFormInstance.setFieldValue(split[1]); dynamicFormInstance.setFieldValue(split[1]);
...@@ -888,9 +891,6 @@ public class ExcelServiceImpl { ...@@ -888,9 +891,6 @@ public class ExcelServiceImpl {
String[] split = map1.get("nativePlace").toString().split("@"); String[] split = map1.get("nativePlace").toString().split("@");
dynamicFormInstance.setFieldValue(split[1]); dynamicFormInstance.setFieldValue(split[1]);
dynamicFormInstance.setFieldValueLabel(split[0]);} dynamicFormInstance.setFieldValueLabel(split[0]);}
if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4))){
dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
}
dynamicFormInstancelist.add(dynamicFormInstance); dynamicFormInstancelist.add(dynamicFormInstance);
}); });
...@@ -951,7 +951,7 @@ public class ExcelServiceImpl { ...@@ -951,7 +951,7 @@ public class ExcelServiceImpl {
String relationship = firefightersContacts.getRelationship().split("@")[1]; String relationship = firefightersContacts.getRelationship().split("@")[1];
firefightersContacts.setRelationship(relationship); firefightersContacts.setRelationship(relationship);
} }
if (!ObjectUtils.isEmpty(item.getPeopleType()) && item.getPeopleType().contains("@") && "2".equals(item.getPeopleType().split("@")[1])) { if (!ObjectUtils.isEmpty(item.getPeopleType()) && item.getPeopleType().contains("@") && "1601".equals(item.getPeopleType().split("@")[1])) {
// 保存消防队伍人员和紧急联系人 // 保存消防队伍人员和紧急联系人
Firefighters firefighters = new Firefighters(); Firefighters firefighters = new Firefighters();
firefighters = Bean.toPo(item, firefighters); firefighters = Bean.toPo(item, firefighters);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RuleAlertCalledService.java
View file @ ca572120
...@@ -202,6 +202,11 @@ public class RuleAlertCalledService { ...@@ -202,6 +202,11 @@ public class RuleAlertCalledService {
alertCalledRo.setSeatBz(alertFormValue.getFieldValue()); alertCalledRo.setSeatBz(alertFormValue.getFieldValue());
} }
//其他警情
if (alertFormValue.getFieldCode().equals("eventOverview")) {
alertCalledRo.setAccidentSituation(alertFormValue.getFieldValue());
}
//120 急救 //120 急救
if (alertFormValue.getFieldCode().equals("patientStatus")) { if (alertFormValue.getFieldCode().equals("patientStatus")) {
alertCalledRo.setPatientStatus(alertFormValue.getFieldValue()); alertCalledRo.setPatientStatus(alertFormValue.getFieldValue());
...@@ -218,9 +223,9 @@ public class RuleAlertCalledService { ...@@ -218,9 +223,9 @@ public class RuleAlertCalledService {
// 警情初报模板替换规则 // 警情初报模板替换规则
String replaceContent = ""; String replaceContent = "";
if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.YBHZ.getCode())) { if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.YBHZ.getCode())) {
replaceContent = "失火位置：".concat(ValidationUtil.isEmpty(alertCalledRo.getFireLocation()) ? "无": alertCalledRo.getFireLocation()).concat( replaceContent = "失火位置:".concat(ValidationUtil.isEmpty(alertCalledRo.getFireLocation()) ? "无": alertCalledRo.getFireLocation()).concat(
"；燃烧物质：").concat(ValidationUtil.isEmpty(alertCalledRo.getBurningMaterial() )? "无": alertCalledRo.getBurningMaterial()).concat( "，燃烧物质:").concat(ValidationUtil.isEmpty(alertCalledRo.getBurningMaterial() )? "无": alertCalledRo.getBurningMaterial()).concat(
"；火势情况：").concat(ValidationUtil.isEmpty(alertCalledRo.getFireSituation() ) ? "无" : alertCalledRo.getFireSituation()); "，火势情况:").concat(ValidationUtil.isEmpty(alertCalledRo.getFireSituation() ) ? "无" : alertCalledRo.getFireSituation());
} }
if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.HKJY.getCode())) { if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.HKJY.getCode())) {
...@@ -237,26 +242,28 @@ public class RuleAlertCalledService { ...@@ -237,26 +242,28 @@ public class RuleAlertCalledService {
} }
if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.TFSJ.getCode())) { if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.TFSJ.getCode())) {
replaceContent = "发生：".concat(ValidationUtil.isEmpty(alertCalledRo.getAccidentSituation()) ? "无": alertCalledRo.getAccidentSituation().concat("事件")); replaceContent = "".concat(ValidationUtil.isEmpty(alertCalledRo.getAccidentSituation()) ? "无": alertCalledRo.getAccidentSituation().concat("事件"));
} }
if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.LYXC.getCode())) { if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.LYXC.getCode())) {
replaceContent = "航班号：".concat(ValidationUtil.isEmpty(alertCalledRo.getFlightNumberLy()) ? "无": alertCalledRo.getFlightNumberLy()).concat( replaceContent = "航班号:".concat(ValidationUtil.isEmpty(alertCalledRo.getFlightNumberLy()) ? "无": alertCalledRo.getFlightNumberLy()).concat(
"；机位：").concat(ValidationUtil.isEmpty(alertCalledRo.getSeat() )? "无": alertCalledRo.getSeat()).concat( "，机位:").concat(ValidationUtil.isEmpty(alertCalledRo.getSeat() )? "无": alertCalledRo.getSeat()).concat(
"；漏油面积：").concat(ValidationUtil.isEmpty(alertCalledRo.getOilLeakageArea() ) ? "无" : alertCalledRo.getOilLeakageArea()); "，漏油面积:").concat(ValidationUtil.isEmpty(alertCalledRo.getOilLeakageArea() ) ? "无" : alertCalledRo.getOilLeakageArea());
} }
if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.ZJBZ.getCode())) { if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.ZJBZ.getCode())) {
replaceContent = "保障等级：".concat(ValidationUtil.isEmpty(alertCalledRo.getSecurityLevel()) ? "无": alertCalledRo.getSecurityLevel()).concat( replaceContent = "保障等级:".concat(ValidationUtil.isEmpty(alertCalledRo.getSecurityLevel()) ? "无": alertCalledRo.getSecurityLevel()).concat(
"；机位：").concat(ValidationUtil.isEmpty(alertCalledRo.getSeatBz() )? "无": alertCalledRo.getSeatBz()); "，机位:").concat(ValidationUtil.isEmpty(alertCalledRo.getSeatBz() )? "无": alertCalledRo.getSeatBz());
} }
if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.JJJQ.getCode())) { if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.JJJQ.getCode())) {
replaceContent = "患者现状：".concat(ValidationUtil.isEmpty(alertCalledRo.getPatientStatus()) ? "无": alertCalledRo.getPatientStatus()).concat( replaceContent = "患者现状:".concat(ValidationUtil.isEmpty(alertCalledRo.getPatientStatus()) ? "无": alertCalledRo.getPatientStatus()).concat(
"；性别：").concat(ValidationUtil.isEmpty(alertCalledRo.getGender() )? "无": alertCalledRo.getGender()).concat( "，性别:").concat(ValidationUtil.isEmpty(alertCalledRo.getGender() )? "无": alertCalledRo.getGender()).concat(
"；年龄段：").concat(ValidationUtil.isEmpty(alertCalledRo.getAgeGroup() ) ? "无" : alertCalledRo.getAgeGroup()); "，年龄段:").concat(ValidationUtil.isEmpty(alertCalledRo.getAgeGroup() ) ? "无" : alertCalledRo.getAgeGroup());
}
if(alertCalled.getAlertTypeCode().equals(AlertStageEnums.QTJQ.getCode())) {
replaceContent ="".concat(ValidationUtil.isEmpty(alertCalledRo.getAccidentSituation()) ? "无":alertCalledRo.getAccidentSituation()) ;
} }
return replaceContent; return replaceContent;
} }
......
amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml
View file @ ca572120
...@@ -496,9 +496,12 @@ ...@@ -496,9 +496,12 @@
GROUP BY id GROUP BY id
</when> </when>
</choose> </choose>
UNION
</if> </if>
SELECT ) AS a
</select>
<!--
UNION
SELECT
v.id AS id, v.id AS id,
v.name AS name, v.name AS name,
v.token AS token, v.token AS token,
...@@ -523,10 +526,7 @@ ...@@ -523,10 +526,7 @@
<if test="dto.type!=null and dto.type!=''"> <if test="dto.type!=null and dto.type!=''">
and v.type =#{dto.type} and v.type =#{dto.type}
</if> </if>
GROUP BY id GROUP BY id-->
) AS a
</select>
<select id="pageVideoListByAlert" resultType="com.yeejoin.equipmanage.common.entity.vo.VideoListVo"> <select id="pageVideoListByAlert" resultType="com.yeejoin.equipmanage.common.entity.vo.VideoListVo">
SELECT SELECT
a.* a.*
...@@ -623,13 +623,13 @@ ...@@ -623,13 +623,13 @@
union union
SELECT SELECT
v.id AS id, v.id AS id,
v.NAME AS NAME,
v.token AS token,
v.url AS url,
v.CODE AS CODE, v.CODE AS CODE,
v.url AS url,
v.token AS token,
v.NAME AS NAME,
v.address, v.address,
v.longitude, v.longitude,
'' as distance, '' AS distance,
v.latitude v.latitude
FROM wl_video v FROM wl_video v
JOIN wl_video_source vc ON vc.video_id = v.id JOIN wl_video_source vc ON vc.video_id = v.id
...@@ -713,13 +713,13 @@ ...@@ -713,13 +713,13 @@
union union
SELECT SELECT
v.id AS id, v.id AS id,
v.NAME AS NAME,
v.token AS token,
v.url AS url,
v.CODE AS CODE, v.CODE AS CODE,
v.url AS url,
v.token AS token,
v.NAME AS NAME,
v.address, v.address,
v.longitude, v.longitude,
'' as distance, '' AS distance,
v.latitude v.latitude
FROM wl_video v FROM wl_video v
JOIN wl_video_source vc ON vc.video_id = v.id JOIN wl_video_source vc ON vc.video_id = v.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment