Skip to content

A
amos-boot-biz
Commit 62650e3b authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.pom修改

parent 0a4a58f3
Show whitespace changes
Inline Side-by-side
Showing with 224 additions and 172 deletions
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/pom.xml
View file @ 62650e3b
......@@ -10,6 +10,17 @@
<modelVersion>4.0.0</modelVersion>
<version>1.0.0</version>
<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>
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/pom.xml
View file @ 62650e3b
......@@ -16,6 +16,11 @@
<artifactId>amos-boot-module-96333-api</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
......
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/pom.xml
View file @ 62650e3b
......@@ -19,9 +19,8 @@
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-tzs-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
<artifactId>amos-boot-module-common-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies>
......
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/pom.xml
View file @ 62650e3b
......@@ -16,6 +16,11 @@
<artifactId>amos-boot-module-cylinder-api</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
......
amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/pom.xml
View file @ 62650e3b
......@@ -10,6 +10,17 @@
<modelVersion>4.0.0</modelVersion>
<version>1.0.0</version>
<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>
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/pom.xml
View file @ 62650e3b
......@@ -16,6 +16,11 @@
<artifactId>amos-boot-module-jczs-api</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/pom.xml
View file @ 62650e3b
......@@ -10,6 +10,17 @@
<modelVersion>4.0.0</modelVersion>
<version>1.0.0</version>
<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>
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ElevatorInsureDto.java
View file @ 62650e3b
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
......@@ -17,7 +18,7 @@ import java.util.List;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElevatorInsureDto", description="保险信息")
@ApiModel(value = "ElevatorInsureDto", description = "保险信息")
public class ElevatorInsureDto extends BaseDto {
private static final long serialVersionUID = 1L;
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/pom.xml
View file @ 62650e3b
......@@ -16,6 +16,11 @@
<artifactId>amos-boot-module-ymt-api</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-biz</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/AmosYmtApplication.java
View file @ 62650e3b
package com.yeejoin.amos;
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.mybatis.spring.annotation.MapperScan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
......@@ -13,6 +17,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.core.env.Environment;
import org.springframework.scheduling.annotation.EnableAsync;
......@@ -45,32 +50,32 @@ import java.net.UnknownHostException;
@ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" })
public class AmosYmtApplication {
private static final Logger logger = LoggerFactory.getLogger(AmosYmtApplication.class);
// @Autowired
// private EmqKeeper emqKeeper;
//
// @Autowired
// private CarcylUnitInspectMqTtlListener carcylUnitInspectMqTtlListener;
//
// @Autowired
// private BaseEnterpriseMqTtlListener baseEnterpriseMqTtlListener;
//
// @Autowired
// private StartPlatformTokenService startPlatformTokenService;
//
// @Autowired
// private PrivilegeCompanyUpdateAddListener privilegeCompanyUpdateAddListener;
//
// @Autowired
// private PrivilegeCompanyDeleteListener privilegeCompanyDeleteListener;
//
// @Autowired
// private FillingRecordSyncListener fillingRecordSyncListener;
//
// @Autowired
// private AmosMqttListener amosMqTtlListener;
//
// @Autowired
// ICylinderInfoService cylinderInfoServiceImpl;
@Autowired
private EmqKeeper emqKeeper;
@Autowired
private CarcylUnitInspectMqTtlListener carcylUnitInspectMqTtlListener;
@Autowired
private BaseEnterpriseMqTtlListener baseEnterpriseMqTtlListener;
@Autowired
private StartPlatformTokenService startPlatformTokenService;
@Autowired
private PrivilegeCompanyUpdateAddListener privilegeCompanyUpdateAddListener;
@Autowired
private PrivilegeCompanyDeleteListener privilegeCompanyDeleteListener;
@Autowired
private FillingRecordSyncListener fillingRecordSyncListener;
@Autowired
private AmosMqttListener amosMqTtlListener;
@Autowired
ICylinderInfoService cylinderInfoServiceImpl;
public static void main(String[] args) throws UnknownHostException {
ConfigurableApplicationContext context = SpringApplication.run(AmosYmtApplication.class, args);
......@@ -89,20 +94,20 @@ public class AmosYmtApplication {
*
* @throws MqttException
*/
// @Bean
// public void initMqtt() throws Exception {
// emqKeeper.subscript("/idx/idx_biz_carcyl_unit_inspect", 2, carcylUnitInspectMqTtlListener);
// emqKeeper.subscript("/tm/tz_base_enterprise_info", 2, baseEnterpriseMqTtlListener);
// emqKeeper.subscript("/tz/privilege_company_add_update", 2, privilegeCompanyUpdateAddListener);
// emqKeeper.subscript("/tz/privilege_company_delete", 2, privilegeCompanyDeleteListener);
// emqKeeper.subscript("/tzs/sync/fillingRecord", 2, fillingRecordSyncListener);
// emqKeeper.subscript("tzs/oneCodePass/deviceSave", 2, amosMqTtlListener);
//// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam", 1, examMqTtlListener);
//// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam_record", 1, examMqTtRecordListener);
// }
@Bean
public void initMqtt() throws Exception {
emqKeeper.subscript("/idx/idx_biz_carcyl_unit_inspect", 2, carcylUnitInspectMqTtlListener);
emqKeeper.subscript("/tm/tz_base_enterprise_info", 2, baseEnterpriseMqTtlListener);
emqKeeper.subscript("/tz/privilege_company_add_update", 2, privilegeCompanyUpdateAddListener);
emqKeeper.subscript("/tz/privilege_company_delete", 2, privilegeCompanyDeleteListener);
emqKeeper.subscript("/tzs/sync/fillingRecord", 2, fillingRecordSyncListener);
emqKeeper.subscript("tzs/oneCodePass/deviceSave", 2, amosMqTtlListener);
// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam", 1, examMqTtlListener);
// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam_record", 1, examMqTtRecordListener);
}
// @Bean
// public void initToken() {
// startPlatformTokenService.getToken();
// }
@Bean
public void initToken() {
startPlatformTokenService.getToken();
}
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/AlertCalledController.java
View file @ 62650e3b
......@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.SystemClock;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
......@@ -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.module.common.api.excel.ExcelUtil;
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.tzs.api.entity.*;
import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
import com.yeejoin.amos.boot.module.tzs.api.service.TzsAuthService;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.*;
import com.yeejoin.amos.boot.module.ymt.api.dto.AlertCalledDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.AlertCalledObjsDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.AlertPaperInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.AlertCalled;
import com.yeejoin.amos.boot.module.ymt.api.entity.Elevator;
import com.yeejoin.amos.boot.module.ymt.api.entity.WechatRelation;
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.BeanDtoVoUtils;
import com.yeejoin.amos.boot.module.ymt.biz.service.impl.*;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -33,13 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
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.springframework.web.bind.annotation.*;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......@@ -125,9 +119,9 @@ public class AlertCalledController extends BaseController {
}
LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Elevator::getRescueCode,alertCalledObjsDto.getAlertCalledDto().getDeviceId());
queryWrapper.eq(Elevator::getRescueCode, alertCalledObjsDto.getAlertCalledDto().getDeviceId());
Elevator elevator = iElevatorService.getOne(queryWrapper);
if(elevator == null) {
if (elevator == null) {
throw new BadRequest("未找到相关电梯.");
}
......@@ -135,24 +129,24 @@ public class AlertCalledController extends BaseController {
alertCalledObjsDto = iAlertCalledService.createAlertCalled(alertCalledObjsDto, reginParams.getUserModel());
// 坐席接警后，辅屏由常态化切换为处置态
AgencyUserModel user =getUserInfo();
AgencyUserModel user = getUserInfo();
JSONObject jsonObject = new JSONObject();
jsonObject.put("userId",user.getUserId());
jsonObject.put("alertId",String.valueOf(alertCalledObjsDto.getAlertCalledDto().getSequenceNbr()));
jsonObject.put("userId", user.getUserId());
jsonObject.put("alertId", String.valueOf(alertCalledObjsDto.getAlertCalledDto().getSequenceNbr()));
JSONObject jsonObject1 = new JSONObject();
jsonObject.put("alertId",String.valueOf(alertCalledObjsDto.getAlertCalledDto().getSequenceNbr()));
jsonObject.put("alertId", String.valueOf(alertCalledObjsDto.getAlertCalledDto().getSequenceNbr()));
try {
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);
}
} catch (MqttException e) {
logger.error("mqtt发送失败" +jsonObject );
logger.error("mqtt发送失败" + jsonObject);
} catch (UnsupportedEncodingException e) {
logger.error("mqtt发送失败" +jsonObject );
logger.error("mqtt发送失败" + jsonObject);
}
return ResponseHelper.buildResponse(alertCalledObjsDto.getAlertCalledDto());
}
......@@ -222,8 +216,8 @@ public class AlertCalledController extends BaseController {
iAlertCalledService.selectAlertCalledByIdNew(alertPaperInfoDto);
LambdaQueryWrapper<Elevator> queryWrapper1= new LambdaQueryWrapper<>();
queryWrapper1.eq(Elevator::getSequenceNbr,alertCalled.getEquipmentId());
LambdaQueryWrapper<Elevator> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(Elevator::getSequenceNbr, alertCalled.getEquipmentId());
Elevator elevator = elevatorService.getOne(queryWrapper1);
alertPaperInfoDto.setArea(elevator.getProvince() + elevator.getCity() + elevator.getDistrict());
......@@ -235,18 +229,17 @@ public class AlertCalledController extends BaseController {
alertPaperInfoDto.setRegionCode(elevator.getRegionCode());
alertPaperInfoDto.setRescueCode(elevator.getRescueCode());
alertPaperInfoDto.setAlertStatus(alertCalled.getAlertStage());
alertPaperInfoDto.setElevatorId(elevator.getSequenceNbr() +"");
alertPaperInfoDto.setElevatorId(elevator.getSequenceNbr() + "");
alertPaperInfoDto.setElevatorCode(elevator.getRegisterCode());
DispatchPaper paper = dispatchPaperServiceImpl.getOne(new LambdaQueryWrapper<DispatchPaper>().eq(DispatchPaper::getIsDelete,false).eq(DispatchPaper::getAlertId,alertId));
if(paper != null) {
DispatchPaper paper = dispatchPaperServiceImpl.getOne(new LambdaQueryWrapper<DispatchPaper>().eq(DispatchPaper::getIsDelete, false).eq(DispatchPaper::getAlertId, alertId));
if (paper != null) {
alertPaperInfoDto.setFinishTime(paper.getFeedbackFinishTime());
}
return ResponseHelper.buildResponse(alertPaperInfoDto);
}
/**
*
* <pre>
* 相似警情分页查询
* </pre>
......@@ -412,7 +405,7 @@ public class AlertCalledController extends BaseController {
pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
}
page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
int num= iAlertCalledService.count(alertCalledQueryWrapper);
int num = iAlertCalledService.count(alertCalledQueryWrapper);
pageBean.setTotal(num);
IPage<AlertCalledDto> calledVoIPage = AlertBeanDtoVoUtils.alertCalledIPageDto(page);
return ResponseHelper.buildResponse(calledVoIPage);
......@@ -425,22 +418,22 @@ public class AlertCalledController extends BaseController {
//根据当前登陆人的所在区域 找到该区域内的接警人id 再找到相关警情
Set<String> userIds = new HashSet<>();
String regionCode = this.getSelectedOrgInfo().getCompany().getRegionCode();
List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode,regionCode));
if(!ValidationUtil.isEmpty(citInfoList)){
for(TzsCitInfo citInfo : citInfoList){
List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode, regionCode));
if (!ValidationUtil.isEmpty(citInfoList)) {
for (TzsCitInfo citInfo : citInfoList) {
userIds.add(citInfo.getCtiUserId());
}
}
queryWrapper.in("rec_user_id",userIds);
queryWrapper.in("rec_user_id", userIds);
if(sort!=null) { // 排序失效
String[] date= sort.split(",");
if(date[1].equals("ascend")) {
if (sort != null) { // 排序失效
String[] date = sort.split(",");
if (date[1].equals("ascend")) {
queryWrapper.orderByAsc(RedisKey.humpToLine(date[0]));
}else {
} else {
queryWrapper.orderByDesc(RedisKey.humpToLine(date[0]));
}
}else {
} else {
queryWrapper.orderByDesc("call_time");
}
......@@ -477,30 +470,30 @@ public class AlertCalledController extends BaseController {
@ApiOperation(value = "查询警情事件记录", notes = "查询警情事件记录")
@GetMapping("/selectRecord")
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.setCurrent(pageNum);
page.setSize(pageSize);
String sortParam = "";
String sortRule = "";
if(sort!=null) { // 排序失效
String[] date= sort.split(",");
if(date[1].equals("ascend")) {
if (sort != null) { // 排序失效
String[] date = sort.split(",");
if (date[1].equals("ascend")) {
sortParam = RedisKey.humpToLine(date[0]);
sortRule = "asc";
}else {
sortParam =RedisKey.humpToLine(date[0]);
} else {
sortParam = RedisKey.humpToLine(date[0]);
sortRule = "desc";
}
}else {
} else {
sortParam = "call_time";
sortRule = "desc";
}
Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(page,
alertCalledQueryDto.getWorkOrderNumber(),alertCalledQueryDto.getCreator(),alertCalledQueryDto.getEmergency(),alertCalledQueryDto.getEmergencyTimeStart(),
alertCalledQueryDto.getEmergencyTimeEnd(),alertCalledQueryDto.getEmergencyCall(),alertCalledQueryDto.getDeviceId(),alertCalledQueryDto.getElevatorAddress(),
alertCalledQueryDto.getDistrict(),alertCalledQueryDto.getAlertType(),alertCalledQueryDto.getAlertSource(),alertCalledQueryDto.getAlertStage(),alertCalledQueryDto.getAlertStatus(),
sortParam,sortRule);
alertCalledQueryDto.getWorkOrderNumber(), alertCalledQueryDto.getCreator(), alertCalledQueryDto.getEmergency(), alertCalledQueryDto.getEmergencyTimeStart(),
alertCalledQueryDto.getEmergencyTimeEnd(), alertCalledQueryDto.getEmergencyCall(), alertCalledQueryDto.getDeviceId(), alertCalledQueryDto.getElevatorAddress(),
alertCalledQueryDto.getDistrict(), alertCalledQueryDto.getAlertType(), alertCalledQueryDto.getAlertSource(), alertCalledQueryDto.getAlertStage(), alertCalledQueryDto.getAlertStatus(),
sortParam, sortRule);
Page<AlertCalledQueryDto> result = new Page<AlertCalledQueryDto>(alertCalledQueryDto.getPageNum(),
alertCalledQueryDto.getPageSize());
long totle = pageBean.getTotal();
......@@ -512,30 +505,30 @@ public class AlertCalledController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "导出警情事件记录", notes = "导出警情事件记录")
@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>();
String sortParam = "";
String sortRule = "";
if(sort!=null) { // 排序失效
String[] date= sort.split(",");
if(date[1].equals("ascend")) {
if (sort != null) { // 排序失效
String[] date = sort.split(",");
if (date[1].equals("ascend")) {
sortParam = RedisKey.humpToLine(date[0]);
sortRule = "asc";
}else {
sortParam =RedisKey.humpToLine(date[0]);
} else {
sortParam = RedisKey.humpToLine(date[0]);
sortRule = "desc";
}
}else {
} else {
sortParam = "call_time";
sortRule = "desc";
}
page.setCurrent(0);
page.setSize(Long.MAX_VALUE);
Page<AlertCalledQueryDto> pageBean = iAlertCalledService.queryAlertListByQueryDto(page,
alertCalledQueryDto.getWorkOrderNumber(),alertCalledQueryDto.getCreator(),alertCalledQueryDto.getEmergency(),alertCalledQueryDto.getEmergencyTimeStart(),
alertCalledQueryDto.getEmergencyTimeEnd(),alertCalledQueryDto.getEmergencyCall(),alertCalledQueryDto.getDeviceId(),alertCalledQueryDto.getElevatorAddress(),
alertCalledQueryDto.getDistrict(),alertCalledQueryDto.getAlertType(),alertCalledQueryDto.getAlertSource(),alertCalledQueryDto.getAlertStage(),alertCalledQueryDto.getAlertStatus(),
sortParam,sortRule);
alertCalledQueryDto.getWorkOrderNumber(), alertCalledQueryDto.getCreator(), alertCalledQueryDto.getEmergency(), alertCalledQueryDto.getEmergencyTimeStart(),
alertCalledQueryDto.getEmergencyTimeEnd(), alertCalledQueryDto.getEmergencyCall(), alertCalledQueryDto.getDeviceId(), alertCalledQueryDto.getElevatorAddress(),
alertCalledQueryDto.getDistrict(), alertCalledQueryDto.getAlertType(), alertCalledQueryDto.getAlertSource(), alertCalledQueryDto.getAlertStage(), alertCalledQueryDto.getAlertStatus(),
sortParam, sortRule);
List<AlertCalledQueryDto> list = pageBean.getRecords();
String fileName = "处置记录" + System.currentTimeMillis();
......@@ -576,10 +569,10 @@ public class AlertCalledController extends BaseController {
updateWrapper.set(AlertCalled::getAlertStatus, true);
updateWrapper.eq(AlertCalled::getSequenceNbr, alertCalledDto.getSequenceNbr());
Boolean flag = iAlertCalledService.update(updateWrapper);
if(flag) {
if (flag) {
AlertCalledDto alertCalledVo = iAlertCalledService.queryBySeq(alertCalledDto.getSequenceNbr());
try {
redisUtils.del(RedisKey.TZS_ALERTCALLED_ID+alertCalledVo.getSequenceNbr());
redisUtils.del(RedisKey.TZS_ALERTCALLED_ID + alertCalledVo.getSequenceNbr());
} catch (Exception e) {
e.printStackTrace();
logger.error("删除redis失败:" + e.getMessage());
......@@ -612,10 +605,10 @@ public class AlertCalledController extends BaseController {
updateWrapper.set(AlertCalled::getAlertStatus, true);
updateWrapper.eq(AlertCalled::getSequenceNbr, alertCalledDto.getSequenceNbr());
Boolean flag = iAlertCalledService.update(updateWrapper);
if(flag) {
if (flag) {
AlertCalledDto alertCalledVo = iAlertCalledService.queryBySeq(alertCalledDto.getSequenceNbr());
try {
redisUtils.del(RedisKey.TZS_ALERTCALLED_ID+alertCalledVo.getSequenceNbr());
redisUtils.del(RedisKey.TZS_ALERTCALLED_ID + alertCalledVo.getSequenceNbr());
} catch (Exception e) {
e.printStackTrace();
logger.error("删除redis失败:" + e.getMessage());
......@@ -658,8 +651,8 @@ public class AlertCalledController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getImportantEventOrTodayEmergencyCount")
@ApiOperation(httpMethod = "GET", value = "重要大事件统计", notes = "重要大事件统计")
public ResponseModel<Object> getImportantEventOrTodayEmergencyCount(@RequestParam String type,@RequestParam String regionCode) {
return ResponseHelper.buildResponse(iAlertCalledService.getImportantEventOrTodayEmergencyCount(type,regionCode));
public ResponseModel<Object> getImportantEventOrTodayEmergencyCount(@RequestParam String type, @RequestParam String regionCode) {
return ResponseHelper.buildResponse(iAlertCalledService.getImportantEventOrTodayEmergencyCount(type, regionCode));
}
......@@ -704,11 +697,10 @@ public class AlertCalledController extends BaseController {
@GetMapping(value = "/getActualAlert")
@ApiOperation(httpMethod = "GET", value = "根据regionCode 获取区域内实时警情", notes = "根据regionCode 获取区域内实时警情")
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 获取区域内历史警情 七日内
*/
......@@ -719,23 +711,23 @@ public class AlertCalledController extends BaseController {
// 警情id 警情地址 警情状态 警情类型 警情发生时间
// 获取自己的regionCode
List<String> useRegionCode = tzsAuthService.getUserRegionCode();
if(regionCodes == null) {
if (regionCodes == null) {
regionCodes = useRegionCode;
} else {
// 判断传入regionCodes 是否越权
List<String> tempList = new ArrayList<>();
Iterator<String> regionIt = regionCodes.iterator();
while(regionIt.hasNext()) {
while (regionIt.hasNext()) {
String tempCode = regionIt.next();
String districtCode = tempCode.substring(4,6);
String provinceCode = tempCode.substring(2,6);
if("0000".equals(provinceCode)) {// 为省则默认使用用户现有权限查询数据
String districtCode = tempCode.substring(4, 6);
String provinceCode = tempCode.substring(2, 6);
if ("0000".equals(provinceCode)) {// 为省则默认使用用户现有权限查询数据
regionCodes = useRegionCode;
} else {
if("00".equals(districtCode)) { // 为市
if(!useRegionCode.contains(tempCode)) { // 不包含该市权限 需要移除市搜索条件 添加 该市下区搜索条件
for(String tempUsercode : useRegionCode) {
if(tempUsercode.indexOf(tempCode.substring(0,4)) != -1) {
if ("00".equals(districtCode)) { // 为市
if (!useRegionCode.contains(tempCode)) { // 不包含该市权限 需要移除市搜索条件 添加 该市下区搜索条件
for (String tempUsercode : useRegionCode) {
if (tempUsercode.indexOf(tempCode.substring(0, 4)) != -1) {
tempList.add(tempUsercode);
}
}
......@@ -750,13 +742,14 @@ public class AlertCalledController extends BaseController {
regionCodes.add(t);
}
}
return ResponseHelper.buildResponse(iAlertCalledService.getAlertPaperInfoList(regionCodes,true));
return ResponseHelper.buildResponse(iAlertCalledService.getAlertPaperInfoList(regionCodes, true));
}
/**
* 获取电梯历史事件
* 字段：事件类型、设备地址、报送时间。倒序排列，默认加载3条，向下翻动时每次可再加载5条。点击事件主屏打开该事件详情
*
* @param equipmentCode
* @return
*/
......@@ -769,14 +762,11 @@ public class AlertCalledController extends BaseController {
String equipmentClassCode = "3000";
Page<AlertPaperInfoDto> result = new Page<>(current, size);
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.setTotal(iAlertCalledService.getEquipmentHistoryCount(useRegionCode,equipmentClassCode,equipmentCode));
result.setTotal(iAlertCalledService.getEquipmentHistoryCount(useRegionCode, equipmentClassCode, equipmentCode));
return ResponseHelper.buildResponse(result);
}
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/AlertFormController.java
View file @ 62650e3b
......@@ -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.RedisKey;
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.tzs.api.entity.AlertForm;
import com.yeejoin.amos.boot.module.ymt.api.entity.AlertForm;
import com.yeejoin.amos.boot.module.ymt.biz.service.impl.AlertFormServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/BaseUnitLicenceController.java
View file @ 62650e3b
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 org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
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 com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
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;
import java.util.List;
/**
* 单位注册许可信息表
......@@ -36,7 +37,7 @@ public class BaseUnitLicenceController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "单位注册许可信息表列表全部数据查询", notes = "单位注册许可信息表列表全部数据查询")
@ApiOperation(httpMethod = "GET", value = "单位注册许可信息表列表全部数据查询", notes = "单位注册许可信息表列表全部数据查询")
@GetMapping(value = "/{unitCode}/list")
public ResponseModel<List<BaseUnitLicenceDto>> selectForList(@PathVariable String unitCode) {
return ResponseHelper.buildResponse(baseUnitLicenceServiceImpl.queryForBaseUnitLicenceList(unitCode));
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/ElevatorStatusController.java
View file @ 62650e3b
......@@ -2,14 +2,9 @@ package com.yeejoin.amos.boot.module.ymt.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.tzs.api.entity.ElevatorStatus;
import com.yeejoin.amos.boot.module.tzs.api.enums.LiftBitStatusEnum;
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.api.dto.ElevatorStatusHandleDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.ElevatorStatus;
import com.yeejoin.amos.boot.module.ymt.api.enums.*;
import com.yeejoin.amos.boot.module.ymt.biz.service.impl.ElevatorStatusServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -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.ResponseModel;
import java.util.List;
/**
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/BaseUnitLicenceServiceImpl.java
View file @ 62650e3b
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.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;
/**
......@@ -16,7 +17,7 @@ import java.util.List;
* @date 2022-08-09
*/
@Service
public class BaseUnitLicenceServiceImpl extends BaseService<BaseUnitLicenceDto,BaseUnitLicence,BaseUnitLicenceMapper> implements IBaseUnitLicenceService {
public class BaseUnitLicenceServiceImpl extends BaseService<BaseUnitLicenceDto, BaseUnitLicence, BaseUnitLicenceMapper> implements IBaseUnitLicenceService {
/**
* 分页查询
*/
......@@ -26,9 +27,10 @@ public class BaseUnitLicenceServiceImpl extends BaseService<BaseUnitLicenceDto,B
/**
* 列表查询
*
* @param unitCode 单位编号
*/
public List<BaseUnitLicenceDto> queryForBaseUnitLicenceList(String unitCode) {
return this.queryForList("" , false, unitCode);
return this.queryForList("", false, unitCode);
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/ElevatorStatusServiceImpl.java
View file @ 62650e3b
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.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;
/**
......@@ -16,7 +17,7 @@ import java.util.List;
* @date 2021-09-28
*/
@Service
public class ElevatorStatusServiceImpl extends BaseService<ElevatorStatusDto,ElevatorStatus,ElevatorStatusMapper> implements IElevatorStatusService {
public class ElevatorStatusServiceImpl extends BaseService<ElevatorStatusDto, ElevatorStatus, ElevatorStatusMapper> implements IElevatorStatusService {
/**
* 分页查询
*/
......@@ -28,6 +29,6 @@ public class ElevatorStatusServiceImpl extends BaseService<ElevatorStatusDto,Ele
* 列表查询 示例
*/
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