Commit 62650e3b authored by suhuiguang's avatar suhuiguang

1.pom修改

parent 0a4a58f3
...@@ -10,6 +10,17 @@ ...@@ -10,6 +10,17 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.0.0</version> <version>1.0.0</version>
<artifactId>amos-boot-module-96333-api</artifactId> <artifactId>amos-boot-module-96333-api</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
<artifactId>amos-boot-module-96333-api</artifactId> <artifactId>amos-boot-module-96333-api</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -19,9 +19,8 @@ ...@@ -19,9 +19,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.amosframework.boot</groupId> <groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-tzs-api</artifactId> <artifactId>amos-boot-module-common-api</artifactId>
<version>1.0.0</version> <version>${amos-biz-boot.version}</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
<artifactId>amos-boot-module-cylinder-api</artifactId> <artifactId>amos-boot-module-cylinder-api</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -10,6 +10,17 @@ ...@@ -10,6 +10,17 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.0.0</version> <version>1.0.0</version>
<artifactId>amos-boot-module-jczs-api</artifactId> <artifactId>amos-boot-module-jczs-api</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
<artifactId>amos-boot-module-jczs-api</artifactId> <artifactId>amos-boot-module-jczs-api</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -10,6 +10,17 @@ ...@@ -10,6 +10,17 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>1.0.0</version> <version>1.0.0</version>
<artifactId>amos-boot-module-ymt-api</artifactId> <artifactId>amos-boot-module-ymt-api</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
package com.yeejoin.amos.boot.module.ymt.api.dto; package com.yeejoin.amos.boot.module.ymt.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto; import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -17,10 +18,10 @@ import java.util.List; ...@@ -17,10 +18,10 @@ import java.util.List;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElevatorInsureDto", description="保险信息") @ApiModel(value = "ElevatorInsureDto", description = "保险信息")
public class ElevatorInsureDto extends BaseDto { public class ElevatorInsureDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "承保单位") @ApiModelProperty(value = "承保单位")
......
...@@ -16,6 +16,11 @@ ...@@ -16,6 +16,11 @@
<artifactId>amos-boot-module-ymt-api</artifactId> <artifactId>amos-boot-module-ymt-api</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
package com.yeejoin.amos; package com.yeejoin.amos;
import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils; import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
import com.yeejoin.amos.boot.module.ymt.biz.listener.*;
import com.yeejoin.amos.boot.module.ymt.biz.service.impl.StartPlatformTokenService;
import com.yeejoin.amos.boot.module.ymt.flc.api.service.ICylinderInfoService;
import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttException;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
...@@ -13,6 +17,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; ...@@ -13,6 +17,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
...@@ -45,32 +50,32 @@ import java.net.UnknownHostException; ...@@ -45,32 +50,32 @@ import java.net.UnknownHostException;
@ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" }) @ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" })
public class AmosYmtApplication { public class AmosYmtApplication {
private static final Logger logger = LoggerFactory.getLogger(AmosYmtApplication.class); private static final Logger logger = LoggerFactory.getLogger(AmosYmtApplication.class);
// @Autowired @Autowired
// private EmqKeeper emqKeeper; private EmqKeeper emqKeeper;
//
// @Autowired @Autowired
// private CarcylUnitInspectMqTtlListener carcylUnitInspectMqTtlListener; private CarcylUnitInspectMqTtlListener carcylUnitInspectMqTtlListener;
//
// @Autowired @Autowired
// private BaseEnterpriseMqTtlListener baseEnterpriseMqTtlListener; private BaseEnterpriseMqTtlListener baseEnterpriseMqTtlListener;
//
// @Autowired @Autowired
// private StartPlatformTokenService startPlatformTokenService; private StartPlatformTokenService startPlatformTokenService;
//
// @Autowired @Autowired
// private PrivilegeCompanyUpdateAddListener privilegeCompanyUpdateAddListener; private PrivilegeCompanyUpdateAddListener privilegeCompanyUpdateAddListener;
//
// @Autowired @Autowired
// private PrivilegeCompanyDeleteListener privilegeCompanyDeleteListener; private PrivilegeCompanyDeleteListener privilegeCompanyDeleteListener;
//
// @Autowired @Autowired
// private FillingRecordSyncListener fillingRecordSyncListener; private FillingRecordSyncListener fillingRecordSyncListener;
//
// @Autowired @Autowired
// private AmosMqttListener amosMqTtlListener; private AmosMqttListener amosMqTtlListener;
//
// @Autowired @Autowired
// ICylinderInfoService cylinderInfoServiceImpl; ICylinderInfoService cylinderInfoServiceImpl;
public static void main(String[] args) throws UnknownHostException { public static void main(String[] args) throws UnknownHostException {
ConfigurableApplicationContext context = SpringApplication.run(AmosYmtApplication.class, args); ConfigurableApplicationContext context = SpringApplication.run(AmosYmtApplication.class, args);
...@@ -89,20 +94,20 @@ public class AmosYmtApplication { ...@@ -89,20 +94,20 @@ public class AmosYmtApplication {
* *
* @throws MqttException * @throws MqttException
*/ */
// @Bean @Bean
// public void initMqtt() throws Exception { public void initMqtt() throws Exception {
// emqKeeper.subscript("/idx/idx_biz_carcyl_unit_inspect", 2, carcylUnitInspectMqTtlListener); emqKeeper.subscript("/idx/idx_biz_carcyl_unit_inspect", 2, carcylUnitInspectMqTtlListener);
// emqKeeper.subscript("/tm/tz_base_enterprise_info", 2, baseEnterpriseMqTtlListener); emqKeeper.subscript("/tm/tz_base_enterprise_info", 2, baseEnterpriseMqTtlListener);
// emqKeeper.subscript("/tz/privilege_company_add_update", 2, privilegeCompanyUpdateAddListener); emqKeeper.subscript("/tz/privilege_company_add_update", 2, privilegeCompanyUpdateAddListener);
// emqKeeper.subscript("/tz/privilege_company_delete", 2, privilegeCompanyDeleteListener); emqKeeper.subscript("/tz/privilege_company_delete", 2, privilegeCompanyDeleteListener);
// emqKeeper.subscript("/tzs/sync/fillingRecord", 2, fillingRecordSyncListener); emqKeeper.subscript("/tzs/sync/fillingRecord", 2, fillingRecordSyncListener);
// emqKeeper.subscript("tzs/oneCodePass/deviceSave", 2, amosMqTtlListener); emqKeeper.subscript("tzs/oneCodePass/deviceSave", 2, amosMqTtlListener);
//// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam", 1, examMqTtlListener); // emqKeeper.getMqttClient().subscribe("topic_mqtt_exam", 1, examMqTtlListener);
//// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam_record", 1, examMqTtRecordListener); // emqKeeper.getMqttClient().subscribe("topic_mqtt_exam_record", 1, examMqTtRecordListener);
// } }
// @Bean @Bean
// public void initToken() { public void initToken() {
// startPlatformTokenService.getToken(); startPlatformTokenService.getToken();
// } }
} }
...@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; ...@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.SystemClock; import com.baomidou.mybatisplus.core.toolkit.SystemClock;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
...@@ -14,16 +13,17 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey; ...@@ -14,16 +13,17 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil; import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
import com.yeejoin.amos.boot.module.tzs.api.dto.*; import com.yeejoin.amos.boot.module.ymt.api.dto.AlertCalledDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.*; import com.yeejoin.amos.boot.module.ymt.api.dto.AlertCalledObjsDto;
import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums; import com.yeejoin.amos.boot.module.ymt.api.dto.AlertPaperInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService; import com.yeejoin.amos.boot.module.ymt.api.entity.AlertCalled;
import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService; import com.yeejoin.amos.boot.module.ymt.api.entity.Elevator;
import com.yeejoin.amos.boot.module.tzs.api.service.TzsAuthService; import com.yeejoin.amos.boot.module.ymt.api.entity.WechatRelation;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.*; import com.yeejoin.amos.boot.module.ymt.api.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.ymt.api.service.TzsAuthService;
import com.yeejoin.amos.boot.module.ymt.biz.service.impl.*;
import com.yeejoin.amos.boot.module.ymt.biz.utils.AlertBeanDtoVoUtils; import com.yeejoin.amos.boot.module.ymt.biz.utils.AlertBeanDtoVoUtils;
import com.yeejoin.amos.boot.module.ymt.biz.utils.BeanDtoVoUtils; import com.yeejoin.amos.boot.module.ymt.biz.utils.BeanDtoVoUtils;
import com.yeejoin.amos.boot.module.ymt.biz.service.impl.*;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -33,13 +33,7 @@ import org.slf4j.Logger; ...@@ -33,13 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.component.emq.EmqKeeper; import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
...@@ -64,582 +58,581 @@ import java.util.*; ...@@ -64,582 +58,581 @@ import java.util.*;
@RequestMapping(value = "/alert-called") @RequestMapping(value = "/alert-called")
public class AlertCalledController extends BaseController { public class AlertCalledController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(AlertCalledController.class); private final Logger logger = LoggerFactory.getLogger(AlertCalledController.class);
@Autowired @Autowired
RedisUtils redisUtils; RedisUtils redisUtils;
@Autowired @Autowired
AlertCalledServiceImpl iAlertCalledService; AlertCalledServiceImpl iAlertCalledService;
@Autowired @Autowired
ESAlertCalledService eSAlertCalledService; ESAlertCalledService eSAlertCalledService;
@Autowired @Autowired
DispatchPaperServiceImpl dispatchPaperServiceImpl; DispatchPaperServiceImpl dispatchPaperServiceImpl;
@Autowired @Autowired
AlertFormValueServiceImpl iAlertFormValueService; AlertFormValueServiceImpl iAlertFormValueService;
@Autowired @Autowired
ElevatorServiceImpl elevatorServiceImpl; ElevatorServiceImpl elevatorServiceImpl;
@Autowired @Autowired
MaintenanceCompanyServiceImpl maintenanceCompanyService; MaintenanceCompanyServiceImpl maintenanceCompanyService;
@Autowired @Autowired
WechatRelationServiceImpl wechatRelationService; WechatRelationServiceImpl wechatRelationService;
@Autowired @Autowired
ElevatorServiceImpl elevatorService; ElevatorServiceImpl elevatorService;
@Autowired @Autowired
private EmqKeeper emqKeeper; private EmqKeeper emqKeeper;
@Value("${mqtt.topic.alertReport.push}") @Value("${mqtt.topic.alertReport.push}")
private String alertReportpushTopic; private String alertReportpushTopic;
@Value("${mqtt.topic.alertInfo.push}") @Value("${mqtt.topic.alertInfo.push}")
private String alertInfopushTopic; private String alertInfopushTopic;
@Autowired @Autowired
TzsAuthService tzsAuthService; TzsAuthService tzsAuthService;
@Autowired @Autowired
TzsCitInfoServiceImpl citInfoService; TzsCitInfoServiceImpl citInfoService;
@Autowired @Autowired
private ElevatorServiceImpl iElevatorService; private ElevatorServiceImpl iElevatorService;
/** /**
* 新增警情接警填报记录 * 新增警情接警填报记录
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增警情接警填报记录", notes = "新增警情接警填报记录") @ApiOperation(httpMethod = "POST", value = "新增警情接警填报记录", notes = "新增警情接警填报记录")
public ResponseModel<AlertCalledDto> save(@RequestBody AlertCalledObjsDto alertCalledObjsDto) { public ResponseModel<AlertCalledDto> save(@RequestBody AlertCalledObjsDto alertCalledObjsDto) {
if (ValidationUtil.isEmpty(alertCalledObjsDto)) { if (ValidationUtil.isEmpty(alertCalledObjsDto)) {
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
} }
LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Elevator::getRescueCode,alertCalledObjsDto.getAlertCalledDto().getDeviceId()); queryWrapper.eq(Elevator::getRescueCode, alertCalledObjsDto.getAlertCalledDto().getDeviceId());
Elevator elevator = iElevatorService.getOne(queryWrapper); Elevator elevator = iElevatorService.getOne(queryWrapper);
if(elevator == null) { if (elevator == null) {
throw new BadRequest("未找到相关电梯."); throw new BadRequest("未找到相关电梯.");
} }
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
alertCalledObjsDto = iAlertCalledService.createAlertCalled(alertCalledObjsDto, reginParams.getUserModel()); alertCalledObjsDto = iAlertCalledService.createAlertCalled(alertCalledObjsDto, reginParams.getUserModel());
// 坐席接警后,辅屏由常态化切换为处置态 // 坐席接警后,辅屏由常态化切换为处置态
AgencyUserModel user =getUserInfo(); AgencyUserModel user = getUserInfo();
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("userId",user.getUserId()); jsonObject.put("userId", user.getUserId());
jsonObject.put("alertId",String.valueOf(alertCalledObjsDto.getAlertCalledDto().getSequenceNbr())); jsonObject.put("alertId", String.valueOf(alertCalledObjsDto.getAlertCalledDto().getSequenceNbr()));
JSONObject jsonObject1 = new JSONObject(); JSONObject jsonObject1 = new JSONObject();
jsonObject.put("alertId",String.valueOf(alertCalledObjsDto.getAlertCalledDto().getSequenceNbr())); jsonObject.put("alertId", String.valueOf(alertCalledObjsDto.getAlertCalledDto().getSequenceNbr()));
try { try {
emqKeeper.getMqttClient().publish(alertReportpushTopic, jsonObject.toString().getBytes("UTF-8"), 1, false); emqKeeper.getMqttClient().publish(alertReportpushTopic, jsonObject.toString().getBytes("UTF-8"), 1, false);
// 跑马灯消息提醒 // 跑马灯消息提醒
if(null != alertCalledObjsDto.getAlertCalledDto().getFatherAlert()) { if (null != alertCalledObjsDto.getAlertCalledDto().getFatherAlert()) {
emqKeeper.getMqttClient().publish(alertInfopushTopic, jsonObject1.toString().getBytes("UTF-8"), 1, false); emqKeeper.getMqttClient().publish(alertInfopushTopic, jsonObject1.toString().getBytes("UTF-8"), 1, false);
} }
} catch (MqttException e) { } catch (MqttException e) {
logger.error("mqtt发送失败" +jsonObject ); logger.error("mqtt发送失败" + jsonObject);
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
logger.error("mqtt发送失败" +jsonObject ); logger.error("mqtt发送失败" + jsonObject);
} }
return ResponseHelper.buildResponse(alertCalledObjsDto.getAlertCalledDto()); return ResponseHelper.buildResponse(alertCalledObjsDto.getAlertCalledDto());
} }
/** /**
* 公众号投诉建议与故障报销 * 公众号投诉建议与故障报销
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveMobile") @PostMapping(value = "/saveMobile")
@ApiOperation(httpMethod = "POST", value = "新增警情接警填报记录", notes = "新增警情接警填报记录") @ApiOperation(httpMethod = "POST", value = "新增警情接警填报记录", notes = "新增警情接警填报记录")
public ResponseModel<AlertCalledDto> saveMobile(@RequestBody AlertCalledDto alertCalledDto) { public ResponseModel<AlertCalledDto> saveMobile(@RequestBody AlertCalledDto alertCalledDto) {
if (ValidationUtil.isEmpty(alertCalledDto)) { if (ValidationUtil.isEmpty(alertCalledDto)) {
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
} }
if (ValidationUtil.isEmpty(alertCalledDto.getEmergencyCall())) { if (ValidationUtil.isEmpty(alertCalledDto.getEmergencyCall())) {
throw new BadRequest("参数校验失败."); throw new BadRequest("参数校验失败.");
} }
// 校验手机号 是否存在 // 校验手机号 是否存在
LambdaQueryWrapper<WechatRelation> queryWrapper = new LambdaQueryWrapper(); LambdaQueryWrapper<WechatRelation> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(WechatRelation::getPhone, alertCalledDto.getEmergencyCall()); queryWrapper.eq(WechatRelation::getPhone, alertCalledDto.getEmergencyCall());
WechatRelation wechatRelation = wechatRelationService.getOne(queryWrapper); WechatRelation wechatRelation = wechatRelationService.getOne(queryWrapper);
if (null == wechatRelation) { if (null == wechatRelation) {
throw new BadRequest("手机号未注册"); throw new BadRequest("手机号未注册");
} }
// 校验电梯id是否正确 // 校验电梯id是否正确
LambdaQueryWrapper<Elevator> queryWrapper1 = new LambdaQueryWrapper(); LambdaQueryWrapper<Elevator> queryWrapper1 = new LambdaQueryWrapper();
queryWrapper1.eq(Elevator::getSequenceNbr, Long.valueOf(alertCalledDto.getEquipmentId())); queryWrapper1.eq(Elevator::getSequenceNbr, Long.valueOf(alertCalledDto.getEquipmentId()));
Elevator elevator = elevatorServiceImpl.getOne(queryWrapper1); Elevator elevator = elevatorServiceImpl.getOne(queryWrapper1);
if (null == elevator) { if (null == elevator) {
throw new BadRequest("电梯不存在"); throw new BadRequest("电梯不存在");
} }
// 将电梯地址设置到警情地址 // 将电梯地址设置到警情地址
alertCalledDto.setAddress(elevator.getAddress()); alertCalledDto.setAddress(elevator.getAddress());
alertCalledDto.setRegistrationCode(elevator.getRegisterCode()); alertCalledDto.setRegistrationCode(elevator.getRegisterCode());
alertCalledDto.setDeviceId(String.valueOf(elevator.getRescueCode())); alertCalledDto.setDeviceId(String.valueOf(elevator.getRescueCode()));
alertCalledDto.setUseStatus(elevator.getUseStatus()); alertCalledDto.setUseStatus(elevator.getUseStatus());
alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory()); alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory());
alertCalledDto.setAlarmType(AlertStageEnums.getEnumById(alertCalledDto.getAlarmTypeCode()).getValue()); alertCalledDto.setAlarmType(AlertStageEnums.getEnumById(alertCalledDto.getAlarmTypeCode()).getValue());
alertCalledDto.setEquipmentClassification("电梯"); alertCalledDto.setEquipmentClassification("电梯");
alertCalledDto.setEquipmentClassificationCode("3000"); alertCalledDto.setEquipmentClassificationCode("3000");
alertCalledDto.setCity(elevator.getCity()); alertCalledDto.setCity(elevator.getCity());
alertCalledDto.setRegionCode(elevator.getRegionCode()); alertCalledDto.setRegionCode(elevator.getRegionCode());
alertCalledDto.setDistrict(elevator.getDistrict()); alertCalledDto.setDistrict(elevator.getDistrict());
AlertCalledDto alertCalledDtoReturn = iAlertCalledService.createAlertCalled(alertCalledDto); AlertCalledDto alertCalledDtoReturn = iAlertCalledService.createAlertCalled(alertCalledDto);
return ResponseHelper.buildResponse(alertCalledDtoReturn); return ResponseHelper.buildResponse(alertCalledDtoReturn);
} }
/** /**
* 警情信息 * 警情信息
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getAlertInfo") @GetMapping(value = "/getAlertInfo")
@ApiOperation(httpMethod = "GET", value = "警情信息", notes = "警情信息") @ApiOperation(httpMethod = "GET", value = "警情信息", notes = "警情信息")
public ResponseModel<AlertPaperInfoDto> getAlertInfo(@RequestParam Long alertId public ResponseModel<AlertPaperInfoDto> getAlertInfo(@RequestParam Long alertId
) { ) {
AlertCalled alertCalled = iAlertCalledService.getById(alertId); AlertCalled alertCalled = iAlertCalledService.getById(alertId);
AlertPaperInfoDto alertPaperInfoDto = new AlertPaperInfoDto(); AlertPaperInfoDto alertPaperInfoDto = new AlertPaperInfoDto();
alertPaperInfoDto.setAlertId(alertCalled.getSequenceNbr()); alertPaperInfoDto.setAlertId(alertCalled.getSequenceNbr());
iAlertCalledService.selectAlertCalledByIdNew(alertPaperInfoDto); iAlertCalledService.selectAlertCalledByIdNew(alertPaperInfoDto);
LambdaQueryWrapper<Elevator> queryWrapper1= new LambdaQueryWrapper<>(); LambdaQueryWrapper<Elevator> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(Elevator::getSequenceNbr,alertCalled.getEquipmentId()); queryWrapper1.eq(Elevator::getSequenceNbr, alertCalled.getEquipmentId());
Elevator elevator = elevatorService.getOne(queryWrapper1); Elevator elevator = elevatorService.getOne(queryWrapper1);
alertPaperInfoDto.setArea(elevator.getProvince() + elevator.getCity() + elevator.getDistrict()); alertPaperInfoDto.setArea(elevator.getProvince() + elevator.getCity() + elevator.getDistrict());
alertPaperInfoDto.setAddress(alertCalled.getAddress()); alertPaperInfoDto.setAddress(alertCalled.getAddress());
alertPaperInfoDto.setCallTime(alertCalled.getCallTime()); alertPaperInfoDto.setCallTime(alertCalled.getCallTime());
alertPaperInfoDto.setLatitude(elevator.getLatitude()); alertPaperInfoDto.setLatitude(elevator.getLatitude());
alertPaperInfoDto.setLongitude(elevator.getLongitude()); alertPaperInfoDto.setLongitude(elevator.getLongitude());
alertPaperInfoDto.setAlarmTypeCode(alertCalled.getAlarmTypeCode()); alertPaperInfoDto.setAlarmTypeCode(alertCalled.getAlarmTypeCode());
alertPaperInfoDto.setRegionCode(elevator.getRegionCode()); alertPaperInfoDto.setRegionCode(elevator.getRegionCode());
alertPaperInfoDto.setRescueCode(elevator.getRescueCode()); alertPaperInfoDto.setRescueCode(elevator.getRescueCode());
alertPaperInfoDto.setAlertStatus(alertCalled.getAlertStage()); alertPaperInfoDto.setAlertStatus(alertCalled.getAlertStage());
alertPaperInfoDto.setElevatorId(elevator.getSequenceNbr() +""); alertPaperInfoDto.setElevatorId(elevator.getSequenceNbr() + "");
alertPaperInfoDto.setElevatorCode(elevator.getRegisterCode()); alertPaperInfoDto.setElevatorCode(elevator.getRegisterCode());
DispatchPaper paper = dispatchPaperServiceImpl.getOne(new LambdaQueryWrapper<DispatchPaper>().eq(DispatchPaper::getIsDelete,false).eq(DispatchPaper::getAlertId,alertId)); DispatchPaper paper = dispatchPaperServiceImpl.getOne(new LambdaQueryWrapper<DispatchPaper>().eq(DispatchPaper::getIsDelete, false).eq(DispatchPaper::getAlertId, alertId));
if(paper != null) { if (paper != null) {
alertPaperInfoDto.setFinishTime(paper.getFeedbackFinishTime()); alertPaperInfoDto.setFinishTime(paper.getFeedbackFinishTime());
} }
return ResponseHelper.buildResponse(alertPaperInfoDto); return ResponseHelper.buildResponse(alertPaperInfoDto);
} }
/** /**
* * <pre>
* <pre> * 相似警情分页查询
* 相似警情分页查询 * </pre>
* </pre> *
* * @param
* @param * @param current
* @param current * @param size
* @param size * @return
* @return * @throws Exception
* @throws Exception */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @ApiOperation(value = "相似警情分页查询")
@ApiOperation(value = "相似警情分页查询") @PostMapping(value = "/page/similar")
@PostMapping(value = "/page/similar") public ResponseModel<Page<ESAlertCalledDto>> pageBySimilar(@RequestBody ESAlertCalledRequestDto alertCalledVo,
public ResponseModel<Page<ESAlertCalledDto>> pageBySimilar(@RequestBody ESAlertCalledRequestDto alertCalledVo, @RequestParam(value = "current") int current, @RequestParam(value = "size") int size) throws Exception {
@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) throws Exception {
Page<ESAlertCalledDto> esAlertCalledDtoPage = eSAlertCalledService.queryByKeys(alertCalledVo, current, size);
Page<ESAlertCalledDto> esAlertCalledDtoPage = eSAlertCalledService.queryByKeys(alertCalledVo, current, size); return ResponseHelper.buildResponse(esAlertCalledDtoPage);
return ResponseHelper.buildResponse(esAlertCalledDtoPage); }
}
/**
/** * 根据id查询
* 根据id查询 *
* * @param id 主键
* @param id 主键 * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @GetMapping(value = "/{id}")
@GetMapping(value = "/{id}") @ApiOperation(httpMethod = "GET", value = "根据id查询单个警情接警填报记录", notes = "根据id查询单个警情接警填报记录")
@ApiOperation(httpMethod = "GET", value = "根据id查询单个警情接警填报记录", notes = "根据id查询单个警情接警填报记录") public ResponseModel<Object> selectOne(@PathVariable Long id) {
public ResponseModel<Object> selectOne(@PathVariable Long id) { return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledById(id));
return ResponseHelper.buildResponse(iAlertCalledService.selectAlertCalledById(id)); }
}
/**
/** * 生成工单编号报警人及报警时间
* 生成工单编号报警人及报警时间 *
* * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @GetMapping(value = "/getWorkOderNumber")
@GetMapping(value = "/getWorkOderNumber") @ApiOperation(httpMethod = "GET", value = "生成工单编号报警人及报警时间", notes = "生成工单编号报警人及报警时间")
@ApiOperation(httpMethod = "GET", value = "生成工单编号报警人及报警时间", notes = "生成工单编号报警人及报警时间") public ResponseModel<AlertCallInfoDto> selectOne() throws ParseException {
public ResponseModel<AlertCallInfoDto> selectOne() throws ParseException { String workOrderNumber = nextId();
String workOrderNumber = nextId(); AlertCallInfoDto alertCallInfoDto = new AlertCallInfoDto();
AlertCallInfoDto alertCallInfoDto = new AlertCallInfoDto(); alertCallInfoDto.setCallTime(DateUtils.stampToDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss "));
alertCallInfoDto.setCallTime(DateUtils.stampToDate(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss ")); alertCallInfoDto.setWorkOrderNumber(workOrderNumber);
alertCallInfoDto.setWorkOrderNumber(workOrderNumber); alertCallInfoDto.setRecUserId(getUserInfo().getUserId());
alertCallInfoDto.setRecUserId(getUserInfo().getUserId()); alertCallInfoDto.setRecUserName(getUserInfo().getRealName());
alertCallInfoDto.setRecUserName(getUserInfo().getRealName()); return ResponseHelper.buildResponse(alertCallInfoDto);
return ResponseHelper.buildResponse(alertCallInfoDto); }
}
/**
/** * 获取下一个 工单编号
* 获取下一个 工单编号 *
* * @return 下一个 工单编号
* @return 下一个 工单编号 */
*/ public synchronized String nextId() throws ParseException {
public synchronized String nextId() throws ParseException {
String number = DateUtils.stampToDate(SystemClock.now(), "yyyy-MM-dd HH:mm:ss SSS");
String number = DateUtils.stampToDate(SystemClock.now(), "yyyy-MM-dd HH:mm:ss SSS"); String newNumber = number.replace("-", "").replace(" ", "").replace(":", "");
String newNumber = number.replace("-", "").replace(" ", "").replace(":", ""); ReginParams reginParams = getSelectedOrgInfo();
ReginParams reginParams = getSelectedOrgInfo(); AgencyUserModel user = reginParams.getUserModel();
AgencyUserModel user = reginParams.getUserModel(); String orgCode = ValidationUtil.isEmpty(user.getCompanys()) ? null : user.getCompanys().get(0).getOrgCode();
String orgCode = ValidationUtil.isEmpty(user.getCompanys()) ? null : user.getCompanys().get(0).getOrgCode();
Map<String, Object> map = iAlertCalledService.getAlertInfoList(
Map<String, Object> map = iAlertCalledService.getAlertInfoList( DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_TIME_PATTERN),
DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_TIME_PATTERN), DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_TIME_PATTERN), orgCode,
DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_TIME_PATTERN), orgCode, user.getUserId());
user.getUserId());
StringBuilder stringBuilder = new StringBuilder();
StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append(newNumber);
stringBuilder.append(newNumber); String workOrderNumber = stringBuilder.append(map.get("calledCount") == null ? "1"
String workOrderNumber = stringBuilder.append(map.get("calledCount") == null ? "1" : String.valueOf(Integer.parseInt(map.get("calledCount").toString()) + 1)).toString();
: String.valueOf(Integer.parseInt(map.get("calledCount").toString()) + 1)).toString(); return workOrderNumber;
return workOrderNumber; }
}
/**
/** * 警情统计
* 警情统计 *
* * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @GetMapping(value = "/alertStatistics")
@GetMapping(value = "/alertStatistics") @ApiOperation(httpMethod = "GET", value = "警情统计", notes = "警情统计")
@ApiOperation(httpMethod = "GET", value = "警情统计", notes = "警情统计") public ResponseModel<AlarmStatisticsDto> alertStatistics() {
public ResponseModel<AlarmStatisticsDto> alertStatistics() { ReginParams reginParams = getSelectedOrgInfo();
ReginParams reginParams = getSelectedOrgInfo();
// 我的待办数量
// 我的待办数量 QueryWrapper<AlertCalled> todoNumQueryWrapper = new QueryWrapper<>();
QueryWrapper<AlertCalled> todoNumQueryWrapper = new QueryWrapper<>(); // 全部待办数量
// 全部待办数量 QueryWrapper<AlertCalled> allNumQueryWrapper = new QueryWrapper<>();
QueryWrapper<AlertCalled> allNumQueryWrapper = new QueryWrapper<>();
AlarmStatisticsDto alarmStatisticsDto = new AlarmStatisticsDto();
AlarmStatisticsDto alarmStatisticsDto = new AlarmStatisticsDto(); todoNumQueryWrapper.eq("alert_status", false);
todoNumQueryWrapper.eq("alert_status", false); allNumQueryWrapper.eq("alert_status", false);
allNumQueryWrapper.eq("alert_status", false); if (null != reginParams) {
if (null != reginParams) { todoNumQueryWrapper.eq("rec_user_id", reginParams.getUserModel().getUserId());
todoNumQueryWrapper.eq("rec_user_id", reginParams.getUserModel().getUserId()); todoNumQueryWrapper.or(true);
todoNumQueryWrapper.or(true); todoNumQueryWrapper.eq("org_code", reginParams.getCompany().getOrgCode());
todoNumQueryWrapper.eq("org_code", reginParams.getCompany().getOrgCode());
alarmStatisticsDto.setTodoNum(iAlertCalledService.list(todoNumQueryWrapper).size());
alarmStatisticsDto.setTodoNum(iAlertCalledService.list(todoNumQueryWrapper).size()); alarmStatisticsDto.setAllNum(iAlertCalledService.list(allNumQueryWrapper).size());
alarmStatisticsDto.setAllNum(iAlertCalledService.list(allNumQueryWrapper).size());
Map<String, Object> map = iAlertCalledService.getAlertInfoList(
Map<String, Object> map = iAlertCalledService.getAlertInfoList( DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_PATTERN),
DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_PATTERN), DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), 1).getTime(), DateUtils.DATE_PATTERN), null,
DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), 1).getTime(), DateUtils.DATE_PATTERN), null, getUserInfo().getUserId());
getUserInfo().getUserId());
// 当天接警
// 当天接警 alarmStatisticsDto.setTodayAlarmNum(
alarmStatisticsDto.setTodayAlarmNum( map.get("calledCount") == null ? 0 : Integer.valueOf(map.get("calledCount").toString()));
map.get("calledCount") == null ? 0 : Integer.valueOf(map.get("calledCount").toString())); // 当天提交
// 当天提交 alarmStatisticsDto.setSubmitNum(
alarmStatisticsDto.setSubmitNum( map.get("majorAlertCount") == null ? 0 : Integer.valueOf(map.get("majorAlertCount").toString()));
map.get("majorAlertCount") == null ? 0 : Integer.valueOf(map.get("majorAlertCount").toString())); // 投诉咨询数量
// 投诉咨询数量 alarmStatisticsDto.setSuggestions(
alarmStatisticsDto.setSuggestions( map.get("suggestionsCount") == null ? 0 : Integer.valueOf(map.get("suggestionsCount").toString()));
map.get("suggestionsCount") == null ? 0 : Integer.valueOf(map.get("suggestionsCount").toString())); // 故障维修数量
// 故障维修数量 alarmStatisticsDto.setFaultRescue(
alarmStatisticsDto.setFaultRescue( map.get("faultRescueCount") == null ? 0 : Integer.valueOf(map.get("faultRescueCount").toString()));
map.get("faultRescueCount") == null ? 0 : Integer.valueOf(map.get("faultRescueCount").toString())); // 困人救援数量
// 困人救援数量 alarmStatisticsDto.setSleepyIncident(map.get("sleepyIncidentCount") == null ? 0
alarmStatisticsDto.setSleepyIncident(map.get("sleepyIncidentCount") == null ? 0 : Integer.valueOf(map.get("sleepyIncidentCount").toString()));
: Integer.valueOf(map.get("sleepyIncidentCount").toString()));
LinkedHashMap<String, Integer> recordMap = new LinkedHashMap<>();
LinkedHashMap<String, Integer> recordMap = new LinkedHashMap<>(); // 近七天办理数量
// 近七天办理数量 Map<String, Object> nearlySevenDaysMap = iAlertCalledService.getNearlyInfo(
Map<String, Object> nearlySevenDaysMap = iAlertCalledService.getNearlyInfo( DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_PATTERN),
DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_PATTERN), DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), 1).getTime(), DateUtils.DATE_PATTERN), null,
DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), 1).getTime(), DateUtils.DATE_PATTERN), null, getUserInfo().getUserId());
getUserInfo().getUserId());
for (int i = 0; i < nearlySevenDaysMap.size() / 2; i++) {
for (int i = 0; i < nearlySevenDaysMap.size() / 2; i++) { recordMap.put(DateUtils.dateToString(nearlySevenDaysMap.get("dateTime" + i).toString()),
recordMap.put(DateUtils.dateToString(nearlySevenDaysMap.get("dateTime" + i).toString()), Integer.parseInt(nearlySevenDaysMap.get("majorAlertCount" + i).toString()));
Integer.parseInt(nearlySevenDaysMap.get("majorAlertCount" + i).toString())); }
} alarmStatisticsDto.setNearlySevenDaysNum(recordMap);
alarmStatisticsDto.setNearlySevenDaysNum(recordMap); }
} return ResponseHelper.buildResponse(alarmStatisticsDto);
return ResponseHelper.buildResponse(alarmStatisticsDto); }
}
/**
/** * 列表分页查询
* 列表分页查询 *
* * @param pageNum 当前页
* @param pageNum 当前页 * @param pageSize 每页大小
* @param pageSize 每页大小 * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @GetMapping(value = "/list")
@GetMapping(value = "/list") @ApiOperation(httpMethod = "GET", value = "警情接警填报记录分页查询", notes = "警情接警填报记录分页查询")
@ApiOperation(httpMethod = "GET", value = "警情接警填报记录分页查询", notes = "警情接警填报记录分页查询") public ResponseModel<IPage<AlertCalledDto>> queryForPage(String pageNum, String pageSize, String sort,
public ResponseModel<IPage<AlertCalledDto>> queryForPage(String pageNum, String pageSize, String sort, AlertCalledDto alertCalledDto) {
AlertCalledDto alertCalledDto) { AlertCalled alertCalled = BeanDtoVoUtils.convert(alertCalledDto, AlertCalled.class);
AlertCalled alertCalled = BeanDtoVoUtils.convert(alertCalledDto, AlertCalled.class); Page<AlertCalled> pageBean;
Page<AlertCalled> pageBean; IPage<AlertCalled> page;
IPage<AlertCalled> page; QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
QueryWrapper<AlertCalled> alertCalledQueryWrapper = new QueryWrapper<>();
setQueryWrapper(alertCalledQueryWrapper, alertCalled, sort);
setQueryWrapper(alertCalledQueryWrapper, alertCalled, sort);
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) { pageBean = new Page<>(0, Long.MAX_VALUE);
pageBean = new Page<>(0, Long.MAX_VALUE); } else {
} else { pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize)); }
} page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper); int num = iAlertCalledService.count(alertCalledQueryWrapper);
int num= iAlertCalledService.count(alertCalledQueryWrapper); pageBean.setTotal(num);
pageBean.setTotal(num); IPage<AlertCalledDto> calledVoIPage = AlertBeanDtoVoUtils.alertCalledIPageDto(page);
IPage<AlertCalledDto> calledVoIPage = AlertBeanDtoVoUtils.alertCalledIPageDto(page); return ResponseHelper.buildResponse(calledVoIPage);
return ResponseHelper.buildResponse(calledVoIPage); }
}
private QueryWrapper<AlertCalled> setQueryWrapper(QueryWrapper<AlertCalled> queryWrapper, AlertCalled alertCalled,
private QueryWrapper<AlertCalled> setQueryWrapper(QueryWrapper<AlertCalled> queryWrapper, AlertCalled alertCalled, String sort) {
String sort) { queryWrapper.eq("is_delete", 0);
queryWrapper.eq("is_delete", 0);
//根据当前登陆人的所在区域 找到该区域内的接警人id 再找到相关警情
//根据当前登陆人的所在区域 找到该区域内的接警人id 再找到相关警情 Set<String> userIds = new HashSet<>();
Set<String> userIds = new HashSet<>(); String regionCode = this.getSelectedOrgInfo().getCompany().getRegionCode();
String regionCode = this.getSelectedOrgInfo().getCompany().getRegionCode(); List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode, regionCode));
List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode,regionCode)); if (!ValidationUtil.isEmpty(citInfoList)) {
if(!ValidationUtil.isEmpty(citInfoList)){ for (TzsCitInfo citInfo : citInfoList) {
for(TzsCitInfo citInfo : citInfoList){ userIds.add(citInfo.getCtiUserId());
userIds.add(citInfo.getCtiUserId()); }
} }
} queryWrapper.in("rec_user_id", userIds);
queryWrapper.in("rec_user_id",userIds);
if (sort != null) { // 排序失效
if(sort!=null) { // 排序失效 String[] date = sort.split(",");
String[] date= sort.split(","); if (date[1].equals("ascend")) {
if(date[1].equals("ascend")) { queryWrapper.orderByAsc(RedisKey.humpToLine(date[0]));
queryWrapper.orderByAsc(RedisKey.humpToLine(date[0])); } else {
}else { queryWrapper.orderByDesc(RedisKey.humpToLine(date[0]));
queryWrapper.orderByDesc(RedisKey.humpToLine(date[0])); }
} } else {
}else { queryWrapper.orderByDesc("call_time");
queryWrapper.orderByDesc("call_time"); }
}
if (!ValidationUtil.isEmpty(alertCalled.getIsAuxiliaryScreen())) {
if (!ValidationUtil.isEmpty(alertCalled.getIsAuxiliaryScreen())) { if (!ValidationUtil.isEmpty(alertCalled.getCallTimeStart())
if (!ValidationUtil.isEmpty(alertCalled.getCallTimeStart()) && !ValidationUtil.isEmpty(alertCalled.getCallTimeEnd())) {
&& !ValidationUtil.isEmpty(alertCalled.getCallTimeEnd())) { queryWrapper.between("call_time", alertCalled.getCallTimeStart(),
queryWrapper.between("call_time", alertCalled.getCallTimeStart(), alertCalled.getCallTimeEnd().getTime());
alertCalled.getCallTimeEnd().getTime()); }
} } else {
} else { queryWrapper.between("call_time", DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_PATTERN),
queryWrapper.between("call_time", DateUtils.stampToDate(System.currentTimeMillis(), DateUtils.DATE_PATTERN), DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), 1).getTime(), DateUtils.DATE_PATTERN));
DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), 1).getTime(), DateUtils.DATE_PATTERN)); }
}
if (alertCalled.getIsFatherAlert()) { // 0:接警;1:处警
if (alertCalled.getIsFatherAlert()) { // 0:接警;1:处警 queryWrapper.isNull("father_alert");
queryWrapper.isNull("father_alert"); }
}
if (!ValidationUtil.isEmpty(alertCalled.getType())) {
if (!ValidationUtil.isEmpty(alertCalled.getType())) { queryWrapper.eq("type", alertCalled.getType());
queryWrapper.eq("type", alertCalled.getType()); }
}
if (!ValidationUtil.isEmpty(alertCalled.getAlarmType())) {
if (!ValidationUtil.isEmpty(alertCalled.getAlarmType())) { queryWrapper.eq("alarm_type", alertCalled.getAlarmType());
queryWrapper.eq("alarm_type", alertCalled.getAlarmType()); }
}
if (!ValidationUtil.isEmpty(alertCalled.getAlertSource())) {
if (!ValidationUtil.isEmpty(alertCalled.getAlertSource())) { queryWrapper.eq("alert_source", alertCalled.getAlertSource());
queryWrapper.eq("alert_source", alertCalled.getAlertSource()); }
} return queryWrapper;
return queryWrapper; }
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @ApiOperation(value = "查询警情事件记录", notes = "查询警情事件记录")
@ApiOperation(value = "查询警情事件记录", notes = "查询警情事件记录") @GetMapping("/selectRecord")
@GetMapping("/selectRecord") public ResponseModel<Page<AlertCalledQueryDto>> queryAlertCalledByPager(AlertCalledQueryDto alertCalledQueryDto,
public ResponseModel<Page<AlertCalledQueryDto>> queryAlertCalledByPager(AlertCalledQueryDto alertCalledQueryDto, @RequestParam(value = "pageNum") int pageNum, @RequestParam(value = "pageSize") int pageSize, String sort) {
@RequestParam(value = "pageNum") int pageNum, @RequestParam(value = "pageSize") int pageSize, String sort ) { Page<AlertCalledQueryDto> page = new Page<AlertCalledQueryDto>();
Page<AlertCalledQueryDto> page = new Page<AlertCalledQueryDto>(); page.setCurrent(pageNum);
page.setCurrent(pageNum); page.setSize(pageSize);
page.setSize(pageSize); String sortParam = "";
String sortParam = ""; String sortRule = "";
String sortRule = ""; if (sort != null) { // 排序失效
if(sort!=null) { // 排序失效 String[] date = sort.split(",");
String[] date= sort.split(","); if (date[1].equals("ascend")) {
if(date[1].equals("ascend")) { sortParam = RedisKey.humpToLine(date[0]);
sortParam = RedisKey.humpToLine(date[0]); sortRule = "asc";
sortRule = "asc"; } else {
}else { sortParam = RedisKey.humpToLine(date[0]);
sortParam =RedisKey.humpToLine(date[0]); sortRule = "desc";
sortRule = "desc"; }
} } else {
}else { sortParam = "call_time";
sortParam = "call_time"; sortRule = "desc";
sortRule = "desc"; }
} Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(page,
Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(page, alertCalledQueryDto.getWorkOrderNumber(), alertCalledQueryDto.getCreator(), alertCalledQueryDto.getEmergency(), alertCalledQueryDto.getEmergencyTimeStart(),
alertCalledQueryDto.getWorkOrderNumber(),alertCalledQueryDto.getCreator(),alertCalledQueryDto.getEmergency(),alertCalledQueryDto.getEmergencyTimeStart(), alertCalledQueryDto.getEmergencyTimeEnd(), alertCalledQueryDto.getEmergencyCall(), alertCalledQueryDto.getDeviceId(), alertCalledQueryDto.getElevatorAddress(),
alertCalledQueryDto.getEmergencyTimeEnd(),alertCalledQueryDto.getEmergencyCall(),alertCalledQueryDto.getDeviceId(),alertCalledQueryDto.getElevatorAddress(), alertCalledQueryDto.getDistrict(), alertCalledQueryDto.getAlertType(), alertCalledQueryDto.getAlertSource(), alertCalledQueryDto.getAlertStage(), alertCalledQueryDto.getAlertStatus(),
alertCalledQueryDto.getDistrict(),alertCalledQueryDto.getAlertType(),alertCalledQueryDto.getAlertSource(),alertCalledQueryDto.getAlertStage(),alertCalledQueryDto.getAlertStatus(), sortParam, sortRule);
sortParam,sortRule); Page<AlertCalledQueryDto> result = new Page<AlertCalledQueryDto>(alertCalledQueryDto.getPageNum(),
Page<AlertCalledQueryDto> result = new Page<AlertCalledQueryDto>(alertCalledQueryDto.getPageNum(), alertCalledQueryDto.getPageSize());
alertCalledQueryDto.getPageSize()); long totle = pageBean.getTotal();
long totle = pageBean.getTotal(); result.setRecords(pageBean.getRecords());
result.setRecords(pageBean.getRecords()); result.setTotal(totle);
result.setTotal(totle); return ResponseHelper.buildResponse(result);
return ResponseHelper.buildResponse(result); }
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @ApiOperation(value = "导出警情事件记录", notes = "导出警情事件记录")
@ApiOperation(value = "导出警情事件记录", notes = "导出警情事件记录") @GetMapping("/exportSelectRecord")
@GetMapping("/exportSelectRecord") public void exportAlertCalled(AlertCalledQueryDto alertCalledQueryDto, HttpServletResponse response, String sort) {
public void exportAlertCalled(AlertCalledQueryDto alertCalledQueryDto, HttpServletResponse response, String sort ) { Page<AlertCalledQueryDto> page = new Page<AlertCalledQueryDto>();
Page<AlertCalledQueryDto> page = new Page<AlertCalledQueryDto>(); String sortParam = "";
String sortParam = ""; String sortRule = "";
String sortRule = ""; if (sort != null) { // 排序失效
if(sort!=null) { // 排序失效 String[] date = sort.split(",");
String[] date= sort.split(","); if (date[1].equals("ascend")) {
if(date[1].equals("ascend")) { sortParam = RedisKey.humpToLine(date[0]);
sortParam = RedisKey.humpToLine(date[0]); sortRule = "asc";
sortRule = "asc"; } else {
}else { sortParam = RedisKey.humpToLine(date[0]);
sortParam =RedisKey.humpToLine(date[0]); sortRule = "desc";
sortRule = "desc"; }
} } else {
}else { sortParam = "call_time";
sortParam = "call_time"; sortRule = "desc";
sortRule = "desc"; }
} page.setCurrent(0);
page.setCurrent(0); page.setSize(Long.MAX_VALUE);
page.setSize(Long.MAX_VALUE); Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(page,
Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(page, alertCalledQueryDto.getWorkOrderNumber(), alertCalledQueryDto.getCreator(), alertCalledQueryDto.getEmergency(), alertCalledQueryDto.getEmergencyTimeStart(),
alertCalledQueryDto.getWorkOrderNumber(),alertCalledQueryDto.getCreator(),alertCalledQueryDto.getEmergency(),alertCalledQueryDto.getEmergencyTimeStart(), alertCalledQueryDto.getEmergencyTimeEnd(), alertCalledQueryDto.getEmergencyCall(), alertCalledQueryDto.getDeviceId(), alertCalledQueryDto.getElevatorAddress(),
alertCalledQueryDto.getEmergencyTimeEnd(),alertCalledQueryDto.getEmergencyCall(),alertCalledQueryDto.getDeviceId(),alertCalledQueryDto.getElevatorAddress(), alertCalledQueryDto.getDistrict(), alertCalledQueryDto.getAlertType(), alertCalledQueryDto.getAlertSource(), alertCalledQueryDto.getAlertStage(), alertCalledQueryDto.getAlertStatus(),
alertCalledQueryDto.getDistrict(),alertCalledQueryDto.getAlertType(),alertCalledQueryDto.getAlertSource(),alertCalledQueryDto.getAlertStage(),alertCalledQueryDto.getAlertStatus(), sortParam, sortRule);
sortParam,sortRule);
List<AlertCalledQueryDto> list = pageBean.getRecords();
List<AlertCalledQueryDto> list = pageBean.getRecords(); String fileName = "处置记录" + System.currentTimeMillis();
String fileName = "处置记录" + System.currentTimeMillis(); ExcelUtil.createTemplate(response, fileName, "处置记录", list, AlertCalledQueryDto.class, null, false);
ExcelUtil.createTemplate(response, fileName, "处置记录", list, AlertCalledQueryDto.class, null, false); }
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @ApiOperation(value = "导出接警记录信息", notes = "导出接警记录信息")
@ApiOperation(value = "导出接警记录信息", notes = "导出接警记录信息") @GetMapping("/exportAlertRecord")
@GetMapping("/exportAlertRecord") public void exportAlertRecord(AlertCalledRecordDto alertCalledQueryDto, HttpServletResponse response) {
public void exportAlertRecord(AlertCalledRecordDto alertCalledQueryDto, HttpServletResponse response) { List<AlertCalledRecordDto> list = iAlertCalledService.queryAlertRecordListByQueryDto(
List<AlertCalledRecordDto> list = iAlertCalledService.queryAlertRecordListByQueryDto( alertCalledQueryDto.getCallTimeStart() == null ? null
alertCalledQueryDto.getCallTimeStart() == null ? null : DateUtils.date2LongStr(alertCalledQueryDto.getCallTimeStart()),
: DateUtils.date2LongStr(alertCalledQueryDto.getCallTimeStart()), alertCalledQueryDto.getCallTimeEnd() == null ? null
alertCalledQueryDto.getCallTimeEnd() == null ? null : DateUtils.date2LongStr(alertCalledQueryDto.getCallTimeEnd()),
: DateUtils.date2LongStr(alertCalledQueryDto.getCallTimeEnd()), alertCalledQueryDto.getType(),
alertCalledQueryDto.getType(), alertCalledQueryDto.getAlertSource(),
alertCalledQueryDto.getAlertSource(), alertCalledQueryDto.getAlarmType());
alertCalledQueryDto.getAlarmType()); String fileName = "接警记录" + System.currentTimeMillis();
String fileName = "接警记录" + System.currentTimeMillis(); ExcelUtil.createTemplate(response, fileName, "接警记录", list, AlertCalledRecordDto.class, null, false);
ExcelUtil.createTemplate(response, fileName, "接警记录", list, AlertCalledRecordDto.class, null, false); }
}
/**
/** * 冻结工单-维修
* 冻结工单-维修 *
* * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @PostMapping(value = "/saveForzen")
@PostMapping(value = "/saveForzen") @ApiOperation(httpMethod = "POST", value = "冻结工单-维修", notes = "冻结工单-维修")
@ApiOperation(httpMethod = "POST", value = "冻结工单-维修", notes = "冻结工单-维修") public ResponseModel<Boolean> forzenAlertById(@RequestBody AlertCalledDto alertCalledDto) {
public ResponseModel<Boolean> forzenAlertById(@RequestBody AlertCalledDto alertCalledDto) { if (ValidationUtil.isEmpty(alertCalledDto.getSequenceNbr())
if (ValidationUtil.isEmpty(alertCalledDto.getSequenceNbr()) || ValidationUtil.isEmpty(alertCalledDto.getForzenResult())) {
|| ValidationUtil.isEmpty(alertCalledDto.getForzenResult())) { throw new BadRequest("参数校验失败.");
throw new BadRequest("参数校验失败."); }
} LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(AlertCalled::getForzenResult, alertCalledDto.getForzenResult());
updateWrapper.set(AlertCalled::getForzenResult, alertCalledDto.getForzenResult()); updateWrapper.set(AlertCalled::getAlertStatus, true);
updateWrapper.set(AlertCalled::getAlertStatus, true); updateWrapper.eq(AlertCalled::getSequenceNbr, alertCalledDto.getSequenceNbr());
updateWrapper.eq(AlertCalled::getSequenceNbr, alertCalledDto.getSequenceNbr()); Boolean flag = iAlertCalledService.update(updateWrapper);
Boolean flag = iAlertCalledService.update(updateWrapper); if (flag) {
if(flag) { AlertCalledDto alertCalledVo = iAlertCalledService.queryBySeq(alertCalledDto.getSequenceNbr());
AlertCalledDto alertCalledVo = iAlertCalledService.queryBySeq(alertCalledDto.getSequenceNbr()); try {
try { redisUtils.del(RedisKey.TZS_ALERTCALLED_ID + alertCalledVo.getSequenceNbr());
redisUtils.del(RedisKey.TZS_ALERTCALLED_ID+alertCalledVo.getSequenceNbr()); } catch (Exception e) {
} catch (Exception e) { e.printStackTrace();
e.printStackTrace(); logger.error("删除redis失败:" + e.getMessage());
logger.error("删除redis失败:" + e.getMessage()); }
} try {
try { eSAlertCalledService.updateEsAlertCalled(alertCalledVo);
eSAlertCalledService.updateEsAlertCalled(alertCalledVo); } catch (Exception e) {
} catch (Exception e) { e.printStackTrace();
e.printStackTrace(); logger.error("更新es失败:" + e.getMessage());
logger.error("更新es失败:" + e.getMessage()); }
} }
} return ResponseHelper.buildResponse(flag);
return ResponseHelper.buildResponse(flag); }
}
/**
/** * 工单结案-投诉
* 工单结案-投诉 *
* * @return
* @return */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @PostMapping(value = "/saveFinalReason")
@PostMapping(value = "/saveFinalReason") @ApiOperation(httpMethod = "POST", value = "工单结案-投诉", notes = "工单结案-投诉")
@ApiOperation(httpMethod = "POST", value = "工单结案-投诉", notes = "工单结案-投诉") public ResponseModel<Boolean> finishAlertById(@RequestBody AlertCalledDto alertCalledDto) {
public ResponseModel<Boolean> finishAlertById(@RequestBody AlertCalledDto alertCalledDto) { if (ValidationUtil.isEmpty(alertCalledDto.getFinalReason())
if (ValidationUtil.isEmpty(alertCalledDto.getFinalReason()) || ValidationUtil.isEmpty(alertCalledDto.getSequenceNbr())) {
|| ValidationUtil.isEmpty(alertCalledDto.getSequenceNbr())) { throw new BadRequest("参数校验失败.");
throw new BadRequest("参数校验失败."); }
} LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(AlertCalled::getFinalReason, alertCalledDto.getFinalReason());
updateWrapper.set(AlertCalled::getFinalReason, alertCalledDto.getFinalReason()); updateWrapper.set(AlertCalled::getAlertStatus, true);
updateWrapper.set(AlertCalled::getAlertStatus, true); updateWrapper.eq(AlertCalled::getSequenceNbr, alertCalledDto.getSequenceNbr());
updateWrapper.eq(AlertCalled::getSequenceNbr, alertCalledDto.getSequenceNbr()); Boolean flag = iAlertCalledService.update(updateWrapper);
Boolean flag = iAlertCalledService.update(updateWrapper); if (flag) {
if(flag) { AlertCalledDto alertCalledVo = iAlertCalledService.queryBySeq(alertCalledDto.getSequenceNbr());
AlertCalledDto alertCalledVo = iAlertCalledService.queryBySeq(alertCalledDto.getSequenceNbr()); try {
try { redisUtils.del(RedisKey.TZS_ALERTCALLED_ID + alertCalledVo.getSequenceNbr());
redisUtils.del(RedisKey.TZS_ALERTCALLED_ID+alertCalledVo.getSequenceNbr()); } catch (Exception e) {
} catch (Exception e) { e.printStackTrace();
e.printStackTrace(); logger.error("删除redis失败:" + e.getMessage());
logger.error("删除redis失败:" + e.getMessage()); }
} try {
try { eSAlertCalledService.updateEsAlertCalled(alertCalledVo);
eSAlertCalledService.updateEsAlertCalled(alertCalledVo); } catch (Exception e) {
} catch (Exception e) { e.printStackTrace();
e.printStackTrace(); logger.error("更新es失败:" + e.getMessage());
logger.error("更新es失败:" + e.getMessage()); }
} }
} return ResponseHelper.buildResponse(flag);
return ResponseHelper.buildResponse(flag); }
}
/**
/** * 今日应急统计
* 今日应急统计 */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @GetMapping(value = "/getTodayEmergencyCount")
@GetMapping(value = "/getTodayEmergencyCount") @ApiOperation(httpMethod = "GET", value = "今日应急统计", notes = "今日应急统计")
@ApiOperation(httpMethod = "GET", value = "今日应急统计", notes = "今日应急统计") public ResponseModel<Object> getTodayEmergencyCount(@RequestParam String regionCode) {
public ResponseModel<Object> getTodayEmergencyCount(@RequestParam String regionCode) { return ResponseHelper.buildResponse(iAlertCalledService.getTodayEmergencyCount(regionCode));
return ResponseHelper.buildResponse(iAlertCalledService.getTodayEmergencyCount(regionCode));
}
}
// //
// /** // /**
// * 重大事件 // * 重大事件
...@@ -652,131 +645,128 @@ public class AlertCalledController extends BaseController { ...@@ -652,131 +645,128 @@ public class AlertCalledController extends BaseController {
// //
// } // }
/** /**
* 获取重大事件或者今日应急的统计详情信息 * 获取重大事件或者今日应急的统计详情信息
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getImportantEventOrTodayEmergencyCount") @GetMapping(value = "/getImportantEventOrTodayEmergencyCount")
@ApiOperation(httpMethod = "GET", value = "重要大事件统计", notes = "重要大事件统计") @ApiOperation(httpMethod = "GET", value = "重要大事件统计", notes = "重要大事件统计")
public ResponseModel<Object> getImportantEventOrTodayEmergencyCount(@RequestParam String type,@RequestParam String regionCode) { public ResponseModel<Object> getImportantEventOrTodayEmergencyCount(@RequestParam String type, @RequestParam String regionCode) {
return ResponseHelper.buildResponse(iAlertCalledService.getImportantEventOrTodayEmergencyCount(type,regionCode)); return ResponseHelper.buildResponse(iAlertCalledService.getImportantEventOrTodayEmergencyCount(type, regionCode));
} }
/** /**
* 警情处置流程信息 * 警情处置流程信息
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getHandlerInfo") @GetMapping(value = "/getHandlerInfo")
@ApiOperation(httpMethod = "GET", value = "警情处置流程信息", notes = "警情处置流程信息") @ApiOperation(httpMethod = "GET", value = "警情处置流程信息", notes = "警情处置流程信息")
public ResponseModel<Object> getHandlerInfo(@RequestParam String alertId) { public ResponseModel<Object> getHandlerInfo(@RequestParam String alertId) {
return ResponseHelper.buildResponse(iAlertCalledService.getHandlerInfo(alertId)); return ResponseHelper.buildResponse(iAlertCalledService.getHandlerInfo(alertId));
} }
/** /**
* 获取接警未派遣事件 * 获取接警未派遣事件
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getCalledInfo") @GetMapping(value = "/getCalledInfo")
@ApiOperation(httpMethod = "GET", value = "获取接警未派遣事件", notes = "获取接警未派遣事件") @ApiOperation(httpMethod = "GET", value = "获取接警未派遣事件", notes = "获取接警未派遣事件")
public ResponseModel<Object> getCalledInfo() { public ResponseModel<Object> getCalledInfo() {
return ResponseHelper.buildResponse(iAlertCalledService.getCalledInfo()); return ResponseHelper.buildResponse(iAlertCalledService.getCalledInfo());
} }
/** /**
* 获取坐席情况 * 获取坐席情况
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getSeatInfos") @GetMapping(value = "/getSeatInfos")
@ApiOperation(httpMethod = "GET", value = "获取坐席情况", notes = "获取坐席情况") @ApiOperation(httpMethod = "GET", value = "获取坐席情况", notes = "获取坐席情况")
public ResponseModel<List<TzsCitInfoDto>> getSeatInfos() { public ResponseModel<List<TzsCitInfoDto>> getSeatInfos() {
return ResponseHelper.buildResponse(iAlertCalledService.getSeatInfos()); return ResponseHelper.buildResponse(iAlertCalledService.getSeatInfos());
} }
/** /**
* 根据regionCode 获取区域内实时警情 * 根据regionCode 获取区域内实时警情
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getActualAlert") @GetMapping(value = "/getActualAlert")
@ApiOperation(httpMethod = "GET", value = "根据regionCode 获取区域内实时警情", notes = "根据regionCode 获取区域内实时警情") @ApiOperation(httpMethod = "GET", value = "根据regionCode 获取区域内实时警情", notes = "根据regionCode 获取区域内实时警情")
public ResponseModel<List<AlertPaperInfoDto>> getActualAlert(@RequestParam(name = "regionCodes", required = false) List<String> regionCodes) { public ResponseModel<List<AlertPaperInfoDto>> getActualAlert(@RequestParam(name = "regionCodes", required = false) List<String> regionCodes) {
return ResponseHelper.buildResponse(iAlertCalledService.getAlertPaperInfoList(iAlertCalledService.authRegionCodeList(regionCodes),false)); return ResponseHelper.buildResponse(iAlertCalledService.getAlertPaperInfoList(iAlertCalledService.authRegionCodeList(regionCodes), false));
} }
/**
/** * 根据regionCode 获取区域内历史警情 七日内
* 根据regionCode 获取区域内历史警情 七日内 */
*/ @TycloudOperation(ApiLevel = UserType.AGENCY)
@TycloudOperation(ApiLevel = UserType.AGENCY) @GetMapping(value = "/getHistoryAlert")
@GetMapping(value = "/getHistoryAlert") @ApiOperation(httpMethod = "GET", value = "根据regionCode 获取区域内七日内历史警情", notes = "根据regionCode 获取区域内七日内历史警情")
@ApiOperation(httpMethod = "GET", value = "根据regionCode 获取区域内七日内历史警情", notes = "根据regionCode 获取区域内七日内历史警情") public ResponseModel<List<AlertPaperInfoDto>> getHistoryAlert(@RequestParam(name = "regionCodes", required = false) List<String> regionCodes) {
public ResponseModel<List<AlertPaperInfoDto>> getHistoryAlert(@RequestParam(name = "regionCodes", required = false) List<String> regionCodes) { // 警情id 警情地址 警情状态 警情类型 警情发生时间
// 警情id 警情地址 警情状态 警情类型 警情发生时间 // 获取自己的regionCode
// 获取自己的regionCode List<String> useRegionCode = tzsAuthService.getUserRegionCode();
List<String> useRegionCode = tzsAuthService.getUserRegionCode(); if (regionCodes == null) {
if(regionCodes == null) { regionCodes = useRegionCode;
regionCodes = useRegionCode; } else {
} else { // 判断传入regionCodes 是否越权
// 判断传入regionCodes 是否越权 List<String> tempList = new ArrayList<>();
List<String> tempList = new ArrayList<>(); Iterator<String> regionIt = regionCodes.iterator();
Iterator<String> regionIt = regionCodes.iterator(); while (regionIt.hasNext()) {
while(regionIt.hasNext()) { String tempCode = regionIt.next();
String tempCode = regionIt.next(); String districtCode = tempCode.substring(4, 6);
String districtCode = tempCode.substring(4,6); String provinceCode = tempCode.substring(2, 6);
String provinceCode = tempCode.substring(2,6); if ("0000".equals(provinceCode)) {// 为省则默认使用用户现有权限查询数据
if("0000".equals(provinceCode)) {// 为省则默认使用用户现有权限查询数据 regionCodes = useRegionCode;
regionCodes = useRegionCode; } else {
} else { if ("00".equals(districtCode)) { // 为市
if("00".equals(districtCode)) { // 为市 if (!useRegionCode.contains(tempCode)) { // 不包含该市权限 需要移除市搜索条件 添加 该市下区搜索条件
if(!useRegionCode.contains(tempCode)) { // 不包含该市权限 需要移除市搜索条件 添加 该市下区搜索条件 for (String tempUsercode : useRegionCode) {
for(String tempUsercode : useRegionCode) { if (tempUsercode.indexOf(tempCode.substring(0, 4)) != -1) {
if(tempUsercode.indexOf(tempCode.substring(0,4)) != -1) { tempList.add(tempUsercode);
tempList.add(tempUsercode); }
} }
} regionIt.remove();
regionIt.remove(); }
} } else { // 为区 不会出现越权情况
} else { // 为区 不会出现越权情况
}
} }
} }
} for (String t : tempList) {
for (String t : tempList) { regionCodes.add(t);
regionCodes.add(t); }
} }
} return ResponseHelper.buildResponse(iAlertCalledService.getAlertPaperInfoList(regionCodes, true));
return ResponseHelper.buildResponse(iAlertCalledService.getAlertPaperInfoList(regionCodes,true)); }
}
/**
/** * 获取电梯历史事件
* 获取电梯历史事件 * 字段:事件类型、设备地址、报送时间。倒序排列,默认加载3条,向下翻动时每次可再加载5条。点击事件主屏打开该事件详情
* 字段:事件类型、设备地址、报送时间。倒序排列,默认加载3条,向下翻动时每次可再加载5条。点击事件主屏打开该事件详情 *
* @param equipmentCode * @param equipmentCode
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getElevatorHistory/{equipmentCode}") @GetMapping(value = "/getElevatorHistory/{equipmentCode}")
@ApiOperation(httpMethod = "GET", value = "获取电梯历史事件", notes = "获取电梯历史事件") @ApiOperation(httpMethod = "GET", value = "获取电梯历史事件", notes = "获取电梯历史事件")
public ResponseModel<Page<AlertPaperInfoDto>> getEquipmentHistory(@PathVariable String equipmentCode, @RequestParam(value = "size") Integer size, @RequestParam(value = "current") Integer current) { public ResponseModel<Page<AlertPaperInfoDto>> getEquipmentHistory(@PathVariable String equipmentCode, @RequestParam(value = "size") Integer size, @RequestParam(value = "current") Integer current) {
// 警情id 警情地址 警情状态 警情类型 警情发生时间 // 警情id 警情地址 警情状态 警情类型 警情发生时间
// 获取自己的regionCode // 获取自己的regionCode
String equipmentClassCode = "3000"; String equipmentClassCode = "3000";
Page<AlertPaperInfoDto> result = new Page<>(current, size); Page<AlertPaperInfoDto> result = new Page<>(current, size);
List<String> useRegionCode = tzsAuthService.getUserRegionCode(); List<String> useRegionCode = tzsAuthService.getUserRegionCode();
List<AlertPaperInfoDto> list = iAlertCalledService.getEquipmentHistory(useRegionCode,equipmentClassCode,current, size,equipmentCode); List<AlertPaperInfoDto> list = iAlertCalledService.getEquipmentHistory(useRegionCode, equipmentClassCode, current, size, equipmentCode);
result.setRecords(list); result.setRecords(list);
result.setTotal(iAlertCalledService.getEquipmentHistoryCount(useRegionCode,equipmentClassCode,equipmentCode)); result.setTotal(iAlertCalledService.getEquipmentHistoryCount(useRegionCode, equipmentClassCode, equipmentCode));
return ResponseHelper.buildResponse(result); return ResponseHelper.buildResponse(result);
} }
} }
...@@ -8,8 +8,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController; ...@@ -8,8 +8,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.AlertFormInitDto; import com.yeejoin.amos.boot.module.ymt.api.entity.AlertForm;
import com.yeejoin.amos.boot.module.tzs.api.entity.AlertForm;
import com.yeejoin.amos.boot.module.ymt.biz.service.impl.AlertFormServiceImpl; import com.yeejoin.amos.boot.module.ymt.biz.service.impl.AlertFormServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
......
package com.yeejoin.amos.boot.module.ymt.biz.controller; package com.yeejoin.amos.boot.module.ymt.biz.controller;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.ymt.api.dto.BaseUnitLicenceDto;
import com.yeejoin.amos.boot.module.ymt.biz.service.impl.BaseUnitLicenceServiceImpl; import com.yeejoin.amos.boot.module.ymt.biz.service.impl.BaseUnitLicenceServiceImpl;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import java.util.List; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import java.util.List;
import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/** /**
* 单位注册许可信息表 * 单位注册许可信息表
...@@ -30,15 +31,15 @@ public class BaseUnitLicenceController extends BaseController { ...@@ -30,15 +31,15 @@ public class BaseUnitLicenceController extends BaseController {
@Autowired @Autowired
BaseUnitLicenceServiceImpl baseUnitLicenceServiceImpl; BaseUnitLicenceServiceImpl baseUnitLicenceServiceImpl;
/** /**
* 列表全部数据查询 * 列表全部数据查询
* *
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "单位注册许可信息表列表全部数据查询", notes = "单位注册许可信息表列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "单位注册许可信息表列表全部数据查询", notes = "单位注册许可信息表列表全部数据查询")
@GetMapping(value = "/{unitCode}/list") @GetMapping(value = "/{unitCode}/list")
public ResponseModel<List<BaseUnitLicenceDto>> selectForList(@PathVariable String unitCode) { public ResponseModel<List<BaseUnitLicenceDto>> selectForList(@PathVariable String unitCode) {
return ResponseHelper.buildResponse(baseUnitLicenceServiceImpl.queryForBaseUnitLicenceList(unitCode)); return ResponseHelper.buildResponse(baseUnitLicenceServiceImpl.queryForBaseUnitLicenceList(unitCode));
} }
} }
...@@ -2,14 +2,9 @@ package com.yeejoin.amos.boot.module.ymt.biz.controller; ...@@ -2,14 +2,9 @@ package com.yeejoin.amos.boot.module.ymt.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorStatusHandleDto; import com.yeejoin.amos.boot.module.ymt.api.dto.ElevatorStatusHandleDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorStatus; import com.yeejoin.amos.boot.module.ymt.api.entity.ElevatorStatus;
import com.yeejoin.amos.boot.module.tzs.api.enums.LiftBitStatusEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.*;
import com.yeejoin.amos.boot.module.tzs.api.enums.LiftDirectionEnum;
import com.yeejoin.amos.boot.module.tzs.api.enums.LiftDoorStatusEnum;
import com.yeejoin.amos.boot.module.tzs.api.enums.LiftIszoneEnum;
import com.yeejoin.amos.boot.module.tzs.api.enums.LiftServiceModelEnum;
import com.yeejoin.amos.boot.module.tzs.api.enums.LiftStatusEnum;
import com.yeejoin.amos.boot.module.ymt.biz.service.impl.ElevatorStatusServiceImpl; import com.yeejoin.amos.boot.module.ymt.biz.service.impl.ElevatorStatusServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -23,6 +18,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation; ...@@ -23,6 +18,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List; import java.util.List;
/** /**
......
package com.yeejoin.amos.boot.module.ymt.biz.service.impl; package com.yeejoin.amos.boot.module.ymt.biz.service.impl;
import com.yeejoin.amos.boot.module.tzs.api.entity.BaseUnitLicence;
import com.yeejoin.amos.boot.module.tzs.api.mapper.BaseUnitLicenceMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IBaseUnitLicenceService;
import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ymt.api.dto.BaseUnitLicenceDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.BaseUnitLicence;
import com.yeejoin.amos.boot.module.ymt.api.mapper.BaseUnitLicenceMapper;
import com.yeejoin.amos.boot.module.ymt.api.service.IBaseUnitLicenceService;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List; import java.util.List;
/** /**
...@@ -16,19 +17,20 @@ import java.util.List; ...@@ -16,19 +17,20 @@ import java.util.List;
* @date 2022-08-09 * @date 2022-08-09
*/ */
@Service @Service
public class BaseUnitLicenceServiceImpl extends BaseService<BaseUnitLicenceDto,BaseUnitLicence,BaseUnitLicenceMapper> implements IBaseUnitLicenceService { public class BaseUnitLicenceServiceImpl extends BaseService<BaseUnitLicenceDto, BaseUnitLicence, BaseUnitLicenceMapper> implements IBaseUnitLicenceService {
/** /**
* 分页查询 * 分页查询
*/ */
public Page<BaseUnitLicenceDto> queryForBaseUnitLicencePage(Page<BaseUnitLicenceDto> page) { public Page<BaseUnitLicenceDto> queryForBaseUnitLicencePage(Page<BaseUnitLicenceDto> page) {
return this.queryForPage(page, null, false); return this.queryForPage(page, null, false);
} }
/** /**
* 列表查询 * 列表查询
*
* @param unitCode 单位编号 * @param unitCode 单位编号
*/ */
public List<BaseUnitLicenceDto> queryForBaseUnitLicenceList(String unitCode) { public List<BaseUnitLicenceDto> queryForBaseUnitLicenceList(String unitCode) {
return this.queryForList("" , false, unitCode); return this.queryForList("", false, unitCode);
} }
} }
\ No newline at end of file
package com.yeejoin.amos.boot.module.ymt.biz.service.impl; package com.yeejoin.amos.boot.module.ymt.biz.service.impl;
import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorStatus;
import com.yeejoin.amos.boot.module.tzs.api.mapper.ElevatorStatusMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorStatusService;
import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorStatusDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ymt.api.dto.ElevatorStatusDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.ElevatorStatus;
import com.yeejoin.amos.boot.module.ymt.api.mapper.ElevatorStatusMapper;
import com.yeejoin.amos.boot.module.ymt.api.service.IElevatorStatusService;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List; import java.util.List;
/** /**
...@@ -16,18 +17,18 @@ import java.util.List; ...@@ -16,18 +17,18 @@ import java.util.List;
* @date 2021-09-28 * @date 2021-09-28
*/ */
@Service @Service
public class ElevatorStatusServiceImpl extends BaseService<ElevatorStatusDto,ElevatorStatus,ElevatorStatusMapper> implements IElevatorStatusService { public class ElevatorStatusServiceImpl extends BaseService<ElevatorStatusDto, ElevatorStatus, ElevatorStatusMapper> implements IElevatorStatusService {
/** /**
* 分页查询 * 分页查询
*/ */
public Page<ElevatorStatusDto> queryForElevatorStatusPage(Page<ElevatorStatusDto> page) { public Page<ElevatorStatusDto> queryForElevatorStatusPage(Page<ElevatorStatusDto> page) {
return this.queryForPage(page, null, false); return this.queryForPage(page, null, false);
} }
/** /**
* 列表查询 示例 * 列表查询 示例
*/ */
public List<ElevatorStatusDto> queryForElevatorStatusList() { public List<ElevatorStatusDto> queryForElevatorStatusList() {
return this.queryForList("" , false); return this.queryForList("", false);
} }
} }
\ No newline at end of file
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