Skip to content

A
amos-boot-biz
Commit a98a89be authored by 付培阳's avatar 付培阳
Browse files
Options

获取融合调度记录短信详情

parent aa4ee886
Hide whitespace changes
Inline Side-by-side
Showing with 314 additions and 172 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertSubmittedMapper.java
View file @ a98a89be
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -30,4 +31,13 @@ public interface AlertSubmittedMapper extends BaseMapper<AlertSubmitted> {
* @return
*/
List<AlertSubmittedExtVo> listReportingByParam(@Param("alertSubmittedDto") AlertSubmittedDto alertSubmittedDto);
/**
* 获取融合调度短信内容
* @param id id
* @return 返回结果
*/
AlertSubmittedSMSVo getSchedulingContent(@Param("id") Long id);
}
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 @ a98a89be
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
import java.util.List;
......@@ -14,4 +15,6 @@ import java.util.List;
*/
public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
List<PowerTransferCompanyResourcesVo> getPowerTransferList(Long alertCalledId);
List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertSubmittedService.java
View file @ a98a89be
package com.yeejoin.amos.boot.module.jcs.api.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
/**
......@@ -9,7 +12,7 @@ import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
* @author tb
* @date 2021-06-17
*/
public interface IAlertSubmittedService {
public interface IAlertSubmittedService extends IService<AlertSubmitted> {
/**
* 根据参数查询融合调度记录
......@@ -34,4 +37,6 @@ public interface IAlertSubmittedService {
* @return
*/
Boolean save(AlertSubmittedDto alertSubmittedDto);
AlertSubmittedSMSVo getSchedulingContent(Long id);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java
View file @ a98a89be
package com.yeejoin.amos.boot.module.jcs.api.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
import java.util.List;
/**
* 力量调派 服务类
*
* @author tb
* @date 2021-06-17
*/
public interface IPowerTransferService {
public interface IPowerTransferService extends IService<PowerTransfer> {
PowerTransferVo getPowerTransferList(Long alertCalledId);
boolean createPowerTransfer(PowerTransferDto powerTransferDto);
List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertSubmittedSMSVo.java 0 → 100644
View file @ a98a89be
package com.yeejoin.amos.boot.module.jcs.api.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 警情报送记录
*
* @author tb
* @date 2021-06-17
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "AlertSubmittedSMSVo", description = "融合调度记录短信详情")
public class AlertSubmittedSMSVo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "短信记录id")
private Long sequenceNbr;
@ApiModelProperty(value = "电话时间")
private Date submissionTime;
@ApiModelProperty(value = "联系电话")
private String userPhone;
@ApiModelProperty(value = "协调单位")
private String companyName;
@ApiModelProperty(value = "联系人")
private String userName;
@ApiModelProperty(value = "值班员")
private String sender;
@ApiModelProperty(value = "报送内容")
private String submissionContent;
@ApiModelProperty(value = "报送模板")
private String submissionTemplate;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/PowerTransferCompanyVo.java
View file @ a98a89be
......@@ -5,37 +5,33 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 调派单位
*
* @author tb
* @date 2021-06-17
*/
* 调派单位
*
* @author tb
* @date 2021-06-17
*/
@Data
@Accessors(chain = true)
@TableName("jc_power_transfer_company")
@ApiModel(value="PowerTransferCompanyVo", description="调派单位")
public class PowerTransferCompanyVo{
@ApiModel(value = "PowerTransferCompanyVo", description = "调派单位")
public class PowerTransferCompanyVo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "调派单据id")
private Long powerTransferId;
@ApiModelProperty(value = "是否只派发机构")
private Boolean isDistributionAgencies;
@ApiModelProperty(value = " 单位id")
private Long companyId;
@ApiModelProperty(value = " 单位名称")
private String companyName;
@ApiModelProperty(value = "任务信息")
private String taskInformation;
@ApiModelProperty(value = "资源类型")
private String type;
@ApiModelProperty(value = "资源数量")
private Integer resourcesCount;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
@ApiModelProperty(value = "时间")
private Date recDate;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertSubmittedMapper.xml
View file @ a98a89be
......@@ -62,4 +62,19 @@
</if>
group by jaso.alert_submitted_id
</select>
<select id="getSchedulingContent" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo">
select s.sequence_nbr,
submission_time,
user_phone,
company_name,
user_name,
s.sender,
submission_content,
content submission_template
from jc_alert_submitted_object o
left join jc_alert_submitted s on o.alert_submitted_id = s.sequence_nbr
left join jc_template t on s.business_type = t.type
where o.sequence_nbr = ${id}
</select>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml
View file @ a98a89be
......@@ -3,7 +3,7 @@
<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper">
<select id="getPowerTransferList"
resultType="com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo">
select sequence_nbr,company_name, type, resources_num
select sequence_nbr, company_name, type, resources_num
from (
select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
from jc_power_transfer_company ptc
......@@ -21,4 +21,18 @@
) jcpt
order by rec_date desc
</select>
<select id="getLastPowerTransferCompany"
resultType="com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo">
select company_name, type, count(resources_num) resourcesCount, rec_date
from (select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
from jc_power_transfer_company ptc
left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
right join jc_power_transfer_company_resources ptcr
on ptcr.power_transfer_company_id = ptc.sequence_nbr
where pt.alert_called_id = '63453543'
and ptc.is_distribution_agencies = 0) r
group by company_name, type, rec_date
having rec_date = (select rec_date from jc_power_transfer_company_resources order by rec_date desc limit 1)
</select>
</mapper>
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 @ a98a89be
package com.yeejoin.amos.boot.module.jcs.biz.controller;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
import com.yeejoin.amos.boot.module.jcs.api.entity.Template;
import com.yeejoin.amos.boot.module.jcs.api.entity.*;
import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.TemplateVo;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.TemplateServiceImpl;
import com.yeejoin.amos.boot.module.jcs.api.vo.*;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.util.*;
/**
......@@ -55,24 +38,33 @@ import io.swagger.annotations.ApiOperation;
public class AlertSubmittedController extends BaseController {
@Autowired
AlertSubmittedServiceImpl iAlertSubmittedService;
AlertSubmittedServiceImpl alertSubmittedService;
@Autowired
TemplateServiceImpl templateService;
@Autowired
AlertCalledServiceImpl alertCalledService;
@Autowired
TemplateServiceImpl iTemplateService;
DataDictionaryServiceImpl dataDictionaryService;
@Autowired
AlertCalledServiceImpl iAlertCalledService;
PowerTransferServiceImpl powerTransferService;
/**
* 新增警情报送记录
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增警情报送记录", notes = "新增警情报送记录")
public ResponseModel<Object> saveAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmittedDto alertSubmittedDto) {
return ResponseHelper.buildResponse(iAlertSubmittedService.save(alertSubmittedDto));
public ResponseModel<Object> saveAlertSubmitted(HttpServletRequest request,
@RequestBody AlertSubmittedDto alertSubmittedDto) {
return ResponseHelper.buildResponse(alertSubmittedService.save(alertSubmittedDto));
}
/**
......@@ -81,11 +73,14 @@ public class AlertSubmittedController extends BaseController {
* @param id
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public ResponseModel<Boolean> deleteById(HttpServletRequest request, @PathVariable Long id){
return ResponseHelper.buildResponse(iAlertSubmittedService.removeById(id));
public ResponseModel<Boolean> deleteById(HttpServletRequest request, @PathVariable Long id) {
return ResponseHelper.buildResponse(alertSubmittedService.removeById(id));
}
/**
......@@ -93,11 +88,15 @@ public class AlertSubmittedController extends BaseController {
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改警情报送记录", notes = "修改警情报送记录")
public ResponseModel<Boolean> updateByIdAlertSubmitted(HttpServletRequest request, @RequestBody AlertSubmitted alertSubmitted){
return ResponseHelper.buildResponse(iAlertSubmittedService.updateById(alertSubmitted));
public ResponseModel<Boolean> updateByIdAlertSubmitted(HttpServletRequest request,
@RequestBody AlertSubmitted alertSubmitted) {
return ResponseHelper.buildResponse(alertSubmittedService.updateById(alertSubmitted));
}
/**
......@@ -106,27 +105,30 @@ public class AlertSubmittedController extends BaseController {
* @param id
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel<AlertSubmitted> selectById(HttpServletRequest request, @PathVariable Long id){
return ResponseHelper.buildResponse(iAlertSubmittedService.getById(id));
public ResponseModel<AlertSubmitted> selectById(HttpServletRequest request, @PathVariable Long id) {
return ResponseHelper.buildResponse(alertSubmittedService.getById(id));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/scheduling/list", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "根据警情id查询融合调度列表", notes = "根据警情id查询融合调度列表")
public ResponseModel<SchedulingReportingVo> listSchedulingByParam(@RequestBody AlertSubmittedDto queryParam) {
queryParam.setSubmissionMethodCode(SubmissionMethodEnum.SMS.getCode());
return ResponseHelper.buildResponse(iAlertSubmittedService.listSchedulingByParam(queryParam));
return ResponseHelper.buildResponse(alertSubmittedService.listSchedulingByParam(queryParam));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/reporting/list", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "根据警情id查询警情报送列表", notes = "根据警情id查询警情报送列表")
public ResponseModel<SchedulingReportingVo> listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
queryParam.setSubmissionMethodCode(SubmissionMethodEnum.SMS.getCode());
return ResponseHelper.buildResponse(iAlertSubmittedService.listReportingByParam(queryParam));
return ResponseHelper.buildResponse(alertSubmittedService.listReportingByParam(queryParam));
}
/**
......@@ -134,10 +136,11 @@ public class AlertSubmittedController extends BaseController {
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
public IPage<AlertSubmitted> listPage(String pageNum, String pageSize, AlertSubmitted alertSubmitted) {
Page<AlertSubmitted> pageBean;
QueryWrapper<AlertSubmitted> alertSubmittedQueryWrapper = new QueryWrapper<>();
Class<? extends AlertSubmitted> aClass = alertSubmitted.getClass();
......@@ -175,80 +178,44 @@ public class AlertSubmittedController extends BaseController {
} else {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = iAlertSubmittedService.page(pageBean, alertSubmittedQueryWrapper);
page = alertSubmittedService.page(pageBean, alertSubmittedQueryWrapper);
return page;
}
/**
* 获取警情续报内容
*
* @param alertCalledId
* @return
* @param alertCalledId 警情id
* @return 返回结果
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{alertCalledId}/alert_submitted", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取警情续报内容", notes = "获取警情续报内容")
@ApiOperation(httpMethod = "GET", value = "获取警情续报内容和模板", notes = "获取警情续报内容和模板")
public ResponseModel<Object> getAlertSubmittedContent(@PathVariable Long alertCalledId) {
ArrayList<TemplateVo> templateVos = new ArrayList<>();
try {
// 获取警情详情
String companyName = getSelectedOrgInfo().getCompany().getCompanyName();
AlertCalled alertCalled = iAlertCalledService.getById(alertCalledId);
Map<String, Object> map = objectToMap(alertCalled);
map.put("companyName", companyName);
// 获取模板内容
// 警情续报
Template template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type_code", "alert_submitted"));
TemplateVo templateVo = new TemplateVo();
BeanUtils.copyProperties(template, templateVo);
templateVo.setData(map);
templateVos.add(templateVo);
// 非警情确认
template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type_code", "not_alert"));
templateVo = new TemplateVo();
BeanUtils.copyProperties(template, templateVo);
templateVo.setData(map);
templateVos.add(templateVo);
// 警情结案
template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type_code", "alert_close"));
templateVo = new TemplateVo();
BeanUtils.copyProperties(template, templateVo);
templateVo.setData(map);
templateVos.add(templateVo);
alertSubmittedService.getAlertSubmittedContent(alertCalledId, templateVos, companyName);
} catch (IllegalAccessException e) {
e.printStackTrace();
throw new RuntimeException("系统异常");
}
return ResponseHelper.buildResponse(templateVos);
}
/**
* 将Object对象里面的属性和值转化成Map对象
* 获取融合调度短信内容
*
* @param obj
* @return
* @throws IllegalAccessException
* @param id id
* @return 返回结果
*/
@SuppressWarnings("unchecked")
public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
Map<String, Object> map = new HashMap<>();
Class<?> clazz = obj.getClass();
Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) {
field.setAccessible(true);
String fieldName = field.getName();
if ("dynamicFormAlert".equalsIgnoreCase(fieldName)) {
List<FormValue> dynamicFormAlert = (List<FormValue>) field.get(obj);
for (FormValue formValue : dynamicFormAlert) {
map.put(formValue.getLabel(), formValue.getValue());
}
} else {
Object value = field.get(obj);
map.put(fieldName, value);
}
}
return map;
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}/scheduling_content", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取融合调度短信内容", notes = "获取融合调度短信内容")
public ResponseModel<AlertSubmittedSMSVo> getSchedulingContent(@PathVariable Long id) {
// 获取报送内容
AlertSubmittedSMSVo schedulingContent = alertSubmittedService.getSchedulingContent(id);
return ResponseHelper.buildResponse(schedulingContent);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferCompanyController.java
View file @ a98a89be
......@@ -36,7 +36,7 @@ import io.swagger.annotations.ApiOperation;
public class PowerTransferCompanyController extends BaseController {
@Autowired
PowerTransferCompanyServiceImpl iPowerTransferCompanyService;
PowerTransferCompanyServiceImpl powerTransferCompanyService;
/**
* 新增调派单位
......@@ -47,7 +47,7 @@ public class PowerTransferCompanyController extends BaseController {
@RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增调派单位", notes = "新增调派单位")
public boolean savePowerTransferCompany(@RequestBody PowerTransferCompany powerTransferCompany) {
return iPowerTransferCompanyService.save(powerTransferCompany);
return powerTransferCompanyService.save(powerTransferCompany);
}
/**
......@@ -60,7 +60,7 @@ public class PowerTransferCompanyController extends BaseController {
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(@PathVariable Long id) {
return iPowerTransferCompanyService.removeById(id);
return powerTransferCompanyService.removeById(id);
}
......@@ -73,7 +73,7 @@ public class PowerTransferCompanyController extends BaseController {
@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改调派单位", notes = "修改调派单位")
public boolean updateByIdPowerTransferCompany(@RequestBody PowerTransferCompany powerTransferCompany) {
return iPowerTransferCompanyService.updateById(powerTransferCompany);
return powerTransferCompanyService.updateById(powerTransferCompany);
}
......@@ -87,7 +87,7 @@ public class PowerTransferCompanyController extends BaseController {
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public PowerTransferCompany selectById(@PathVariable Long id) {
return iPowerTransferCompanyService.getById(id);
return powerTransferCompanyService.getById(id);
}
......@@ -136,7 +136,7 @@ public class PowerTransferCompanyController extends BaseController {
} else {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = iPowerTransferCompanyService.page(pageBean, powerTransferCompanyQueryWrapper);
page = powerTransferCompanyService.page(pageBean, powerTransferCompanyQueryWrapper);
return page;
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferCompanyResourcesController.java
View file @ a98a89be
......@@ -36,7 +36,7 @@ import io.swagger.annotations.ApiOperation;
public class PowerTransferCompanyResourcesController extends BaseController {
@Autowired
PowerTransferCompanyResourcesServiceImpl iPowerTransferCompanyResourcesService;
PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
/**
* 新增调派单位资源
......@@ -47,7 +47,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
@RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增调派单位资源", notes = "新增调派单位资源")
public boolean savePowerTransferCompanyResources(@RequestBody PowerTransferCompanyResources powerTransferCompanyResources) {
return iPowerTransferCompanyResourcesService.save(powerTransferCompanyResources);
return powerTransferCompanyResourcesService.save(powerTransferCompanyResources);
}
/**
......@@ -60,7 +60,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(@PathVariable Long id) {
return iPowerTransferCompanyResourcesService.removeById(id);
return powerTransferCompanyResourcesService.removeById(id);
}
......@@ -73,7 +73,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改调派单位资源", notes = "修改调派单位资源")
public boolean updateByIdPowerTransferCompanyResources(@RequestBody PowerTransferCompanyResources powerTransferCompanyResources) {
return iPowerTransferCompanyResourcesService.updateById(powerTransferCompanyResources);
return powerTransferCompanyResourcesService.updateById(powerTransferCompanyResources);
}
......@@ -87,7 +87,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public PowerTransferCompanyResources selectById(@PathVariable Long id) {
return iPowerTransferCompanyResourcesService.getById(id);
return powerTransferCompanyResourcesService.getById(id);
}
......@@ -136,7 +136,7 @@ public class PowerTransferCompanyResourcesController extends BaseController {
} else {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = iPowerTransferCompanyResourcesService.page(pageBean, powerTransferCompanyResourcesQueryWrapper);
page = powerTransferCompanyResourcesService.page(pageBean, powerTransferCompanyResourcesQueryWrapper);
return page;
}
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferController.java
View file @ a98a89be
......@@ -40,7 +40,7 @@ import io.swagger.annotations.ApiOperation;
public class PowerTransferController extends BaseController {
@Autowired
PowerTransferServiceImpl iPowerTransferService;
PowerTransferServiceImpl powerTransferService;
/**
......@@ -52,7 +52,7 @@ public class PowerTransferController extends BaseController {
@RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增力量调派", notes = "新增力量调派")
public boolean savePowerTransfer(@RequestBody PowerTransfer powerTransfer) {
return iPowerTransferService.save(powerTransfer);
return powerTransferService.save(powerTransfer);
}
/**
......@@ -65,7 +65,7 @@ public class PowerTransferController extends BaseController {
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
public boolean deleteById(@PathVariable Long id) {
return iPowerTransferService.removeById(id);
return powerTransferService.removeById(id);
}
......@@ -78,7 +78,7 @@ public class PowerTransferController extends BaseController {
@RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改力量调派", notes = "修改力量调派")
public boolean updateByIdPowerTransfer(@RequestBody PowerTransfer powerTransfer) {
return iPowerTransferService.updateById(powerTransfer);
return powerTransferService.updateById(powerTransfer);
}
......@@ -92,7 +92,7 @@ public class PowerTransferController extends BaseController {
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public PowerTransfer selectById(@PathVariable Long id) {
return iPowerTransferService.getById(id);
return powerTransferService.getById(id);
}
/**
......@@ -139,7 +139,7 @@ public class PowerTransferController extends BaseController {
} else {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = iPowerTransferService.page(pageBean, powerTransferQueryWrapper);
page = powerTransferService.page(pageBean, powerTransferQueryWrapper);
return page;
}
......@@ -152,7 +152,7 @@ public class PowerTransferController extends BaseController {
@RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表")
public ResponseModel<PowerTransferVo> list(@PathVariable String alert_called_id) {
PowerTransferVo powerTransferVo = iPowerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
PowerTransferVo powerTransferVo = powerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
return ResponseHelper.buildResponse(powerTransferVo);
}
......@@ -164,7 +164,7 @@ public class PowerTransferController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/create", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "力量调派-任务派发", notes = "力量调派-任务派发")
public ResponseModel<Object> createPowerTransfer(@RequestBody PowerTransferDto powerTransferDto) {
public ResponseModel<Boolean> createPowerTransfer(@RequestBody PowerTransferDto powerTransferDto) {
AgencyUserModel userInfo = getUserInfo();
powerTransferDto.setTaskSenderId(Long.parseLong(userInfo.getUserId()));
powerTransferDto.setTaskSenderName(userInfo.getUserName());
......@@ -172,7 +172,7 @@ public class PowerTransferController extends BaseController {
String companyName = getSelectedOrgInfo().getCompany().getCompanyName();
powerTransferDto.setCompanyName(companyName);
boolean save = iPowerTransferService.createPowerTransfer(powerTransferDto);
boolean save = powerTransferService.createPowerTransfer(powerTransferDto);
return ResponseHelper.buildResponse(save);
}
}
......
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 @ a98a89be
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmittedObject;
import com.yeejoin.amos.boot.module.jcs.api.entity.*;
import com.yeejoin.amos.boot.module.jcs.api.enums.AlertBusinessTypeEnum;
import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSchedulingTypeEnum;
import com.yeejoin.amos.boot.module.jcs.api.enums.AlertSubmitTypeEnum;
......@@ -12,14 +12,14 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
import java.util.Optional;
import java.lang.reflect.Field;
import java.util.*;
/**
* 警情报送记录 服务实现类
......@@ -34,6 +34,14 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
IAlertSubmittedObjectService iAlertSubmittedObjectService;
@Autowired
AlertSubmittedObjectServiceImpl alertSubmittedObjectServiceImpl;
@Autowired
AlertCalledServiceImpl alertCalledService;
@Autowired
DataDictionaryServiceImpl dataDictionaryService;
@Autowired
TemplateServiceImpl templateService;
@Autowired
PowerTransferServiceImpl powerTransferService;
@Override
public SchedulingReportingVo listSchedulingByParam(AlertSubmittedDto queryParam) {
......@@ -113,4 +121,71 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
// 调用平台短信发送接口发送消息
return true;
}
public void getAlertSubmittedContent(Long alertCalledId, ArrayList<TemplateVo> templateVos, String companyName) throws IllegalAccessException {
AlertCalled alertCalled = alertCalledService.getById(alertCalledId);
Map<String, Object> map = objectToMap(alertCalled);
map.put("companyName", companyName);
// 获取模板内容
List<DataDictionary> dataDictionaries =
dataDictionaryService.list(new QueryWrapper<DataDictionary>().eq("type",
"JQBSLX"));
for (DataDictionary dataDictionary : dataDictionaries) {
Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code",
dataDictionary.getCode()));
List<PowerTransferCompanyVo> lastPowerTransferCompany;
powerTransferService.getLastPowerTransferCompany(alertCalledId);
if ("警情续报".equals(template.getType()) && (lastPowerTransferCompany =
powerTransferService.getLastPowerTransferCompany(alertCalledId)).size() > 0) {
// 获取力量调派内容
StringBuilder companyNames = new StringBuilder();
StringBuilder resourcesInfo = new StringBuilder();
for (PowerTransferCompanyVo powerTransferCompanyVo : lastPowerTransferCompany) {
companyNames.append(powerTransferCompanyVo.getCompanyName()).append("、");
resourcesInfo.append(powerTransferCompanyVo.getType()).append(powerTransferCompanyVo.getResourcesCount()).append("辆、");
}
map.put("companyNames", companyNames.deleteCharAt(companyNames.length() - 1).toString());
map.put("resourcesInfo", resourcesInfo.deleteCharAt(resourcesInfo.length() - 1).toString());
}
TemplateVo templateVo = new TemplateVo();
BeanUtils.copyProperties(template, templateVo);
templateVo.setData(map);
templateVos.add(templateVo);
}
}
/**
* 将Object对象里面的属性和值转化成Map对象
*
* @param obj 源对象
* @return 转化结果
* @throws IllegalAccessException IllegalAccessException
*/
@SuppressWarnings("unchecked")
public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
Map<String, Object> map = new HashMap<>();
Class<?> clazz = obj.getClass();
Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) {
field.setAccessible(true);
String fieldName = field.getName();
if ("dynamicFormAlert".equalsIgnoreCase(fieldName)) {
List<FormValue> dynamicFormAlert = (List<FormValue>) field.get(obj);
for (FormValue formValue : dynamicFormAlert) {
map.put(formValue.getLabel(), formValue.getValue());
}
} else {
Object value = field.get(obj);
map.put(fieldName, value);
}
}
return map;
}
@Override
public AlertSubmittedSMSVo getSchedulingContent(Long id) {
return this.baseMapper.getSchedulingContent(id);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @ a98a89be
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.*;
import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.*;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
......@@ -16,7 +17,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -29,29 +29,26 @@ import java.util.Map;
* @date 2021-06-17
*/
@Service
public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,PowerTransfer,PowerTransferMapper> implements IPowerTransferService {
@Resource
PowerTransferMapper powerTransferMapper;
public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, PowerTransfer, PowerTransferMapper> implements IPowerTransferService {
@Autowired
AlertCalledServiceImpl iAlertCalledService;
AlertCalledServiceImpl alertCalledService;
@Autowired
PowerTransferCompanyServiceImpl iPowerTransferCompanyService;
PowerTransferCompanyServiceImpl powerTransferCompanyService;
@Autowired
PowerTransferCompanyResourcesServiceImpl iPowerTransferCompanyResourcesService;
PowerTransferCompanyResourcesServiceImpl powerTransferCompanyResourcesService;
@Autowired
TemplateServiceImpl iTemplateService;
TemplateServiceImpl templateService;
@Autowired
AlertFormValueServiceImpl iAlertFormValueService;
AlertFormValueServiceImpl alertFormValueService;
public PowerTransferVo getPowerTransferList(Long alertCalledId) {
List<PowerTransferCompanyResourcesVo> powerTransferList =
powerTransferMapper.getPowerTransferList(alertCalledId);
this.baseMapper.getPowerTransferList(alertCalledId);
PowerTransferVo powerTransferVo = new PowerTransferVo();
int resourcesCount = powerTransferList.size();
powerTransferVo.setResourcesCount(resourcesCount);
......@@ -68,7 +65,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
String dispatch_num = alertCalledId.toString() + (count + 1);
// 获取警情详情
AlertCalled alertCalled = iAlertCalledService.getById(alertCalledId);
AlertCalled alertCalled = alertCalledService.getById(alertCalledId);
// 创建力量调派
PowerTransfer powerTransfer = new PowerTransfer();
......@@ -81,7 +78,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
// 获取任务派发模板
Template template = iTemplateService.getOne(new QueryWrapper<Template>().eq("type",
Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
alertCalled.getAlertType()));
String content = template.getContent();
Map<String, String> definitions = new HashMap<>();
......@@ -106,7 +103,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
private void initDefinitions(Map<String, String> definitions,
AlertCalled alertCalled, PowerTransferDto powerTransferDto) {
List<AlertFormValue> alertFormValue = iAlertFormValueService.list(new QueryWrapper<AlertFormValue>().eq(
List<AlertFormValue> alertFormValue = alertFormValueService.list(new QueryWrapper<AlertFormValue>().eq(
"alert_called_id", alertCalled.getSequenceNbr()));
definitions.put("rescueGrid", alertCalled.getRescueGrid());
definitions.put("alertType", alertCalled.getAlertType());
......@@ -143,7 +140,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
definitions.put("type", "");
definitions.put("resourcesNum", "");
powerTransferCompany.setTaskInformation(getTaskInformation(content, definitions));
iPowerTransferCompanyService.save(powerTransferCompany);
powerTransferCompanyService.save(powerTransferCompany);
} else {
powerTransferCompany.setIsDistributionAgencies(false);
StringBuilder taskInformation = new StringBuilder();
......@@ -155,12 +152,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto,Power
taskInformation.append(information).append(";");
}
powerTransferCompany.setTaskInformation(taskInformation.toString());
iPowerTransferCompanyService.save(powerTransferCompany);
powerTransferCompanyService.save(powerTransferCompany);
Long powerTransferCompanySequenceNbr = powerTransferCompany.getSequenceNbr();
List<PowerTransferCompanyResources> powerTransferCompanyResourcesList =
DtoEntityBatchConvert(powerTransferCompanyResourcesDtoList, powerTransferCompanySequenceNbr);
iPowerTransferCompanyResourcesService.saveBatch(powerTransferCompanyResourcesList);
powerTransferCompanyResourcesService.saveBatch(powerTransferCompanyResourcesList);
}
}
}
public List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId) {
return this.baseMapper.getLastPowerTransferCompany(alertCalledId);
}
}
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