Skip to content

A
amos-boot-biz
Commit e56677db authored by tangwei's avatar tangwei
Browse files
Options

修改bug

parents 59540abe 4fd148e0
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 45 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
View file @ e56677db
...@@ -172,7 +172,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -172,7 +172,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
private static int comparingByGroupVal(Map<String, Object> map, Map<String, Object> map2, String key) { private static int comparingByGroupVal(Map<String, Object> map, Map<String, Object> map2, String key) {
int result = 0; int result = 0;
if (map.get(key) instanceof DateTime) { if (map.get(key) instanceof Date) {
long r1 = ((Date) map.get(key)).getTime(); long r1 = ((Date) map.get(key)).getTime();
long r2 = ((Date) map2.get(key)).getTime(); long r2 = ((Date) map2.get(key)).getTime();
result = Long.compare(r1, r2); result = Long.compare(r1, r2);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @ e56677db
...@@ -33,10 +33,10 @@ import java.util.stream.IntStream; ...@@ -33,10 +33,10 @@ import java.util.stream.IntStream;
import com.yeejoin.amos.boot.module.command.api.dto.FrontlineLiaisonDto; import com.yeejoin.amos.boot.module.command.api.dto.FrontlineLiaisonDto;
import com.yeejoin.amos.boot.module.command.biz.service.impl.FrontlineLiaisonServiceImpl; import com.yeejoin.amos.boot.module.command.biz.service.impl.FrontlineLiaisonServiceImpl;
import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService; import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
import com.yeejoin.amos.boot.module.jcs.api.dto.*;
import com.yeejoin.amos.boot.module.jcs.api.entity.*; import com.yeejoin.amos.boot.module.jcs.api.entity.*;
import com.yeejoin.amos.boot.module.jcs.api.enums.*; import com.yeejoin.amos.boot.module.jcs.api.enums.*;
import com.yeejoin.amos.boot.module.jcs.api.mapper.JcSituationDetailMapper; import com.yeejoin.amos.boot.module.jcs.api.mapper.*;
import com.yeejoin.amos.boot.module.jcs.api.mapper.UserCarMapper;
import com.yeejoin.amos.boot.module.jcs.biz.dao.ESAlertCalledRepository; import com.yeejoin.amos.boot.module.jcs.biz.dao.ESAlertCalledRepository;
import com.yeejoin.amos.feign.systemctl.model.MessageModel; import com.yeejoin.amos.feign.systemctl.model.MessageModel;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
...@@ -99,32 +99,6 @@ import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService; ...@@ -99,32 +99,6 @@ import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FireTeamServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.FireTeamServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallCommandDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCallePowerTransferRo;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledFormDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledMobDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledPowerInfoDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledZhDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedExtDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedZHDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.InstructionsZHDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerData;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyZHDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PushMessageWebAndAppRo;
import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.VoiceRecordFileDto;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyMapper;
import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService; import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService; import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction; import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction;
...@@ -175,7 +149,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -175,7 +149,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
OrgUsrServiceImpl iOrgUsrService; OrgUsrServiceImpl iOrgUsrService;
@Autowired @Autowired
IDutyPersonService iDutyPersonService; IDutyPersonService iDutyPersonService;
@Autowired
AlertFormValueServiceImpl formValueService;
@Autowired @Autowired
PowerTransferMapper powerTransferMapper; PowerTransferMapper powerTransferMapper;
...@@ -262,6 +237,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -262,6 +237,8 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertSubmittedExtDtoList.forEach(alertSubmittedExtDto -> { alertSubmittedExtDtoList.forEach(alertSubmittedExtDto -> {
try { try {
alertSubmittedExtDto.setExtraInfo(String.format(_extraInfo, alertSubmittedExtDto.getCompanyName(),
alertSubmittedExtDto.getUserName()));
if(alertSubmittedExtDto.getUserName()!=null){ if(alertSubmittedExtDto.getUserName()!=null){
...@@ -421,6 +398,16 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -421,6 +398,16 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
if (object instanceof AlertCalledRo) { if (object instanceof AlertCalledRo) {
AlertCalledRo calledRo = (AlertCalledRo) object; AlertCalledRo calledRo = (AlertCalledRo) object;
String alertSubmittedId = calledRo.getAlertSubmittedId(); String alertSubmittedId = calledRo.getAlertSubmittedId();
//航空器类型警情 web端消息弹窗 发生后面没有数据源 和测试沟通补充航空器子类为数据源
if (calledRo.getAlertTypeCode().equals("230")) {
List<AlertFormValueDto> alertFormValueDtos = formValueService.listByCalledId(Long.valueOf(calledRo.getSequenceNbr()));
alertFormValueDtos.forEach(e->{
if (e.getFieldCode().equals("aircraftRescueSub")){
calledRo.setFireSituation(e.getFieldValue());
}
});
}
alertCalledId = calledRo.getSequenceNbr(); alertCalledId = calledRo.getSequenceNbr();
...@@ -1877,7 +1864,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -1877,7 +1864,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
public Set<Map<String, Object>> getwone(Set<Map<String, Object>> sendUserIds){ public Set<Map<String, Object>> getwone(Set<Map<String, Object>> sendUserIds){
Map<String,Map<String, Object>> map =new HashMap<>(); Map<String,Map<String, Object>> map =new HashMap<>();
...@@ -1892,7 +1879,7 @@ public Set<Map<String, Object>> getwone(Set<Map<String, Object>> sendUserIds){ ...@@ -1892,7 +1879,7 @@ public Set<Map<String, Object>> getwone(Set<Map<String, Object>> sendUserIds){
return set; return set;
} }
...@@ -2262,5 +2249,4 @@ public Set<Map<String, Object>> getwone(Set<Map<String, Object>> sendUserIds){ ...@@ -2262,5 +2249,4 @@ public Set<Map<String, Object>> getwone(Set<Map<String, Object>> sendUserIds){
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
\ No newline at end of file
amos-boot-system-equip/src/main/resources/application-dev.properties
View file @ e56677db
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.16.10.211/xiy_safety_business_v3.0.1_20100712?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai spring.datasource.url = jdbc:mysql://172.16.3.6/xiy_safety_business_v3.0.1_20100712?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Yeejoin@2020 spring.datasource.password=cz123456
spring.datasource.type=com.zaxxer.hikari.HikariDataSource spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.pool-name=DatebookHikariCP spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.minimum-idle= 3 spring.datasource.hikari.minimum-idle= 3
...@@ -93,7 +93,7 @@ spring.mqtt.completionTimeout=3000 ...@@ -93,7 +93,7 @@ spring.mqtt.completionTimeout=3000
#数据同步开关 #数据同步开关
systemctl.sync.switch=false systemctl.sync.switch=false
#数据JCS开关 #数据JCS开关
systemctl.jcs.switch=false systemctl.jcs.switch=true
#平台数据开关 #平台数据开关
systemctl.amos.switch=false systemctl.amos.switch=false
isSendApp=false isSendApp=false
......
amos-boot-system-jcs/pom.xml
View file @ e56677db
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<artifactId>amos-boot-system-jcs</artifactId> <artifactId>amos-boot-system-jcs</artifactId>
<version>1.0.0.16.1</version> <version>1.0.0.16.2</version>
<dependencies> <dependencies>
<dependency> <dependency>
......
amos-boot-system-jcs/src/main/resources/application-cluster.properties
View file @ e56677db
## DB properties: ## DB properties:
spring.datasource.url=jdbc:mysql://172.16.10.211:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8 spring.datasource.url=jdbc:mysql://172.16.3.6:3306/xiy_bootsystem_jcs_v1.0.0.1_20210729?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Yeejoin@2020 spring.datasource.password=cz123456
## eureka properties: ## eureka properties:
eureka.client.serviceUrl.defaultZone=http://172.16.10.211:10001/eureka/ eureka.client.serviceUrl.defaultZone=http://${spring.security.user.name}:${spring.security.user.password}@172.16.10.211:10001/eureka/
#redis 基础配置 #redis 基础配置
spring.redis.database=0 spring.redis.database=0
...@@ -62,7 +62,7 @@ emqx.keep-alive-interval=10 ...@@ -62,7 +62,7 @@ emqx.keep-alive-interval=10
rule.definition.load=false rule.definition.load=false
rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
rule.definition.default-agency=jcs rule.definition.default-agency=jcs
rule.definition.localIp=172.16.3.35
## file properties: ## file properties:
......
amos-boot-system-patrol/src/main/resources/application-dev.properties
View file @ e56677db
...@@ -16,9 +16,9 @@ ribbon.MaxAutoRetries = 1 ...@@ -16,9 +16,9 @@ ribbon.MaxAutoRetries = 1
xiy_amos_satety_business xiy_amos_satety_business
spring.reactor.debug-agent.enabled=true spring.reactor.debug-agent.enabled=true
#DB properties: #DB properties:
spring.datasource.url=jdbc:mysql://172.16.10.211:3306/xiy_safety_business_v3.0.1_20100712?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai spring.datasource.url=jdbc:mysql://172.16.3.6:3306/xiy_safety_business_v3.0.1_20100712?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Yeejoin@2020 spring.datasource.password=cz123456
spring.datasource.driver-class-name = com.mysql.jdbc.Driver spring.datasource.driver-class-name = com.mysql.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000 spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.testWhileIdle = true spring.datasource.testWhileIdle = true
......
amos-boot-system-patrol/src/main/resources/application.properties
View file @ e56677db
...@@ -67,7 +67,7 @@ rule.definition.model-package=com.yeejoin.amos.patrol.business.entity.mybatis ...@@ -67,7 +67,7 @@ rule.definition.model-package=com.yeejoin.amos.patrol.business.entity.mybatis
rule.definition.default-agency=STATE_GRID rule.definition.default-agency=STATE_GRID
jcs.fegin.name=JCS jcs.fegin.name=JCS
emergency.command.section.id=1418223840361709569 emergency.command.section.id=1435847875492880385
## 增加接口文档验证 ## 增加接口文档验证
knife4j.enable=true knife4j.enable=true
......
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