Skip to content

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

修改扫描bug

parent 5b66aa10
Show whitespace changes
Inline Side-by-side
Showing with 173 additions and 195 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/IndexLogsRequest.java
View file @ 546aefd3
......@@ -16,11 +16,11 @@ public class IndexLogsRequest {
private String timeEnd;
private String fieldKey;
private String equipmentIndex;
private Long page;
private Long total;
private Long size;
private long page;
private long total;
private long size;
public IndexLogsRequest( String timeStart, String timeEnd, String equipmentIndex, Long page, Long size) {
public IndexLogsRequest( String timeStart, String timeEnd, String equipmentIndex, long page, long size) {
this.timeStart = timeStart;
this.timeEnd = timeEnd;
this.equipmentIndex = equipmentIndex;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/fegin/IotFeign.java
View file @ 546aefd3
package com.yeejoin.equipmanage.fegin;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.equipmanage.common.entity.dto.IndexLogsRequest;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
......@@ -71,5 +72,5 @@ public interface IotFeign {
@RequestMapping(value = "v1/livedata/index/logs", method = RequestMethod.POST, consumes = "application/json")
ResponseModel<List<Map<String ,Object>>> getEquipAlarmLog( @RequestBody IndexLogsRequest indexLogsRequest );
ResponseModel<Map<String ,Object>> getEquipAlarmLog(@RequestBody IndexLogsRequest indexLogsRequest );
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmLogServiceImpl.java
View file @ 546aefd3
......@@ -119,18 +119,19 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
endTime= endTime.replace("00:00:00","23:59:59");
IndexLogsRequest indexLogsRequest=new IndexLogsRequest( startTime, endTime, iotCode, current, pageSize);
IndexLogsRequest indexLogsRequest=new IndexLogsRequest( startTime, endTime, "YJ210093SBMC0001FHS_FirePump_PowerRunStatus", current, pageSize);
//调用iot 获取数据
ResponseModel<List<Map<String, Object>>> date = iotFeign.getEquipAlarmLog(indexLogsRequest);
ResponseModel<Map<String, Object>> date = iotFeign.getEquipAlarmLog(indexLogsRequest);
if (date.getStatus() != 200 ) {
throw new BadRequest("系统错误！");
}
List<Map<String, Object>> listObject = date.getResult();
Map<String, Object> listObject = date.getResult();
if (listObject != null) {
List<Map<String, Object>> listObjectdate=( List<Map<String, Object>>)listObject.get("records");
//数据处理
for (Map<String, Object> map : listObject) {
for (Map<String, Object> map : listObjectdate) {
//过滤告警
String key=map.get("iotCode").toString()+map.get("indexName");
if(mapkey.containsKey(key)){
......@@ -145,11 +146,17 @@ public class EquipmentSpecificAlarmLogServiceImpl extends ServiceImpl<EquipmentS
}
}
}
pageBean.setTotal(listDate.size());
pageBean.setRecords(listDate);
//由于iot 分页 ，没有数据时返回int，有数据时返回字符串，还是Double类型字符串，需统一处理。
Double tot= Double.valueOf(listObject.get("total").toString());
pageBean.setTotal(tot.intValue());
return pageBean;
}
public String getReadableStatus(String value ) {
if("true".equals(value)){
return "是";
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java
View file @ 546aefd3
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -82,6 +83,11 @@ public class DataSourcesImpl implements DataSources {
@Autowired
OrgUsrServiceImpl iOrgUsrService;
private static final String SEQUENCENBR="sequenceNbr";
private static final String BIZORGNAME= "bizOrgName";
private static final String FIRE_WATER_INFO= "fire_water_info";
@Value("${security.systemctl.name}")
private String systemctl;
......@@ -107,7 +113,6 @@ public class DataSourcesImpl implements DataSources {
ResponseEntity<String> responseEntity = restTemplate.exchange(
"http://" + systemctl + "/systemctl" + "/v1" + "/region/tree/parent", HttpMethod.GET,
httpEntity, String.class);
String body = responseEntity.getBody();
break;
case "getBuildingList":
str = getBuildingList();
......@@ -211,9 +216,9 @@ public class DataSourcesImpl implements DataSources {
}
private String[] getContactUser() {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_water_info");
PermissionInterceptorContext.setDataAuthRule(FIRE_WATER_INFO);
Map<String, Object> map = new HashMap<>();
map.put("OrgCode",reginParams.getPersonIdentity().getBizOrgCode());
......@@ -221,14 +226,14 @@ public class DataSourcesImpl implements DataSources {
List<Map<String, Object>> records = mapIPage.getRecords();
List<String> carNameList = Lists.newArrayList();
records.forEach(result -> {
carNameList.add(result.get("bizOrgName") + "@" + result.get("sequenceNbr"));
carNameList.add(result.get(BIZORGNAME) + "@" + result.get(SEQUENCENBR));
});
String[] str = carNameList.toArray(new String[carNameList.size()]);
return str;
}
private String[] getFireStationContactUser() {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_station_info");
......@@ -238,14 +243,14 @@ public class DataSourcesImpl implements DataSources {
List<Map<String, Object>> records = mapIPage.getRecords();
List<String> carNameList = Lists.newArrayList();
records.forEach(result -> {
carNameList.add(result.get("bizOrgName") + "@" + result.get("sequenceNbr"));
carNameList.add(result.get(BIZORGNAME) + "@" + result.get(SEQUENCENBR));
});
String[] str = carNameList.toArray(new String[carNameList.size()]);
return str;
}
private String[] getFireTeamContactUser() {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_team_info");
......@@ -255,7 +260,7 @@ public class DataSourcesImpl implements DataSources {
List<Map<String, Object>> records = mapIPage.getRecords();
List<String> carNameList = Lists.newArrayList();
records.forEach(result -> {
carNameList.add(result.get("bizOrgName") + "@" + result.get("sequenceNbr"));
carNameList.add(result.get(BIZORGNAME) + "@" + result.get(SEQUENCENBR));
});
String[] str = carNameList.toArray(new String[carNameList.size()]);
return str;
......@@ -263,14 +268,11 @@ public class DataSourcesImpl implements DataSources {
private String[] getFireTeam() {
// Page<FireTeamCardDto> pageBean = new Page<>(0, Integer.MAX_VALUE);
// IPage<FireTeamCardDto> fireTeamCardDtoIPage = fireTeamService.listFireTeamByPage(pageBean,
// new FireTeamListDto());
// List<FireTeamCardDto> records = fireTeamCardDtoIPage.getRecords();
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_water_info");
PermissionInterceptorContext.setDataAuthRule(FIRE_WATER_INFO);
List<FireTeam> records = fireTeamService.getExcelFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
List<String> names = records.stream().map(item -> {
return item.getName() + "@" + item.getSequenceNbr();
......@@ -280,12 +282,9 @@ public class DataSourcesImpl implements DataSources {
}
private String[] getFireTeamList() {
// Page<FireTeamCardDto> pageBean = new Page<>(0, Integer.MAX_VALUE);
// IPage<FireTeamCardDto> fireTeamCardDtoIPage = fireTeamService.listFireTeamByPage(pageBean,
// new FireTeamListDto());
// List<FireTeamCardDto> records = fireTeamCardDtoIPage.getRecords();
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_team_info");
List<FireTeam> records = fireTeamService.getExcelFireTeamList(reginParams.getPersonIdentity().getBizOrgCode());
......@@ -312,15 +311,13 @@ public class DataSourcesImpl implements DataSources {
return str;
}
private String[] getBizCompanyList() throws Exception {
private String[] getBizCompanyList() {
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_station_info");
List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
//List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
// OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
List<String> stringList = new ArrayList<String>();
initBizCompanyList(orgUsrTree, stringList);
String[] str = stringList.toArray(new String[stringList.size()]);
......@@ -339,7 +336,7 @@ public class DataSourcesImpl implements DataSources {
private String[] getFirefighters() {
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_fighters_info");
FirefightersDto firefightersDto = new FirefightersDto();
......@@ -363,14 +360,12 @@ public class DataSourcesImpl implements DataSources {
return str;
}
private String[] getWaterCompanyList() throws Exception {
private String[] getWaterCompanyList() {
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_water_info");
PermissionInterceptorContext.setDataAuthRule(FIRE_WATER_INFO);
List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
// List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.selectCompanyDepartmentMsg(),
// OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
List<String> stringList = new ArrayList<String>();
initCompanyList(orgUsrTree, stringList);
String[] str = stringList.toArray(new String[stringList.size()]);
......@@ -398,7 +393,7 @@ public class DataSourcesImpl implements DataSources {
private String[] getBuildingList() {
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
ResponseModel<Object> response = equipFeignClient.getBuildingTree();
List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
......@@ -446,9 +441,9 @@ public class DataSourcesImpl implements DataSources {
}
private String[] getBuildTree() throws Exception {
private String[] getBuildTree() {
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
List<Object> menus = keySiteService.getBuildTree();
List<String> stringList = new ArrayList<String>();
......@@ -460,7 +455,7 @@ public class DataSourcesImpl implements DataSources {
private void initBuildTreeList(List<Object> menus, List<String> stringList,String bizOrgCode) {
for (Object orgMenuDto : menus) {
JSONObject detailObject = JSONObject.parseObject(orgMenuDto.toString());
JSONObject detailObject = JSON.parseObject(orgMenuDto.toString());
if (detailObject.containsKey("id") && detailObject.get("bizOrgCode") != null && detailObject.get("bizOrgCode").toString().startsWith(bizOrgCode)) {
stringList.add(detailObject.getString("name") + "@" + detailObject.getString("id")); // 任务3527 重点部位导出模板 id name 未正常配置 by kongfm
}
......@@ -471,33 +466,29 @@ public class DataSourcesImpl implements DataSources {
}
}
private String[] getCompanyDetailTree() throws Exception {
private String[] getCompanyDetailTree() {
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_team_info");
List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, OrgPersonEnum.公司.getKey(), null);
// List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.getCompanyDetailTree(),
// OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
//
List<String> stringList = new ArrayList<String>();
initCompanyList(orgUsrTree, stringList);
String[] str = stringList.toArray(new String[stringList.size()]);
return str;
}
private String[] getKeySiteCompanyDetailTree() throws Exception {
private String[] getKeySiteCompanyDetailTree() {
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("key_site_info");
// 修改bug6829 查询单位和部门数据
List<OrgMenuDto> orgUsrTree = iOrgUsrService.companyTreeByUserAndType(reginParams, null, null);
// List<OrgMenuDto> orgUsrTree = orgUsrService.getTree(null, orgUsrService.getCompanyDetailTree(),
// OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
//
List<String> stringList = new ArrayList<String>();
initCompanyList(orgUsrTree, stringList);
String[] str = stringList.toArray(new String[stringList.size()]);
......@@ -505,10 +496,10 @@ public class DataSourcesImpl implements DataSources {
}
private String[] getparent() throws Exception {
private String[] getparent() {
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("org_user_info");
List<OrgUsr> orgMenuDtoList = iOrgUsrService.companyTreeByUserAndTypeNoTree(reginParams, null);
......@@ -517,14 +508,13 @@ public class DataSourcesImpl implements DataSources {
) {
Map<String, Object> map = Maps.newHashMap();
BeanMap beanMap = BeanMap.create(org);
map.put("name",beanMap.get("bizOrgName"));
map.put("id",beanMap.get("sequenceNbr"));
map.put("name",beanMap.get(BIZORGNAME));
map.put("id",beanMap.get(SEQUENCENBR));
orgUsrTree.add(map);
}
String[] str = null;
// List<Map<String, Object>> orgUsrTree = orgUsrService.getparent();
if (orgUsrTree != null && orgUsrTree.size() > 0) {
if ( orgUsrTree.size() > 0) {
List<String> buildingNames = orgUsrTree.stream().map(item -> {
return item.get("name") + "@" + item.get("id");
}).collect(Collectors.toList());
......@@ -556,9 +546,8 @@ public class DataSourcesImpl implements DataSources {
*/
private String[] getCompany() {
//List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_fighters_info");
......@@ -577,7 +566,6 @@ public class DataSourcesImpl implements DataSources {
*/
private String[] getEquipCompany() {
// List<OrgUsr> menus = iOrgUsrService.selectCompanyDepartmentMsg();
ResponseModel<ReginParams> result = equipFeignClient.getPermissions();
ReginParams reginParams = result.getResult();
......@@ -617,14 +605,7 @@ public class DataSourcesImpl implements DataSources {
}
}
// regions.stream().forEach(item -> {
// //添加自己的
// name =name+item.getRegionName();
// address.add(name + "@" + item.getSequenceNbr());
// if(item.getChildren() != null && item.getChildren().size() > 0) {
// setAddress(name ,address,item.getChildren());
// }
// });
}
private String[] getDutyArea() {
......@@ -702,7 +683,6 @@ public class DataSourcesImpl implements DataSources {
private String[] getListByEquipmentCode() {
String code = "92010700,92011500";
//ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getListByEquipmentCode(code);
ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getListByEquipmentCodeEQ(code);
List<Map<String, Object>> equipmentList = response.getResult();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DispatchMapServiceImpl.java
View file @ 546aefd3
......@@ -20,7 +20,7 @@ public class DispatchMapServiceImpl implements IHomePageService {
//实现首页dispatchMap
@Autowired
AlertCalledMapper alertCalledMapper;
private static AlertCalledMapper alertCalledMapper1;
private AlertCalledMapper alertCalledMapper1;
@PostConstruct
public void init(){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DispatchTaskServiceImpl.java
View file @ 546aefd3
......@@ -19,7 +19,7 @@ public class DispatchTaskServiceImpl implements IHomePageService {
//实现首页dispatchMap
@Autowired
AlertCalledMapper alertCalledMapper;
private static AlertCalledMapper alertCalledMapper1;
private AlertCalledMapper alertCalledMapper1;
@PostConstruct
public void init(){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ESAlertCalledService.java
View file @ 546aefd3
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
......@@ -8,6 +9,7 @@ import java.util.List;
import javax.annotation.PostConstruct;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
......@@ -33,6 +35,8 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
import com.yeejoin.amos.boot.module.jcs.api.entity.ESAlertCalled;
import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStatusEnum;
import com.yeejoin.amos.boot.module.jcs.biz.dao.ESAlertCalledRepository;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
/**
*
* <pre>
......@@ -57,6 +61,7 @@ public class ESAlertCalledService {
@Value("${alertcall.es.synchrony.time}")
private Long time;
private static final String CALLTIMELONG="callTimeLong";
@PostConstruct
public void init() throws Exception
......@@ -68,7 +73,7 @@ public class ESAlertCalledService {
/**
* 重建索引
*/
public Boolean initEs() throws Exception {
public Boolean initEs() {
esAlertCalledRepository.deleteAll();
/**
* 同步历史48小时以内的警情处置记录
......@@ -91,10 +96,7 @@ public class ESAlertCalledService {
List<AlertCalled> alertCalleds = alertCalledService.list(wrapper);
if (!ValidationUtil.isEmpty(alertCalleds))
{
// for (AlertCalled alertCalled : alertCalleds)
// {
// saveAlertCalledToES(alertCalled);
// }
saveAlertCalledToES(alertCalleds);
}
......@@ -108,9 +110,9 @@ public class ESAlertCalledService {
* 批量保存
* </pre>
*
* @param list 警情信息列表
* @param
*/
public void saveAll(List<AlertCalled> alertCalleds) throws Exception{
public void saveAll(List<AlertCalled> alertCalleds) {
if (!ValidationUtil.isEmpty(alertCalleds))
{
......@@ -127,9 +129,9 @@ public class ESAlertCalledService {
* 根据警情记录批量保存
* </pre>
*
* @param alertCalleds 警情信息列表
* @param
*/
public ESAlertCalled saveAlertCalledToES(AlertCalled alertCalled) throws Exception
public ESAlertCalled saveAlertCalledToES(AlertCalled alertCalled)
{
ESAlertCalled esAlertCalled = new ESAlertCalled();
esAlertCalled.setSequenceNbr(alertCalled.getSequenceNbr());
......@@ -146,7 +148,11 @@ public class ESAlertCalledService {
esAlertCalled.setFlightNumber(alertCalled.getFlightNumber());
if(alertCalled.getLandingTime() != null ){
Date date = new Date();
try {
date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(alertCalled.getLandingTime());
} catch (ParseException e) {
throw new BadRequest("系统异常");
}
esAlertCalled.setLandingTime(date.getTime());
}
if (alertCalled.getAlertStatus())
......@@ -167,7 +173,7 @@ public class ESAlertCalledService {
}
public List<ESAlertCalled> saveAlertCalledToES(List<AlertCalled> alertCalleds) throws Exception
public List<ESAlertCalled> saveAlertCalledToES(List<AlertCalled> alertCalleds)
{
List<ESAlertCalled> list1=new ArrayList<>();
for (AlertCalled alertCalled : alertCalleds)
......@@ -214,7 +220,7 @@ public class ESAlertCalledService {
* @return
* @throws Exception
*/
public Boolean deleteById(List<Long> ids) throws Exception{
public Boolean deleteById(List<Long> ids){
if (!ValidationUtil.isEmpty(ids)) {
for (Long sequenceNbr : ids) {
if (esAlertCalledRepository.existsById(sequenceNbr)) {
......@@ -239,7 +245,7 @@ public class ESAlertCalledService {
/**
* 根据关键字查询文档，关键字不为空时按相关性从大到小排序
*
* @param queryStr 关键字
* @param
* @param current 当前页码
* @param size 页面大小
* @return
......@@ -281,7 +287,7 @@ public class ESAlertCalledService {
long currentTime = System.currentTimeMillis() ;
currentTime = currentTime - 30*60*1000;
BoolQueryBuilder qb1 = QueryBuilders.boolQuery()
.must(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
.must(QueryBuilders.rangeQuery(CALLTIMELONG).gte(currentTime));
boolMust.should(qb1);
//报警人及报警电话一致
if (!ValidationUtil.isEmpty(alertCalled.getContactUser()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone()))
......@@ -354,7 +360,7 @@ public class ESAlertCalledService {
//过滤条件
.withQuery(boolMustAll)
// 排序
.withSort(SortBuilders.fieldSort("callTimeLong").order(SortOrder.DESC))
.withSort(SortBuilders.fieldSort(CALLTIMELONG).order(SortOrder.DESC))
// 分页
.withPageable(PageRequest.of(current, size))
;
......@@ -367,8 +373,8 @@ public class ESAlertCalledService {
for (SearchHit searchHit : searchHits.getSearchHits())
{
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
ESAlertCalledDto eSAlertCalled =JSONObject.toJavaObject(jsonObject, ESAlertCalledDto.class);
JSONObject jsonObject = (JSONObject) JSON.toJSON(searchHit.getContent());
ESAlertCalledDto eSAlertCalled = JSON.toJavaObject(jsonObject, ESAlertCalledDto.class);
list.add(eSAlertCalled);
}
totle =searchHits.getTotalHits();
......@@ -419,7 +425,7 @@ public class ESAlertCalledService {
long currentTime = System.currentTimeMillis() ;
currentTime = currentTime - 30*60*1000;
BoolQueryBuilder qb1 = QueryBuilders.boolQuery()
.must(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
.must(QueryBuilders.rangeQuery(CALLTIMELONG).gte(currentTime));
boolMust.should(qb1);
//报警人及报警电话一致
if (!ValidationUtil.isEmpty(alertCalled.getContactUser()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone()))
......@@ -439,7 +445,6 @@ public class ESAlertCalledService {
//警情类型一致
BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("alertTypeCode.keyword", alertCalled.getAlertTypeCode()));
//boolMust.should(qb4);
//事发单位名称一致
if (!ValidationUtil.isEmpty(alertCalled.getUnitInvolved()))
{
......@@ -465,7 +470,7 @@ public class ESAlertCalledService {
// 分页
.withPageable(PageRequest.of(current, size))
// 排序
.withSort(SortBuilders.fieldSort("callTimeLong").order(SortOrder.DESC))
.withSort(SortBuilders.fieldSort(CALLTIMELONG).order(SortOrder.DESC))
//过滤条件
.withQuery(boolMustAll)
;
......@@ -479,8 +484,8 @@ public class ESAlertCalledService {
for (SearchHit searchHit : searchHits.getSearchHits())
{
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
ESAlertCalledDto eSAlertCalled =JSONObject.toJavaObject(jsonObject, ESAlertCalledDto.class);
JSONObject jsonObject = (JSONObject) JSON.toJSON(searchHit.getContent());
ESAlertCalledDto eSAlertCalled =JSON.toJavaObject(jsonObject, ESAlertCalledDto.class);
list.add(eSAlertCalled);
}
totle =searchHits.getTotalHits();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ESCarService.java
View file @ 546aefd3
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.module.jcs.api.dto.ESAlertCalledDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
......@@ -64,10 +65,10 @@ public class ESCarService implements IESCarService {
{
SearchHits<ESCar> searchHits =elasticsearchTemplate.search(queryBuilder.build(), ESCar.class);
for (SearchHit searchHit : searchHits.getSearchHits())
for (SearchHit<ESCar> searchHit : searchHits.getSearchHits())
{
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
ESCar eSCar =JSONObject.toJavaObject(jsonObject, ESCar.class);
JSONObject jsonObject = (JSONObject) JSON.toJSON(searchHit.getContent());
ESCar eSCar = JSON.toJavaObject(jsonObject, ESCar.class);
list.add(eSCar);
}
......@@ -77,8 +78,11 @@ public class ESCarService implements IESCarService {
e.printStackTrace();
}
if(list.size()>0){
return list.get(0);
}
return list!=null&&list.size()>0?list.get(0):null;
return null;
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/EquipmentServiceImpl.java
View file @ 546aefd3
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists;
......@@ -50,9 +51,10 @@ public class EquipmentServiceImpl {
@Autowired
private RedisUtils redisUtils;
private static final String CHILDREN="children";
public List<MenuFrom> getFireSystemList() {
// 导出模板增加权限
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 权限处理
PermissionInterceptorContext.setDataAuthRule("fire_water_info");
ResponseModel<Object> response = equipFeignClient.getFireSystemListAll();
......@@ -71,14 +73,13 @@ public class EquipmentServiceImpl {
stopWatch.start();
ResponseModel<Object> response = equipFeignClient.getBuildingTree();
stopWatch.stop();
System.out.printf("耗时%f秒/n", stopWatch.getTotalTimeSeconds());
List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
List<MenuFrom> buildingTreeList = Lists.newArrayList();
buildingMapList.forEach(building -> {
MenuFrom menuFrom = new MenuFrom((String) building.get("id"), "全部建筑", (String) building.get("parentId"),
"0");
List<Map<String, Object>> children = (List<Map<String, Object>>) building.get("children");
List<Map<String, Object>> children = (List<Map<String, Object>>) building.get(CHILDREN);
menuFrom.setChildren(parseTree(menuFrom, children));
menuFrom.setIsLeaf(false);
buildingTreeList.add(menuFrom);
......@@ -92,8 +93,8 @@ public class EquipmentServiceImpl {
children.forEach(child -> {
MenuFrom menuFrom = new MenuFrom((String) child.get("id"), (String) child.get("name"),
(String) child.get("parentId"), "0");
if (!ValidationUtil.isEmpty(child.get("children"))) {
parseTree(menuFrom, (List<Map<String, Object>>) child.get("children"));
if (!ValidationUtil.isEmpty(child.get(CHILDREN))) {
parseTree(menuFrom, (List<Map<String, Object>>) child.get(CHILDREN));
if(parent!=null){
parent.setIsLeaf(false);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @ 546aefd3
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.text.ParseException;
......@@ -10,6 +11,7 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.*;
......@@ -194,6 +196,15 @@ public class ExcelServiceImpl {
@Autowired
SignServiceImpl signServiceImpl;
private static final String GENDER="gender";
private static final String INSTANCEID="instanceId";
private static final String INAGREEMENT="inAgreement";
private static final String JCDWRY="JCDWRY";
public void templateExport(HttpServletResponse response, ExcelDto excelDto) throws ClassNotFoundException {
String url = excelDto.getClassUrl();
Class<?> clz = Class.forName(url);
......@@ -314,12 +325,9 @@ public class ExcelServiceImpl {
null, FirefightersExcelDto.class, null, false);
break;
}
// List<FirefightersExcelDto> firefightersExcelDtoList = firefightersService.exportToExcel(false, par);
List<OrgUsrFireExcelDto> firefightersExcelDtoList = firefightersService.exportToExcelNew(false, par);
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
firefightersExcelDtoList, OrgUsrFireExcelDto.class, null, false);
// ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
// firefightersExcelDtoList, FirefightersExcelDto.class, null, false);
break;
case "WBRY":
List<MaintenancePersonExcleDto> maintenancePersonExcelDtoList = maintenanceCompanyService
......@@ -339,7 +347,7 @@ public class ExcelServiceImpl {
String type =par.containsKey("type")?par.get("type").toString():null;
String signTimeBIGGER =par.containsKey("signTimeBIGGER")?par.get("signTimeBIGGER").toString():null;
String signTimeLESS =par.containsKey("signTimeLESS")?par.get("signTimeLESS").toString():null;
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String companyId = reginParams.getPersonIdentity().getCompanyId();
OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
dto.setBizOrgCode(orgUsr.getBizOrgCode());
......@@ -383,13 +391,11 @@ public class ExcelServiceImpl {
par.containsKey("useNature")?par.get("useNature").toString():null,
par.containsKey("fireFacilitiesInfo")?par.get("fireFacilitiesInfo").toString():null,
par.containsKey("bizOrgCode")? par.get("bizOrgCode").toString():null);
}/*else{
keySiteDtoList = keySiteService.exportToExcel(null,null,null,null,null,null);
}*/
}
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), keySiteDtoList,
KeySiteExcleDto.class, null, false);
break;
case "JCDWRY":
case JCDWRY:
if(!authFlag) {
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), null,
OrgUsrExcelDto.class, null, false);
......@@ -406,15 +412,15 @@ public class ExcelServiceImpl {
break;
}
List<OrgUsrExcelDto> orgUsrDlList = orgUsrService.exportToExcel(par);
String content = JSONObject.toJSONString(orgUsrDlList);
List<OrgUsrDlExcelDto> dtoList = JSONObject.parseArray(content, OrgUsrDlExcelDto.class);
String content = JSON.toJSONString(orgUsrDlList);
List<OrgUsrDlExcelDto> dtoList = JSON.parseArray(content, OrgUsrDlExcelDto.class);
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), dtoList,
OrgUsrDlExcelDto.class, null, false);
break;
case "LDDW":
List<LinkageUnitDto> LinkageUnitDtoList = null;
String inAgreement = par.containsKey("inAgreement")&&!(par.get("inAgreement").toString()).equals("null")?par.get("inAgreement").toString():"";
String inAgreement = par.containsKey(INAGREEMENT)&&!(par.get(INAGREEMENT).toString()).equals("null")?par.get(INAGREEMENT).toString():"";
if(par.size()>0) {
LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(par.containsKey("unitName")?par.get("unitName").toString():null,
......@@ -426,28 +432,26 @@ public class ExcelServiceImpl {
LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(null,null,null, null);
}
List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(LinkageUnitDtoList), Map.class);
List<Map> linkageUnitListMap =JSON.parseArray(JSON.toJSONString(LinkageUnitDtoList), Map.class);
List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll("linkageUnit");
linkageUnitListMap.forEach(i -> {
if ( i.get("instanceId") != null){
String mainString = i.get("instanceId").toString();
if ( i.get(INSTANCEID) != null){
String mainString = i.get(INSTANCEID).toString();
pageList.stream().forEach(detail -> {
if (detail.get("instanceId").toString().equals(mainString)) {
if (detail.get(INSTANCEID).toString().equals(mainString)) {
i.putAll(detail);
}
});
}
});
List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitListMap),
List<LinkageUnitDto> resultDtoList = JSON.parseArray(JSON.toJSONString(linkageUnitListMap),
LinkageUnitDto.class);
List<LinkageUnitDto> detaiList = resultDtoList.stream().map(item -> {
Date now = new Date();
if (item.getLongitude() != null){
}
boolean isInAgreement = DateUtils.belongCalendar(now, item.getAgreementStartDate(),
item.getAgreementEndDate());
item.setInAgreement(isInAgreement ? "是" : "否");
......@@ -509,9 +513,8 @@ public class ExcelServiceImpl {
case "KEYSITE":
excelImportKeySite(multipartFile);
break;
case "JCDWRY":
case JCDWRY:
case "DLDWRY":
// excelImportOrgUsrExcelDto(multipartFile);
excelImportOrgUsrExcelDtoNew(multipartFile);
break;
case "LDDW":
......@@ -616,7 +619,7 @@ public class ExcelServiceImpl {
private void excelImportLinkageUnitZhDto(MultipartFile multipartFile) throws Exception {
List<LinkageUnitDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, LinkageUnitDto.class, 1);
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String companyId = reginParams.getPersonIdentity().getCompanyId();
String bizOrgCode = "1";
String bizOrgName = "1";
......@@ -711,7 +714,7 @@ public class ExcelServiceImpl {
dynamicFormInstanceDto.setFieldValueLabel(certificates[0]);
}
break;
case "gender":
case GENDER:
if (orgUsrExcelDto.getGender() != null) {// BUG 2892 导入机场单位没有持证类别和 人员性别 处理 by kongfm 2021-09-16
String[] gender = orgUsrExcelDto.getGender().split("@");
dynamicFormInstanceDto.setFieldValue(gender[1]);
......@@ -769,7 +772,7 @@ public class ExcelServiceImpl {
try {
orgUsrService.saveOrgPersonExcel(orgUsrExcelDto);
} catch (Exception e) {
throw new RuntimeException("导入失败!");
throw new BadRequest("导入失败!");
}
});
}
......@@ -781,8 +784,8 @@ public class ExcelServiceImpl {
if (!logic){
List<OrgUsrDlExcelDto> list = ExcelUtil.readFirstSheetExcel(multipartFile, OrgUsrDlExcelDto.class, 1);
if (list.size() > 0) {
String s = JSONObject.toJSONString(list);
List<OrgUsrExcelDto> list1 = JSONObject.parseArray(s, OrgUsrExcelDto.class);
String s = JSON.toJSONString(list);
List<OrgUsrExcelDto> list1 = JSON.parseArray(s, OrgUsrExcelDto.class);
excelDtoList.addAll(list1);
}
}else {
......@@ -825,8 +828,8 @@ public class ExcelServiceImpl {
logger.error("获取{}字段值失败, {}", field.getName(), ex);
}
}
String s = JSONObject.toJSONString(orgUsrExcelDto);
Map map1 = JSONObject.parseObject(s, Map.class);
String s = JSON.toJSONString(orgUsrExcelDto);
Map<String,Object> map1 = JSON.parseObject(s, Map.class);
List<DynamicFormInstanceDto> dynamicFormValue = new ArrayList<>();
List<DynamicFormInstance> dynamicFormInstancelist = new ArrayList<>();
......@@ -836,7 +839,7 @@ public class ExcelServiceImpl {
formItemDescr.setFieldValue(null);
DynamicFormInitDto.setFormItemDescr(formItemDescr);
}
if ("gender".equals(DynamicFormInitDto.getKey())){
if (GENDER.equals(DynamicFormInitDto.getKey())){
DynamicFormInstanceDto formItemDescr = DynamicFormInitDto.getFormItemDescr();
formItemDescr.setFieldValue(null);
DynamicFormInitDto.setFormItemDescr(formItemDescr);
......@@ -856,19 +859,18 @@ public class ExcelServiceImpl {
dynamicFormInstanceDto.setFieldValue(value);
}
}
if (map.containsKey(key) && map.get(key) != null){
if ("birthdayTime".equals(key) || "holdingTime".equals(key) ) {
if (map.containsKey(key) && map.get(key) != null&&("birthdayTime".equals(key) || "holdingTime".equals(key) )){
Date o = (Date) map.get(key);
SimpleDateFormat dtf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
String format = dtf.format(o);
try {
// String date = ft.format(o);
dynamicFormInstanceDto.setFieldValue(format);
} catch (Exception e) {
logger.error("日期转换失败");
throw new RuntimeException("出生日期格式不对!");
}
throw new BadRequest("出生日期格式不对!");
}
}
DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
......@@ -877,7 +879,7 @@ public class ExcelServiceImpl {
if (map1.containsKey(fieldCode.substring(0,fieldCode.length()-4)) && map1.get(fieldCode.substring(0,fieldCode.length()-4)) != null){
dynamicFormInstance.setFieldValueLabel(map1.get(fieldCode.substring(0,fieldCode.length()-4)).toString());
}
if ("gender".equals(dynamicFormInstance.getFieldCode()) && !ObjectUtils.isEmpty(dynamicFormInstance.getFieldValue())){
if (GENDER.equals(dynamicFormInstance.getFieldCode()) && !ObjectUtils.isEmpty(dynamicFormInstance.getFieldValue())){
dynamicFormInstance.setFieldValueLabel("346".equals(String.valueOf(dynamicFormInstance.getFieldValue()))?"男":"女");
}
if ("positionType".equals(dynamicFormInstance.getFieldCode()) && !ObjectUtils.isEmpty(dynamicFormInstance.getFieldValue())){
......@@ -907,11 +909,11 @@ public class ExcelServiceImpl {
String[] split55 = orgUsrExcelDto.getCertificatesTypeCode().toString().split("@");
if (!ObjectUtils.isEmpty(orgUsrExcelDto.getCertificatesNumber())&&split55[1].equals("120")) {
if (!set.add(orgUsrExcelDto.getCertificatesNumber())) {
throw new RuntimeException("身份证号码重复!");
throw new BadRequest("身份证号码重复!");
} else {
boolean b = orgUsrService.checkCertificatesNumber(orgUsrExcelDto.getCertificatesNumber(), null);
if (b) {
throw new RuntimeException("身份证号码重复!");
throw new BadRequest("身份证号码重复!");
}
}
}
......@@ -920,12 +922,12 @@ public class ExcelServiceImpl {
//平台用户唯一效验
if (!ObjectUtils.isEmpty(orgUsrExcelDto.getAmosOrgId())) {
if (!set1.add(orgUsrExcelDto.getAmosOrgId())) {
throw new RuntimeException("关联用户"+orgUsrExcelDto.getAmosOrgCode()+"重复!");
throw new BadRequest("关联用户"+orgUsrExcelDto.getAmosOrgCode()+"重复!");
} else {
int num = orgUsrMapper.amosIdExist(orgUsrExcelDto.getAmosOrgId(),null);
if (num > 0) {
throw new RuntimeException("关联用户"+orgUsrExcelDto.getAmosOrgCode()+"重复!");
throw new BadRequest("关联用户"+orgUsrExcelDto.getAmosOrgCode()+"重复!");
}
}
}
......@@ -946,7 +948,7 @@ public class ExcelServiceImpl {
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("导入失败!");
throw new BadRequest("导入失败!");
}
});
}
......@@ -985,7 +987,6 @@ public class ExcelServiceImpl {
firefighters.setJobTitleCode(jobTitle[1]);
}
if (item.getParentId() != null) {
// String[] tempCompany = item.getParentId().split("@");
firefighters.setCompanyName(item.getParentName());
firefighters.setCompanyCode(item.getParentId());
firefighters.setCompany(item.getParentId());
......@@ -1310,7 +1311,7 @@ public class ExcelServiceImpl {
fireTeam.setBizOrgCode(companyDto.getBizOrgCode());
fireTeam.setBizOrgName(companyDto.getBizOrgName());
} catch (Exception e) {
e.printStackTrace();
}
}
/* bug2835 添加获取上级单位的信息方法 陈浩 2021-09-10 --end */
......@@ -1378,7 +1379,7 @@ public class ExcelServiceImpl {
excelDtoList.forEach(item -> {
/* Bug 2950 消防水源，缺失设施分类、设施定义等必填字段可以上传成功 陈召 2021-10-09 */
if (item.getEquipName() == null || item.getEquipName().equals(" ")) {
throw new RuntimeException("设备定义名称为必填字段，填写后重新上传");
throw new BadRequest("设备定义名称为必填字段，填写后重新上传");
}
// BUG 2953 导入模板没有设备编码生成 2021-09-18 陈召开始
......@@ -1562,7 +1563,7 @@ public class ExcelServiceImpl {
fireExpertsServiceImpl.saveBatch(excelEntityList);
}
@Async
private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType,String uuidString) {
public void excelImportDutyPerson(MultipartFile multipartFile, String dutyType,String uuidString) {
try {
ImportDutyPerson(multipartFile,dutyType);
if(redisUtils.hasKey(uuidString)){
......@@ -1575,14 +1576,14 @@ public class ExcelServiceImpl {
}
}
private void ImportDutyPerson(MultipartFile multipartFile, String dutyType) throws Exception {
private void ImportDutyPerson(MultipartFile multipartFile, String dutyType) throws BadRequest, IOException {
String fileName = multipartFile.getOriginalFilename();
if (fileName == null) {
throw new Exception("文件不存在！");
throw new BadRequest("文件不存在！");
}
if (!fileName.toLowerCase().endsWith(ExcelTypeEnum.XLS.getValue())
&& !fileName.toLowerCase().endsWith(ExcelTypeEnum.XLSX.getValue())) {
throw new Exception("文件类型异常！");
throw new BadRequest("文件类型异常！");
}
InputStream input = multipartFile.getInputStream();
XSSFWorkbook workbook = new XSSFWorkbook(input);
......@@ -1670,11 +1671,11 @@ public class ExcelServiceImpl {
String fileName = multipartFile.getOriginalFilename();
if (fileName == null) {
throw new Exception("文件不存在！");
throw new BadRequest("文件不存在！");
}
if (!fileName.toLowerCase().endsWith(ExcelTypeEnum.XLS.getValue())
&& !fileName.toLowerCase().endsWith(ExcelTypeEnum.XLSX.getValue())) {
throw new Exception("文件类型异常！");
throw new BadRequest("文件类型异常！");
}
List<OrgUsrSafeReportExcelDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
OrgUsrSafeReportExcelDto.class, 1);
......@@ -2097,7 +2098,7 @@ public class ExcelServiceImpl {
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("系统异常！");
throw new BadRequest("系统异常！");
}
return data;
}
......@@ -2190,26 +2191,13 @@ public class ExcelServiceImpl {
public void exportByParams(HttpServletResponse response, ExcelDto excelDto, String params) {
switch (excelDto.getType()) {
// case "WHP": 已废弃
// List<FireChemicalDto> data = fireChemicalServiceImpl.queryForFireChemicalList(false);
// ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), data,
// FireChemicalDto.class, dataSourcesImpl, false);
// break;
case "XFZJ":
List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,null,null, null);
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireExpertsDtoList,
FireExpertsDto.class, dataSourcesImpl, false);
break;
// case "SYXX": 已废弃
// List<WaterResourceDto> waterResourceDtoList = waterResourceServiceImpl.exportToExcel(true);
// ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), waterResourceDtoList,
// WaterResourceDto.class, dataSourcesImpl, false);
// break;
// case "HKQ": 已废弃
// List<AircraftDto> aircraftDtoList = aircraftServiceImpl.queryAircraftDtoForList(false);
// ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), aircraftDtoList,
// AircraftDto.class, dataSourcesImpl, false);
// break;
case "XFDW":
List<FireTeamDto> fireTeamDtoList = fireTeamService.queryFireTeamForList(false,null);
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireTeamDtoList,
......@@ -2231,12 +2219,8 @@ public class ExcelServiceImpl {
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(),
maintenancePersonExcelDtoList, MaintenancePersonExcleDto.class, null, false);
break;
// case "KEYSITE": 已废弃
// List<KeySiteExcleDto> keySiteDtoList = keySiteService.exportToExcel();
// ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), keySiteDtoList,
// KeySiteExcleDto.class, null, false);
// break;
case "JCDWRY":
case JCDWRY:
// 机场单位人员参数传递为 parentId = xxxxxxx
String parentIdStr = params.split("=")[1];
Long parentId = -1l;
......@@ -2249,12 +2233,7 @@ public class ExcelServiceImpl {
ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), orgUsrList,
OrgUsrExcelDto.class, null, false);
break;
// case "LDDW": 已废弃
// List<LinkageUnitDto> LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel();
//
// ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), LinkageUnitDtoList,
// LinkageUnitDto.class, null, false);
// break;
default:
break;
}
......@@ -2269,7 +2248,7 @@ public class ExcelServiceImpl {
AgencyUserModel userModel1 = agencyUserModel.getResult();
String keyString = userModel1.getUserId();
String token = RequestContext.getToken();
ReginParams params = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(keyString, token)).toString(),
ReginParams params = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(keyString, token)).toString(),
ReginParams.class);
userModel.setRecUserId(params.getUserModel().getUserId());
userModel.setRecUserName(params.getUserModel().getRealName());
......@@ -2277,12 +2256,11 @@ public class ExcelServiceImpl {
return userModel;
}
public ReginParams getCurrentAllInfo() {
BaseEntity userModel = new BaseEntity();
FeignClientResult<AgencyUserModel> agencyUserModel = Privilege.agencyUserClient.getme();
AgencyUserModel userModel1 = agencyUserModel.getResult();
String keyString = userModel1.getUserId();
String token = RequestContext.getToken();
return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(keyString, token)).toString(),
return JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(keyString, token)).toString(),
ReginParams.class);
}
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FaultServiceImpl.java
View file @ 546aefd3
......@@ -19,7 +19,7 @@ public class FaultServiceImpl implements IHomePageService {
@Autowired
EquipFeignClient quipFeignClient;
private static EquipFeignClient quipFeignClient1;
private EquipFeignClient quipFeignClient1;
@PostConstruct
public void init(){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireAlarmServiceImpl.java
View file @ 546aefd3
......@@ -20,7 +20,7 @@ public class FireAlarmServiceImpl implements IHomePageService {
@Autowired
EquipFeignClient quipFeignClient;
private static EquipFeignClient quipFeignClient1;
private EquipFeignClient quipFeignClient1;
@PostConstruct
public void init(){
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirefightersJacketServiceImpl.java
View file @ 546aefd3
......@@ -39,7 +39,7 @@ public class FirefightersJacketServiceImpl extends BaseService<FirefightersJacke
@Override
public ResponseModel<Page<Object>> getAirEquipSpecificPage(EquipSpecificDto equipSpecificDto, int current, int size) {
Page page = new Page(current, size);
Page<Object> page = new Page<Object>(current, size);
equipSpecificDto.setPage(page);
ResponseModel<Page<Object>> airEquipSpecificPage = equipFeignClient.getAirEquipSpecificPage(equipSpecificDto);
return airEquipSpecificPage;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FirestationJacketServiceImpl.java
View file @ 546aefd3
......@@ -42,7 +42,7 @@ public class FirestationJacketServiceImpl extends BaseService<FirestationJacketD
@Override
public ResponseModel<Page<Object>> getAirEquipSpecificPage(EquipSpecificDto equipSpecificDto, int current, int size) {
Page page = new Page(current, size);
Page<Object> page = new Page<Object>(current, size);
equipSpecificDto.setPage(page);
ResponseModel<Page<Object>> airEquipSpecificPage = equipFeignClient.getAirEquipSpecificPage(equipSpecificDto);
return airEquipSpecificPage;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FusionServiceImpl.java
View file @ 546aefd3
......@@ -26,6 +26,8 @@ public class FusionServiceImpl implements IFusionService {
@Value("${ifc.url}")
private String voiceURL;
private static String LOGD="访问融合终端失败";
@Override
public JSONObject getAllOnlineUser() {
JSONObject jsonObject = null;
......@@ -33,7 +35,7 @@ public class FusionServiceImpl implements IFusionService {
jsonObject = RestTemplateUtil.getRestInstance().getForObject(String.format("%s/GetAllOnlineUser", voiceURL), JSONObject.class);
} catch (RestClientException e) {
e.printStackTrace();
throw new BadRequest("访问融合终端失败");
throw new BadRequest(LOGD);
}
return jsonObject;
}
......@@ -46,7 +48,7 @@ public class FusionServiceImpl implements IFusionService {
jsonObject = RestTemplateUtil.getRestInstance().getForObject(url, JSONObject.class);
} catch (RestClientException e) {
e.printStackTrace();
throw new BadRequest("访问融合终端失败");
throw new BadRequest(LOGD);
}
return jsonObject;
}
......@@ -60,7 +62,7 @@ public class FusionServiceImpl implements IFusionService {
jsonObject = RestTemplateUtil.getRestInstance().postForObject(String.format("%s/GetGISByEmployeeID", voiceURL), requestEntity, JSONObject.class);
} catch (RestClientException e) {
e.printStackTrace();
throw new BadRequest("访问融合终端失败");
throw new BadRequest(LOGD);
}
return getResult(jsonObject);
}
......@@ -75,7 +77,7 @@ public class FusionServiceImpl implements IFusionService {
jsonObject = RestTemplateUtil.getRestInstance().postForObject(String.format("%s/GetCallRecordByNumber", voiceURL), requestEntity, JSONObject.class);
} catch (RestClientException e) {
e.printStackTrace();
throw new BadRequest("访问融合终端失败");
throw new BadRequest(LOGD);
}
return getResult(jsonObject);
}
......@@ -89,7 +91,7 @@ public class FusionServiceImpl implements IFusionService {
jsonObject = RestTemplateUtil.getRestInstance().postForObject(String.format("%s/GetCallRecordByCID", voiceURL), requestEntity, JSONObject.class);
} catch (RestClientException e) {
e.printStackTrace();
throw new BadRequest("访问融合终端失败");
throw new BadRequest(LOGD);
}
return getResult(jsonObject);
}
......@@ -142,7 +144,7 @@ public class FusionServiceImpl implements IFusionService {
jsonObject = RestTemplateUtil.getRestInstance().postForObject(String.format("%s/selectCallRecordByConditions", voiceURL), requestEntity, JSONObject.class);
} catch (RestClientException e) {
e.printStackTrace();
throw new BadRequest("访问融合终端失败");
throw new BadRequest(LOGD);
}
return jsonObject;
}
......@@ -153,7 +155,7 @@ public class FusionServiceImpl implements IFusionService {
public Map<String, String> getResult(JSONObject jsonObject) {
Map<String, String> map = new HashMap<>();
if (ValidationUtil.isEmpty(jsonObject)) {
throw new BadRequest("访问融合终端失败");
throw new BadRequest(LOGD);
}
if (jsonObject.get("data") instanceof Map) {
JSONObject data = jsonObject.getJSONObject("data");
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 546aefd3
......@@ -56,7 +56,7 @@
find_in_set(#{systemId},spe.system_id) and spe.single = true and wlsd.`status` = 1
</select>
<select id="getEquiplistBySystemIdList" resultMap="EquiplistBySystemId">
<select id="getEquiplistBySystemIdList" resultType="com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO">
SELECT
det.`name` equipmentName,
spe.`iot_code` iotCode,
......
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