Skip to content

A
amos-boot-biz
Commit 1c7352e9 authored by 刘凡's avatar 刘凡
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into develop_tzs_register_to_0715
parents 34fb12ff 77ac5fe0
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 31 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java
View file @ 1c7352e9
......@@ -268,4 +268,18 @@ public class JgUseRegistrationManageController extends BaseController {
}
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
}
/**
* 根据sequenceNbr查询---大屏使用
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/detail/dp")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询---大屏使用", notes = "根据sequenceNbr查询---大屏使用")
public ResponseModel<Object> getDetail(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.getDetail(sequenceNbr));
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
View file @ 1c7352e9
......@@ -1593,8 +1593,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 工程装置名称模糊查询
if (!ObjectUtils.isEmpty(map.getString(PROJECT_CONTRAPTION))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString(PROJECT_CONTRAPTION));
pBuilder.must(QueryBuilders.termsQuery("PROJECT_CONTRAPTION.keyword", test.toLowerCase()));
pBuilder.must(QueryBuilders.termsQuery("PROJECT_CONTRAPTION.keyword", map.getString(PROJECT_CONTRAPTION).toLowerCase()));
boolMust.must(pBuilder);
}
builder.query(boolMust);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java
View file @ 1c7352e9
......@@ -947,7 +947,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//修改各类告知列表，置为废弃
this.updateInvalidStatusByHistory(device.getEquId(), device.getEquipTransferId());
//修改证管理表数据
this.updateUseRegistrationManage(transfer, historyData, useRegistrationCode.get(), isUpdateRegistrationCode.get());
this.updateUseRegistrationManage(device, transfer, historyData, useRegistrationCode.get(), isUpdateRegistrationCode.get());
});
}
......@@ -963,7 +963,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
this.updateTransferByBaseInfo(transfer);
}
private void updateUseRegistrationManage(JgChangeRegistrationTransfer transfer, JgRegistrationHistory historyData, String useRegistrationCode, boolean isUpdateRegistrationCode) {
private void updateUseRegistrationManage(JgChangeRegistrationTransferEq device, JgChangeRegistrationTransfer transfer, JgRegistrationHistory historyData, String useRegistrationCode, boolean isUpdateRegistrationCode) {
JSONObject historyJson = JSON.parseObject(historyData.getChangeData());
List<JgUseRegistrationManage> registrationList = useRegistrationManageService.lambdaQuery()
.in(BaseEntity::getSequenceNbr,
......@@ -971,12 +971,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
.map(obj -> ((JSONObject) obj).getString("sequenceNbr"))
.collect(Collectors.toList())
).list();
registrationList.forEach(registrationManage -> {
registrationManage.setReceiveOrgName(transfer.getReceiveOrgName());
registrationManage.setReceiveCompanyCode(transfer.getReceiveOrgCode());
registrationManage.setAuditPassDate(new Date());
registrationManage.setEquUseAddress(transfer.getFullAddress());
if (isUpdateRegistrationCode) {
if (isUpdateRegistrationCode && !StringUtils.isEmpty(registrationManage.getUseRegistrationCode())
&& device.getUseRegistrationCode() != null && device.getUseRegistrationCode().equals(registrationManage.getUseRegistrationCode())) {
registrationManage.setUseRegistrationCode(useRegistrationCode);
}
registrationManage.setCertificateStatus("已登记");
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationManageServiceImpl.java
View file @ 1c7352e9
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
import com.yeejoin.amos.boot.module.jg.api.dto.UseFlagParamDto;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
......@@ -20,6 +21,7 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import org.apache.commons.io.IOUtils;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
......@@ -31,19 +33,25 @@ import org.elasticsearch.index.query.TermsQueryBuilder;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import static com.alibaba.fastjson.JSON.parseArray;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
/**
......@@ -95,6 +103,9 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
@Autowired
private IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
@Value("classpath:/json/registrationBasic.json")
private Resource registrationBasicJson;
/**
* 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
*/
......@@ -548,4 +559,48 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
return StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMasterPhone()) ? idxBizJgMaintenanceRecordInfo.getMeMasterPhone() : StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMaster1Phone()) ? idxBizJgMaintenanceRecordInfo.getMeMaster1Phone() : "";
}
/**
* 根据sequenceNbr查询---大屏使用
*
* @param sequenceNbr 主键
* @return
*/
public Object getDetail(String sequenceNbr) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
List<FormValue> jsonData = getJsonData(registrationBasicJson);
HashMap<String, Object> result = new HashMap<>();
// 基本信息
JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectById(sequenceNbr);
Map<String, Object> objectMap = Bean.BeantoMap(jgUseRegistrationManage);
jsonData.forEach(f -> {
Object o = objectMap.get(f.getKey());
if (!ObjectUtils.isEmpty(o)) {
f.setValue(o.toString());
if ("auditPassDate".equals(f.getKey())){
f.setValue(simpleDateFormat.format(jgUseRegistrationManage.getAuditPassDate()));
}
}
});
// 流水信息
List<Map<String, String>> list = operationRecord(sequenceNbr);
HashMap<String, Object> map = new HashMap<>();
map.put("datas", list);
map.put("title", "使用登记证流水");
map.put("renderType", "timeline");
result.put("keyParams", jsonData);
result.put("deviceRecords", map);
return result;
}
private List<FormValue> getJsonData(Resource resource) {
String json;
try {
json = IOUtils.toString(resource.getInputStream(), String.valueOf(StandardCharsets.UTF_8));
} catch (IOException e) {
throw new RuntimeException(e);
}
return parseArray(json, FormValue.class);
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/registrationBasic.json 0 → 100644
View file @ 1c7352e9
[
{
"key": "useRegistrationCode",
"label": "使用登记证编号",
"type": "text"
},
{
"key": "useUnitName",
"label": "使用单位名称",
"type": "text"
},
{
"key": "useUnitAddress",
"label": "使用单位地址",
"type": "text"
},
{
"key": "receiveOrgName",
"label": "登记机关",
"type": "text"
},
{
"key": "equList",
"label": "设备种类",
"type": "text"
},
{
"key": "equCategory",
"label": "设备类别",
"type": "text"
},
{
"key": "equDefine",
"label": "设备品种",
"type": "text"
},
{
"key": "equUseAddress",
"label": "设备使用地址",
"type": "text"
},
{
"key": "certificateStatus",
"label": "使用登记证状态",
"type": "text"
},
{
"key": "auditPassDate",
"label": "办理日期",
"type": "text"
}
]
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java
View file @ 1c7352e9
package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
import cn.hutool.core.date.DateTime;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -8,14 +7,12 @@ import com.yeejoin.amos.boot.biz.common.dto.CountDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.entity.AlertRescueStatistics;
import com.yeejoin.amos.boot.module.common.api.entity.AlertUseUnitStatistics;
import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
import com.yeejoin.amos.boot.module.statistics.api.dto.AlertUseUnitStatisticsDto;
import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertRescueStatisticsMapper;
import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertUseUnitStatisticsMapper;
import com.yeejoin.amos.boot.module.ymt.api.dto.AlertPaperInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.DispatchPaper;
import com.yeejoin.amos.boot.module.ymt.api.entity.MainParts;
import com.yeejoin.amos.boot.module.ymt.api.enums.DispatchPaperEnums;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
......@@ -135,9 +132,9 @@ public class YJDPStatisticsServiceImpl {
return jsonObject;
}
public JSONObject elevatorCountStat(DPFilterParamDto dpFilterParamDto) throws Exception {
public JSONObject elevatorCountStat(DPFilterParamDto dpFilterParamDto) {
List<RegionModel> regionList = stCommonService.setRegionIfRootParent(dpFilterParamDto);
List<String> xdata = regionList.stream().map(r -> r.getRegionName().toString()).collect(Collectors.toList());
List<String> xdata = regionList.stream().map(RegionModel::getRegionName).collect(Collectors.toList());
List<Long> ydata = new ArrayList<>();
regionList.forEach(x -> {
......@@ -366,12 +363,15 @@ public class YJDPStatisticsServiceImpl {
}
public List<Map<String, Object>> getCenterMapCountDataForOverview(DPFilterParamDto dpFilterParamDto) {
return stCommonService.setRegionIfRootParent(dpFilterParamDto).parallelStream().map(r -> {
return stCommonService.setRegionIfRootParent(dpFilterParamDto).stream().map(r -> {
DPFilterParamDto filterParamDto = new DPFilterParamDto();
filterParamDto.setCityCode(r.getRegionCode().toString());
String orgCode = stCommonService.getAndSetOrgCode(filterParamDto);
this.setDefaultFilter(filterParamDto);
Map<String, Object> itemResult = getCenterMapOverviewData(orgCode, filterParamDto);
Map<String, Object> itemResult = new HashMap<>();
if (StringUtils.isNotEmpty(orgCode)) {
this.setDefaultFilter(filterParamDto);
itemResult = getCenterMapOverviewData(orgCode, filterParamDto);
}
itemResult.put("regionCode", r.getRegionCode());
itemResult.put("regionName", r.getRegionName());
return itemResult;
......@@ -385,37 +385,37 @@ public class YJDPStatisticsServiceImpl {
Map<String, Long> alertTypeNumMap = countDtos.stream().collect(Collectors.toMap(CountDto::getKeyStr, CountDto::getLongValue));
Map<String, Long> equDefineNumMap = staticsElevatorByEquDefine(filterParamDto.getCityCode());
// 电梯总量(台)
result.put("dtCount", equDefineNumMap.values().stream().mapToLong(e->e).sum());
result.put("dtCount", equDefineNumMap.values().stream().mapToLong(e -> e).sum());
// 曳引驱动乘客电梯(台)
result.put("zyqdcjdtCount", equDefineNumMap.getOrDefault("3110",0L));
result.put("zyqdcjdtCount", equDefineNumMap.getOrDefault("3110", 0L));
// 曳引驱动载货电梯(台)
result.put("zyqdzhdtCount",equDefineNumMap.getOrDefault("3120",0L));
result.put("zyqdzhdtCount", equDefineNumMap.getOrDefault("3120", 0L));
// 强制驱动载货电梯(台)
result.put("qzqdzgdtCount", equDefineNumMap.getOrDefault("3130",0L));
result.put("qzqdzgdtCount", equDefineNumMap.getOrDefault("3130", 0L));
// 液压乘客电梯(台)
result.put("yackdtount", equDefineNumMap.getOrDefault("3210",0L));
result.put("yackdtount", equDefineNumMap.getOrDefault("3210", 0L));
// 液压载货电梯(台)
result.put("yyzhdtCount", equDefineNumMap.getOrDefault("3220",0L));
result.put("yyzhdtCount", equDefineNumMap.getOrDefault("3220", 0L));
// 自动扶梯(台)
result.put("zdftCount", equDefineNumMap.getOrDefault("3310",0L));
result.put("zdftCount", equDefineNumMap.getOrDefault("3310", 0L));
// 自动人行道(台)
result.put("zdrxdCount", equDefineNumMap.getOrDefault("3320",0L));
result.put("zdrxdCount", equDefineNumMap.getOrDefault("3320", 0L));
// 防爆电梯(台)
result.put("fbdtCount", equDefineNumMap.getOrDefault("3410",0L));
result.put("fbdtCount", equDefineNumMap.getOrDefault("3410", 0L));
// 消防员电梯(台)
result.put("xfydtCount", equDefineNumMap.getOrDefault("3420",0L));
result.put("xfydtCount", equDefineNumMap.getOrDefault("3420", 0L));
// 杂物电梯(台)
result.put("zhdtCount", equDefineNumMap.getOrDefault("3430",0L));
result.put("zhdtCount", equDefineNumMap.getOrDefault("3430", 0L));
// 应急事件(起)
result.put("alarmCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.KRJY.getId(),0L) + alertTypeNumMap.getOrDefault(DispatchPaperEnums.GZWX.getId(), 0L));
result.put("alarmCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.KRJY.getId(), 0L) + alertTypeNumMap.getOrDefault(DispatchPaperEnums.GZWX.getId(), 0L));
// 困人救援事件(起)
result.put("krjysjCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.KRJY.getId(),0L));
result.put("krjysjCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.KRJY.getId(), 0L));
// 故障维修(起)
result.put("gzwxCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.GZWX.getId(),0L));
result.put("gzwxCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.GZWX.getId(), 0L));
// 投诉咨询(起)
result.put("tszxCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.TSZX.getId(),0L));
result.put("tszxCount", alertTypeNumMap.getOrDefault(DispatchPaperEnums.TSZX.getId(), 0L));
// 解救被困乘客数(人)
result.put("jjbkcksCount", alertStatisticsMapper.countRescuedPersonNum(orgCode,filterParamDto));
result.put("jjbkcksCount", alertStatisticsMapper.countRescuedPersonNum(orgCode, filterParamDto));
return result;
}
......@@ -423,7 +423,10 @@ public class YJDPStatisticsServiceImpl {
public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) {
this.setDefaultFilter(dpFilterParamDto);
String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto);
return this.getCenterMapOverviewData(orgCode, dpFilterParamDto);
if (StringUtils.isNotEmpty(orgCode)) {
return this.getCenterMapOverviewData(orgCode, dpFilterParamDto);
}
return new HashMap<>();
}
private void setDefaultFilter(DPFilterParamDto dpFilterParamDto) {
......@@ -475,7 +478,7 @@ public class YJDPStatisticsServiceImpl {
Terms terms = response.getAggregations().get("count_by_equ_define_code");
for (Terms.Bucket bucket : terms.getBuckets()) {
// 按照真实的过滤，防止有脏数据
if(ELEVATOR_EQU_DEFINE_CODES.contains(bucket.getKeyAsString())){
if (ELEVATOR_EQU_DEFINE_CODES.contains(bucket.getKeyAsString())) {
countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
}
}
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/registration.json 0 → 100644
View file @ 1c7352e9
{
"tabs": [
{
"key": "keyinfo",
"displayName": "基本信息",
"renderType": "keyinfo",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-use-registration-manage/detail/dp",
"params": {
"sequenceNbr": "{sequenceNbr}"
}
}
}
},
{
"key": "deviceRecords",
"displayName": "设备信息",
"renderType": "table",
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-use-registration-manage/detail/equList",
"params": {
"current": 1,
"size": 10,
"sequenceNbr": "{sequenceNbr}"
}
}
},
"visualParams": {
"rowKey": "record",
"showPage" : true,
"columns": [
{"dataRenderingMode": "defaultText","dataIndex": "EQU_CATEGORY","width": 150,"align": "left","title": "设备类别","key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"},
{"dataRenderingMode": "defaultText","dataIndex": "EQU_DEFINE","width": 160,"align": "left","title": "设备品种","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},
{"dataRenderingMode": "defaultText","dataIndex": "PRODUCT_NAME","width": 150,"align": "left","title": "产品名称","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
{"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "产品编号","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
{"dataRenderingMode": "defaultText","dataIndex": "USE_INNER_CODE","width": 180,"align": "left","title": "单位内编号","key": "0BB7318F-5134-42B6-A835-FC86D68066C3"},
{"dataRenderingMode": "defaultText","dataIndex": "EQU_CODE","width": 180,"align": "left","title": "设备代码","key": "0BB7318F-5134-42B6-A835-FC86D68066C4"},
{"dataRenderingMode": "defaultText","dataIndex": "SUPERVISORY_CODE","width": 180,"align": "left","title": "监管码","key": "0BB7318F-5134-42B6-A835-FC86D68066C5"}
]
}
}
],
"content": {
}
}
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