Skip to content

A
amos-boot-biz
Commit 1f364474 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'developer' into develop_dl_plan6

parents 2e4cd6b0 916edd10
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 105 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java
View file @ 1f364474
...@@ -39,55 +39,9 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> { ...@@ -39,55 +39,9 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
Long sequenceNbr); Long sequenceNbr);
int selectAllCount(); int selectAllCount();
/**
* 查询我发起的 分页
* current 当前页
* size 条数
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @return
*/
List<FailureDetails> selectISubPage(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
/**
* 查询待处理 分页
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @param
* @return
*/
List<FailureDetails> selectInProcessing(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
/**
* 查询待处理 应急指挥科人员分页
*
* @param
* @return
*/
List<FailureDetails> selectStatusWaitTj(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
/**
* 查询待处理 维修人员分页
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @param
* @return
*/
List<FailureDetails> selectStatusWaitWx(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
List<FailureDetails> queryForWaitManage(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid,String ruleName);
/** /**
* 统计 全部 * 统计 全部
...@@ -99,7 +53,23 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> { ...@@ -99,7 +53,23 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
* @return * @return
*/ */
List<StatusDto> selectStatusCount(Long currentStatus, String startTime, String endTime, Integer submissionPid); List<StatusDto> selectStatusCount(Long currentStatus, String startTime, String endTime, Integer submissionPid);
List<StatusDto> queryStatusCount(Long currentStatus, String startTime, String endTime, Integer submissionPid,String ruleName);
List<StatusDto> queryAcceptCount(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId,String ruleName);
List<FailureDetails> selectForReceive(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId,Long current, Long size,String ruleName);
/* List<StatusDto> selectAudit(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
List<StatusDto> selectMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
List<StatusDto> selectUserId(Long currentStatus, String startTime, String endTime, String userId);*/
/* List<FailureDetails> selectYJ(Long currentStatus, String startTime, String endTime, String userId,Long current, Long size);*/
/* List<FailureDetails> selectForAudit(Long currentStatus, String startTime, String endTime,Integer submissionPid, String userId,Long current, Long size);*/
/* List<FailureDetails> selectForMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId,Long current, Long size);*/
/** /**
* 统计 维修人员 * 统计 维修人员
...@@ -110,9 +80,9 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> { ...@@ -110,9 +80,9 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
* @param submissionPid 报送人 * @param submissionPid 报送人
* @return * @return
*/ */
List<StatusDto> selectStatusWx(Long currentStatus, String startTime, String endTime, Integer submissionPid); /* List<StatusDto> selectStatusWx(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/** *//**
* 统计 应急指挥科人员 * 统计 应急指挥科人员
* *
* @param currentStatus 状态 * @param currentStatus 状态
...@@ -120,10 +90,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> { ...@@ -120,10 +90,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
* @param endTime 结束时间 * @param endTime 结束时间
* @param submissionPid 报送人 * @param submissionPid 报送人
* @return * @return
*/ *//*
List<StatusDto> selectStatusFq(Long currentStatus, String startTime, String endTime, Integer submissionPid); List<StatusDto> selectStatusFq(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/** *//**
* 统计 我发起 * 统计 我发起
* *
* @param currentStatus 状态 * @param currentStatus 状态
...@@ -131,10 +101,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> { ...@@ -131,10 +101,10 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
* @param endTime 结束时间 * @param endTime 结束时间
* @param submissionPid 报送人 * @param submissionPid 报送人
* @return * @return
*/ *//*
List<StatusDto> selectStatusFqp(Long currentStatus, String startTime, String endTime, Integer submissionPid); List<StatusDto> selectStatusFqp(Long currentStatus, String startTime, String endTime, Integer submissionPid);
/** *//**
* 统计 领导 * 统计 领导
* *
* @param currentStatus 状态 * @param currentStatus 状态
...@@ -142,22 +112,56 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> { ...@@ -142,22 +112,56 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
* @param endTime 结束时间 * @param endTime 结束时间
* @param submissionPid 报送人 * @param submissionPid 报送人
* @return * @return
*/ *//*
List<StatusDto> selectStatusLeader(Long currentStatus, String startTime, String endTime, Integer submissionPid); List<StatusDto> selectStatusLeader(Long currentStatus, String startTime, String endTime, Integer submissionPid);*/
List<StatusDto> selectAudit(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
List<StatusDto> selectMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
List<StatusDto> selectUserId(Long currentStatus, String startTime, String endTime, String userId);
List<FailureDetails> selectYJ(Long currentStatus, String startTime, String endTime, String userId,Long current, Long size);
List<FailureDetails> selectForAudit(Long currentStatus, String startTime, String endTime,Integer submissionPid, String userId,Long current, Long size);
/* /**
* 查询待处理 分页
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @param
* @return
*//*
List<FailureDetails> selectInProcessing(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);
List<FailureDetails> selectForMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId,Long current, Long size); /**
* 查询待处理 应急指挥科人员分页
*
* @param
* @return
*//*
List<FailureDetails> selectStatusWaitTj(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);*/
/* /**
* 查询待处理 维修人员分页
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @param
* @return
*//*
List<FailureDetails> selectStatusWaitWx(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);*/
/* *//**
* 查询我发起的 分页
* current 当前页
* size 条数
*
* @param currentStatus 当前任务状态
* * @param startTime 起始时间
* * @param endTime 结束时间
* * @param submissionPid 报送人
* @return
*//*
List<FailureDetails> selectISubPage(Long current, Long size, Long currentStatus,
String startTime, String endTime, Integer submissionPid);*/
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java
View file @ 1f364474
...@@ -98,25 +98,37 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -98,25 +98,37 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
*/ */
public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus, public IPage<FailureDetails> queryForFailureDetailsPage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus,
String startTime, String endTime, Integer userId, Integer type) { String startTime, String endTime, Integer userId, Integer type) {
//当传递类型参数为全部查询时 //当传递类型参数为全部查询 或者 为我提交时
if (type.equals(SELECY_ALL)) { if (type.equals(SELECY_ALL) ) {
List<FailureDetails> list = this.baseMapper.selectAllPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId); List<FailureDetails> list = this.baseMapper.selectAllPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId);
IPage<FailureDetails> iPage = new Page<>(); IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(list); iPage.setRecords(list);
return iPage; return iPage;
} }
//当传递类型参数为我提交时
//当传递类型参数 为我提交时
if (type.equals(SELECY_ISUBMIT)) { if (type.equals(SELECY_ISUBMIT)) {
List<FailureDetails> list = baseMapper.selectISubPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId())); List<FailureDetails> list = this.baseMapper.selectAllPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId()));
IPage<FailureDetails> iPage = new Page<>(); IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(list); iPage.setRecords(list);
return iPage; return iPage;
} }
/* //当传递类型参数为我提交时
if (type.equals(SELECY_ISUBMIT)) {
List<FailureDetails> list = baseMapper.selectISubPage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId()));
IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(list);
return iPage;
}*/
//当传递类型参数为我接收时 //当传递类型参数为我接收时
if (type.equals(SELECY_ACCEPT)) { if (type.equals(SELECY_ACCEPT)) {
//当角色为维修人员时 //当角色为维修人员时
if (userInfo.getRole().getRoleName().equals(roleName[0])) { List<FailureDetails> receiveList = baseMapper.selectForReceive(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId(), page.getCurrent(), page.getSize(),userInfo.getRole().getRoleName());
IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(receiveList);
return iPage;
/* if (userInfo.getRole().getRoleName().equals(roleName[0])) {
List<FailureDetails> failureDetails = baseMapper.selectForMaintain(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId(), page.getCurrent(), page.getSize()); List<FailureDetails> failureDetails = baseMapper.selectForMaintain(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId(), page.getCurrent(), page.getSize());
IPage<FailureDetails> iPage = new Page<>(); IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(failureDetails); iPage.setRecords(failureDetails);
...@@ -134,7 +146,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -134,7 +146,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
IPage<FailureDetails> iPage = new Page<>(); IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(failureDetails); iPage.setRecords(failureDetails);
return iPage; return iPage;
} }*/
} }
//否则就查询待处理 //否则就查询待处理
return this.queryForWaitManage(page, userInfo, currentStatus, startTime, endTime, userId); return this.queryForWaitManage(page, userInfo, currentStatus, startTime, endTime, userId);
...@@ -160,7 +172,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -160,7 +172,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
public IPage<FailureDetails> queryForWaitManage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus, public IPage<FailureDetails> queryForWaitManage(Page<FailureDetails> page, ReginParams userInfo, Long currentStatus,
String startTime, String endTime, Integer userId) { String startTime, String endTime, Integer userId) {
if (userInfo.getRole().getRoleName().equals(roleName[0])) { /* if (userInfo.getRole().getRoleName().equals(roleName[0])) {
IPage<FailureDetails> wxIpage = new Page<FailureDetails>(); IPage<FailureDetails> wxIpage = new Page<FailureDetails>();
List<FailureDetails> list = baseMapper.selectStatusWaitWx(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId); List<FailureDetails> list = baseMapper.selectStatusWaitWx(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId);
wxIpage.setRecords(list); wxIpage.setRecords(list);
...@@ -171,8 +183,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -171,8 +183,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
IPage<FailureDetails> iPage = new Page<>(); IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(list); iPage.setRecords(list);
return iPage; return iPage;
} }*/
List<FailureDetails> list = baseMapper.selectInProcessing(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId); List<FailureDetails> list = baseMapper.queryForWaitManage(page.getCurrent(), page.getSize(), currentStatus, startTime, endTime, userId,userInfo.getRole().getRoleName());
IPage<FailureDetails> iPage = new Page<>(); IPage<FailureDetails> iPage = new Page<>();
iPage.setRecords(list); iPage.setRecords(list);
return iPage; return iPage;
...@@ -196,21 +208,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -196,21 +208,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
* 根据状态查询 * 根据状态查询
*/ */
public List<FailureDetails> queryForFailureStatus(Long currentStatus) { public List<FailureDetails> queryForFailureStatus(Long currentStatus) {
String status = "";
List<FailureStatuEnum> list = new ArrayList<>();
list.add(FailureStatuEnum.WAITING_AUDIT);
list.add(FailureStatuEnum.WAITING_SUBMIT);
list.add(FailureStatuEnum.WAITING_MAINTAIN);
list.add(FailureStatuEnum.WAITING_ACCEPTANCE);
list.add(FailureStatuEnum.REFUSE);
list.add(FailureStatuEnum.FINISH);
for (int i = 0; i < list.size(); i++) {
if (currentStatus.equals(list.get(i).getCode())) {
status = list.get(i).getName();
}
}
QueryWrapper<FailureDetails> queryWrapper = new QueryWrapper<>(); QueryWrapper<FailureDetails> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("current_status", status).orderByDesc("submission_time"); queryWrapper.eq("current_status",currentStatus).orderByDesc("submission_time");
return baseMapper.selectList(queryWrapper); return baseMapper.selectList(queryWrapper);
} }
...@@ -219,7 +218,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -219,7 +218,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
*/ */
public List<CurrentStatusDto> queryStatusCount(ReginParams userInfo, Integer type, Long currentStatus, String startTime, String endTime, Integer userId) { public List<CurrentStatusDto> queryStatusCount(ReginParams userInfo, Integer type, Long currentStatus, String startTime, String endTime, Integer userId) {
List<StatusDto> statusDtos = null; List<StatusDto> statusDtos = null;
if (type.equals(SELECY_STATUS) && userInfo.getRole().getRoleName().equals(roleName[0])) { /* if (type.equals(SELECY_STATUS) && userInfo.getRole().getRoleName().equals(roleName[0])) {
statusDtos = baseMapper.selectStatusWx(currentStatus, startTime, endTime, userId); statusDtos = baseMapper.selectStatusWx(currentStatus, startTime, endTime, userId);
} else if (type.equals(SELECY_STATUS) && userInfo.getRole().getRoleName().equals(roleName[1])) { } else if (type.equals(SELECY_STATUS) && userInfo.getRole().getRoleName().equals(roleName[1])) {
statusDtos = baseMapper.selectStatusFq(currentStatus, startTime, endTime, userId); statusDtos = baseMapper.selectStatusFq(currentStatus, startTime, endTime, userId);
...@@ -227,16 +226,17 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -227,16 +226,17 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
statusDtos = baseMapper.selectStatusFqp(currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId())); statusDtos = baseMapper.selectStatusFqp(currentStatus, startTime, endTime, Integer.parseInt(userInfo.getUserModel().getUserId()));
} else if (type.equals(SELECY_ALL)) { } else if (type.equals(SELECY_ALL)) {
statusDtos = baseMapper.selectStatusCount(currentStatus, startTime, endTime, userId); statusDtos = baseMapper.selectStatusCount(currentStatus, startTime, endTime, userId);
} else if (type.equals(SELECY_ACCEPT)) { } else*/ if (type.equals(SELECY_ACCEPT)) {
if (userInfo.getRole().getRoleName().equals(roleName[2]) || userInfo.getRole().getRoleName().equals(roleName[3])){ /* if (userInfo.getRole().getRoleName().equals(roleName[2]) || userInfo.getRole().getRoleName().equals(roleName[3])){
statusDtos = baseMapper.selectAudit(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId()); statusDtos = baseMapper.selectAudit(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId());
}else if (userInfo.getRole().getRoleName().equals(roleName[0])){ }else if (userInfo.getRole().getRoleName().equals(roleName[0])){
statusDtos = baseMapper.selectMaintain(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId()); statusDtos = baseMapper.selectMaintain(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId());
}else { }else {
statusDtos = baseMapper.selectUserId(currentStatus, startTime, endTime, userInfo.getUserModel().getUserId()); statusDtos = baseMapper.selectUserId(currentStatus, startTime, endTime, userInfo.getUserModel().getUserId());
} }*/
statusDtos= baseMapper.queryAcceptCount(currentStatus, startTime, endTime, userId, userInfo.getUserModel().getUserId(),userInfo.getRole().getRoleName());
} else { } else {
statusDtos = baseMapper.selectStatusLeader(currentStatus, startTime, endTime, userId); statusDtos = baseMapper.queryStatusCount(currentStatus, startTime, endTime, userId,userInfo.getRole().getRoleName());
} }
List<CurrentStatusDto> currentStatusDtoList = new ArrayList<>(); List<CurrentStatusDto> currentStatusDtoList = new ArrayList<>();
statusDtos.forEach(e -> { statusDtos.forEach(e -> {
...@@ -331,10 +331,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -331,10 +331,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
failureDetailsDto.getAttachment()); failureDetailsDto.getAttachment());
} }
// 添加至报修日志 // 添加至报修日志
OrgUsr orgUsr = iOrgUsrService.getById(failureDetailsDto.getBizCode());
Long faultId = model.getSequenceNbr(); Long faultId = model.getSequenceNbr();
Integer processAuditorId = model.getSubmissionPid(); Integer processAuditorId = model.getSubmissionPid();
String processResult = "重新提交报修单"; String processResult = "重新提交报修单";
String processDepartment = userInfo.getDepartment().getDepartmentName(); String processDepartment = orgUsr.getBizOrgName() ;
Long departmentId = failureDetailsDto.getBizCode(); Long departmentId = failureDetailsDto.getBizCode();
Date processTime = model.getSubmissionTime(); Date processTime = model.getSubmissionTime();
String processAuditorName = failureDetailsDto.getSubmissionName(); String processAuditorName = failureDetailsDto.getSubmissionName();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/pom.xml
View file @ 1f364474
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
<groupId>org.typroject</groupId> <groupId>org.typroject</groupId>
<artifactId>*</artifactId> <artifactId>*</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/audioToText/SocketClient.java
View file @ 1f364474
...@@ -11,6 +11,8 @@ import java.io.OutputStream; ...@@ -11,6 +11,8 @@ import java.io.OutputStream;
import java.net.*; import java.net.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static com.yeejoin.amos.boot.module.jcs.biz.audioToText.util.SpeechTranscriberDemo.getSleepDelta;
/** /**
* 模拟客户端发送数据 * 模拟客户端发送数据
*/ */
...@@ -18,16 +20,14 @@ import java.util.concurrent.TimeUnit; ...@@ -18,16 +20,14 @@ import java.util.concurrent.TimeUnit;
public class SocketClient { public class SocketClient {
private static final Logger logger = LoggerFactory.getLogger(SocketClient.class); private static final Logger logger = LoggerFactory.getLogger(SocketClient.class);
private static final String[] testFilePath = { private static final String[] testFilePath = {
"D:\\ffmpeg-4.4-full_build-shared\\bin\\out3.pcm", "C:\\Users\\DELL\\Desktop\\yuyin\\out1.pcm",
"D:\\ffmpeg-4.4-full_build-shared\\bin\\out4.pcm", "C:\\Users\\DELL\\Desktop\\yuyin\\out.pcm",
"D:\\ffmpeg-4.4-full_build-shared\\bin\\record1.pcm",
"D:\\ffmpeg-4.4-full_build-shared\\bin\\record2.pcm",
}; };
public static void main(String[] args) throws SocketException { public static void main(String[] args) throws SocketException {
SocketClient socketClient = new SocketClient(); SocketClient socketClient = new SocketClient();
//socketClient.processTcp(0, 0); //socketClient.processTcp(0, 0);
socketClient.processUdp(10001, 2); socketClient.processUdp(25002, 1);
} }
@Async @Async
...@@ -36,13 +36,15 @@ public class SocketClient { ...@@ -36,13 +36,15 @@ public class SocketClient {
if (type >= testFilePath.length) type -= 1; if (type >= testFilePath.length) type -= 1;
DatagramSocket datagramSocket = new DatagramSocket(); DatagramSocket datagramSocket = new DatagramSocket();
try { try {
FileInputStream fis = new FileInputStream(new File(testFilePath[type])); FileInputStream fis = new FileInputStream(new File("C:\\Users\\DELL\\Desktop\\ffmpeg-4.4-full_build-shared\\bin\\out.pcm"));
byte[] b = new byte[4096]; byte[] b = new byte[1280];
int len; int len;
while ((len = fis.read(b)) > 0) { while ((len = fis.read(b)) > 0) {
logger.info("send data pack length: " + len); logger.info("send data pack length: " + len);
datagramSocket.send(new DatagramPacket(b, b.length,InetAddress.getLocalHost(), port)); datagramSocket.send(new DatagramPacket(b, b.length,InetAddress.getLocalHost(), port));
TimeUnit.MILLISECONDS.sleep(200); int deltaSleep = getSleepDelta(len, 16000);
Thread.sleep(deltaSleep);
TimeUnit.MILLISECONDS.sleep(100);
} }
datagramSocket.close(); datagramSocket.close();
} catch (Exception e) { } catch (Exception e) {
......
amos-boot-module/amos-boot-module-biz/pom.xml
View file @ 1f364474
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId> <artifactId>spring-mock</artifactId>
<version>2.0.8</version> <version>2.0.8</version>
......
amos-boot-module/pom.xml
View file @ 1f364474
...@@ -29,6 +29,10 @@ ...@@ -29,6 +29,10 @@
<groupId>com.yeejoin</groupId> <groupId>com.yeejoin</groupId>
<artifactId>amos-feign-rule</artifactId> <artifactId>amos-feign-rule</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
</dependencies> </dependencies>
<modules> <modules>
......
amos-boot-system-jcs/src/main/resources/application-dev.properties
View file @ 1f364474
...@@ -39,8 +39,11 @@ rule.definition.localIp=172.16.3.35 ...@@ -39,8 +39,11 @@ rule.definition.localIp=172.16.3.35
file.url=http://39.98.45.134:9000/ file.url=http://39.98.45.134:9000/
video.url=https://11.11.16.4:443/ video.url=https://11.11.16.4:443/
ifc.url=http://11.11.16.17/IFCInterface ifc.url=http://11.11.16.17/IFCInterface
ifc.call-back.localIp=11.11.16.1 ifc.call-back.localIp=11.11.16.1
elasticsearch.username= elastic
elasticsearch.password= 123456
pom.xml
View file @ 1f364474
...@@ -38,6 +38,12 @@ ...@@ -38,6 +38,12 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.hystrix</groupId> <groupId>com.netflix.hystrix</groupId>
...@@ -285,6 +291,11 @@ ...@@ -285,6 +291,11 @@
<artifactId>json-lib</artifactId> <artifactId>json-lib</artifactId>
<version>2.4</version> <version>2.4</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.0</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<repositories> <repositories>
......
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