Skip to content

A
amos-boot-biz
Commit f63d2e82 authored by 李腾威's avatar 李腾威
Browse files
Options

任务 4457

parent 5c6a3ac0
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 3 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerData.java
View file @ f63d2e82
package com.yeejoin.amos.boot.module.jcs.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -8,7 +9,6 @@ import lombok.Data;
@ApiModel(value = "PowerData", description = "力量信息")
public class PowerData {
@ApiModelProperty(value = "所属单位")
private String companyName;
@ApiModelProperty(value = "车辆名称")
......@@ -17,4 +17,12 @@ public class PowerData {
private String carNum;
@ApiModelProperty(value = "随车人员")
private String user;
@ApiModelProperty(value = "随车人员岗位")
private String postTypeName;
@ApiModelProperty(value = "任务详情")
private String taskInformation;
@ApiModelProperty(value = "警情id")
private String alertCallId;
@ApiModelProperty(value = "车辆id")
private String resourcesId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/PowerTransferCompanyResources.java
View file @ f63d2e82
......@@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.List;
/**
* 调派单位资源
*
......@@ -56,4 +60,16 @@ public class PowerTransferCompanyResources extends BaseEntity {
@ApiModelProperty(value = "车辆任务")
@TableField(exist = false)
private String carStatusName;
@ApiModelProperty(value = "随车人员")
@TableField(exist = false)
private String pw;
@ApiModelProperty(value = "任务详情")
@TableField(exist = false)
private String taskInformation;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferMapper.java
View file @ f63d2e82
......@@ -73,6 +73,13 @@ public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
List<PowerData> getPowerDataList(@Param("id") Long id);
List<PowerData> getPowerDataOne(@Param("carId") Long carId);
PowerData getPowerDataOther(@Param("alertId") Long alertId,@Param("carId") Long carId);
List<PowerData> getPowerDataCar(@Param("carNum") String carNum);
/**
* * @param null
* @return
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml
View file @ f63d2e82
......@@ -174,7 +174,55 @@
a.alert_called_id = ${id}
</select>
<select id="getPowerDataOne" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerData">
select * from (
select cb.sequence_nbr,cb.duty_date,a.carId,c.userName as user,d.postTypeName from cb_duty_person_shift cb
left join (select i.instance_id id1 ,if(i.field_code = 'carId',
i.field_value, null) as 'carId' from cb_dynamic_form_instance i
where i.field_code = 'carId' and i.field_value is not null and i.field_value != '') a
on cb.instance_id = a.id1
left join (select i.instance_id id3 ,if(i.field_code = 'userName',
i.field_value, null) as 'userName' from cb_dynamic_form_instance i
where i.field_code = 'userName' and i.field_value is not null) c
on cb.instance_id = c.id3
left join (
select i.instance_id id4 ,if(i.field_code = 'postTypeName',
i.field_value, null) as 'postTypeName' from cb_dynamic_form_instance i
where i.field_code = 'postTypeName' and i.field_value is not null) d
on cb.instance_id = d.id4
) u where
to_days(u.duty_date) = to_days(now())
and u.carId = ${carId}
</select>
<select id="getPowerDataOther" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerData">
SELECT distinct
b.task_information
FROM
jc_power_transfer a
LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
WHERE
a.alert_called_id = ${alertId} and c.resources_id = ${carId}
</select>
<select id="getPowerDataCar" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerData">
SELECT distinct
a.rec_date,
a.alert_called_id alertCallId,
b.company_name companyName,
c.resources_name carName,
c.resources_num carNum,
c.resources_id resourcesId,
b.task_information
FROM
jc_power_transfer a
LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
where c.resources_num = #{carNum}
and to_days(a.rec_date) = to_days(now())
order by a.rec_date desc
</select>
......
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 @ f63d2e82
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.command.biz.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
......@@ -1382,6 +1383,68 @@ public class CommandController extends BaseController {
return ResponseHelper.buildResponse(powerTransferCompanyResources);
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "getPowerTransferCompanyResourcesServiceNew", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取当前任务，车辆状态,随车人员，任务详情", notes = "获取当前任务，车辆状态,随车人员，任务详情")
public ResponseModel<Object> getPowerTransferCompanyResourcesNewService(@RequestParam String id
) {
PowerTransferCompanyResources powerTransferCompanyResources;
// 根据车牌查询车辆调派信息级警情id
List<PowerData> pw = powerTransferMapper.getPowerDataCar(id);
if(null != pw && pw.size() > 0) {
Long alertCalledId = Long.valueOf(pw.get(0).getAlertCallId());
Long carid = Long.valueOf(pw.get(0).getResourcesId());
//获取正在进行的灾情
powerTransferCompanyResources = powerTransferCompanyResourcesService.getByAlertCalledIdCarId(alertCalledId, carid);
// 随车人员
List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(carid);
if(!ValidationUtil.isEmpty(powerDataOne)) {
String str = "";
String newStr = "";
for(int i = 0; i < powerDataOne.size(); i++ ) {
newStr = str.concat(powerDataOne.get(i).getPostTypeName()).concat(":").concat(powerDataOne.get(i).getUser());
}
powerTransferCompanyResources.setPw(newStr);
} else {
powerTransferCompanyResources.setPw("无");
}
//任务详情
PowerData powerData = powerTransferMapper.getPowerDataOther(alertCalledId,carid);
if(null != powerData) {
powerTransferCompanyResources.setTaskInformation(powerData.getTaskInformation());
}
} else {
LambdaQueryWrapper<PowerTransferCompanyResources> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PowerTransferCompanyResources::getResourcesNum,id);
powerTransferCompanyResources = powerTransferCompanyResourcesMapper.selectOne(queryWrapper);
if(!ValidationUtil.isEmpty(powerTransferCompanyResources)) {
// 随车人员
List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(Long.valueOf(powerTransferCompanyResources.getResourcesId()));
if(!ValidationUtil.isEmpty(powerDataOne)) {
String str = "";
String newStr = "";
for(int i = 0; i < powerDataOne.size(); i++ ) {
newStr = str.concat(powerDataOne.get(i).getPostTypeName()).concat(":").concat(powerDataOne.get(i).getUser());
}
powerTransferCompanyResources.setPw(newStr);
} else {
powerTransferCompanyResources.setPw("无");
}
powerTransferCompanyResources.setStatusName("无任务");
powerTransferCompanyResources.setCarStatusName(FireCarStatusEnum.getEnum(powerTransferCompanyResources.getCarStatus()).getName());
powerTransferCompanyResources.setTaskInformation("无");
}
}
return ResponseHelper.buildResponse(powerTransferCompanyResources);
}
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "updatePowerTransferCompanyResourcesService", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "修改任务，车辆状态", notes = "修改任务，车辆状态")
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @ f63d2e82
......@@ -154,7 +154,7 @@ public class OrgUsrController extends BaseController {
* @return
*/
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@RequestMapping(value = "/getUnit/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取单位详情", notes = "获取单位详情")
public ResponseModel<OrgUsrFormDto> selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(id));
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java
View file @ f63d2e82
......@@ -244,6 +244,7 @@ public class AlertSubmittedController extends BaseController {
definitions.put("$callTime", DateUtils.dateTimeToDateString(alertCalled.getCallTime()));
definitions.put("$replaceContent",replaceContent);
definitions.put("$address",alertCalled.getAddress());
definitions.put("$recDate",DateUtils.convertDateToString(alertCalled.getRecDate(),DateUtils.DATE_TIME_PATTERN));
String content = getTaskInformation( schedulingContent.getSubmissionTemplate(),definitions);
schedulingContent.setSubmissionTemplate(content);
if(!ValidationUtil.isEmpty(schedulingContent.getSubmissionContent())) {
......
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 @ f63d2e82
......@@ -701,7 +701,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
definitions.put("$callTime",DateUtils.dateTimeToDateString(alertCalled.getCallTime()));
definitions.put("$replaceContent",replaceContent);
definitions.put("$address",alertCalled.getAddress());
definitions.put("$recDate",DateUtils.getDateNowString());
definitions.put("$recDate",DateUtils.convertDateToString(alertCalled.getRecDate(),DateUtils.DATE_TIME_PATTERN));
String content = getTaskInformation( template.getContent(),definitions);
template.setContent(content);
TemplateDto templateDto = new TemplateDto();
......
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