Skip to content

A
amos-boot-biz
Commit 8728ea12 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_register_to_0715' of…

Merge branch 'develop_tzs_register_to_0715' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register_to_0715
parents a687bfb5 1d4b03b9
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 55 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java
View file @ 8728ea12
......@@ -169,7 +169,4 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
@ApiModelProperty(value = "公司类型")
private String companyType;
@ApiModelProperty(value = "使用登记证")
private String registrationCertificate;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java
View file @ 8728ea12
......@@ -79,4 +79,7 @@ public class JgUseRegistrationManageDto extends BaseModel {
@ApiModelProperty(value = "使用标志参数")
private String useFlagCertificateParam;
@ApiModelProperty(value = "数据类型：监管/行政审批局，企业")
private String dataType;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java
View file @ 8728ea12
......@@ -266,9 +266,4 @@ public class JgChangeRegistrationUnit extends BaseEntity {
*/
@TableField("receive_company_org_code")
private String receiveCompanyOrgCode;
/**
* 使用登记证
*/
private String registrationCertificate;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationManageMapper.java
View file @ 8728ea12
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
......@@ -18,4 +22,7 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(@Param("dto") JgUseRegistrationManageDto dto);
Page<JgUseRegistrationManageDto> queryForPage(@Param("page") Page<JgUseRegistrationManageDto> page,
@Param("dto") JgUseRegistrationManageDto dto,
@Param("sort") SortVo sortMap);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationManageMapper.xml
View file @ 8728ea12
......@@ -2,33 +2,36 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper">
<select id="queryByUseUnitCreditCode"
resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
<sql id="page_list">
select
tjurm.sequence_nbr AS sequence_nbr,
tjurm.use_unit_name AS use_unit_name,
tjurm.apply_no AS apply_no,
tjurm.certificate_status AS certificate_status,
tjurm.receive_org_name AS receive_org_name,
tjurm.audit_pass_date AS audit_pass_date,
tjurm.reg_type AS reg_type,
DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d') AS reg_date,
tjurm.equ_list AS equ_list,
tjurm.equ_define AS equ_define,
tjurm.remark AS remark,
tjurm.rec_user_id AS rec_user_id,
DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d') AS rec_date,
tjurm.create_user_id AS create_user_id,
DATE_FORMAT(tjurm.create_date,'%Y-%m-%d') AS create_date,
tjurm.rec_user_name AS rec_user_name,
tjurm.use_registration_code AS use_registration_code,
tjurm.use_unit_credit_code AS use_unit_credit_code,
tjurm.receive_company_code AS receive_company_code,
tjurm.use_registration_certificate_param AS use_registration_certificate_param,
tjurm.certificate_no AS certificate_no,
tjurm.use_flag_certificate_param AS use_flag_certificate_param,
tjurm.equ_category AS equ_category
tjurm.sequence_nbr AS sequence_nbr,
tjurm.use_unit_name AS use_unit_name,
tjurm.apply_no AS apply_no,
tjurm.certificate_status AS certificate_status,
tjurm.receive_org_name AS receive_org_name,
tjurm.audit_pass_date AS audit_pass_date,
tjurm.reg_type AS reg_type,
DATE_FORMAT(tjurm.reg_date,'%Y-%m-%d') AS reg_date,
tjurm.equ_list AS equ_list,
tjurm.equ_define AS equ_define,
tjurm.remark AS remark,
tjurm.rec_user_id AS rec_user_id,
DATE_FORMAT(tjurm.rec_date,'%Y-%m-%d') AS rec_date,
tjurm.create_user_id AS create_user_id,
DATE_FORMAT(tjurm.create_date,'%Y-%m-%d') AS create_date,
tjurm.rec_user_name AS rec_user_name,
tjurm.use_registration_code AS use_registration_code,
tjurm.use_unit_credit_code AS use_unit_credit_code,
tjurm.receive_company_code AS receive_company_code,
tjurm.use_registration_certificate_param AS use_registration_certificate_param,
tjurm.certificate_no AS certificate_no,
tjurm.use_flag_certificate_param AS use_flag_certificate_param,
tjurm.equ_category AS equ_category
</sql>
<select id="queryByUseUnitCreditCode" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
<include refid="page_list"/>
from tzs_jg_use_registration_manage tjurm
<where>
tjurm.is_delete = 0
......@@ -38,4 +41,24 @@
ORDER BY tjurm.rec_date DESC
</where>
</select>
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
<include refid="page_list"/>
from tzs_jg_use_registration_manage tjurm
<where>
tjurm.is_delete = 0
-- 企业根据企业统一信用代码匹配
<if test="dto.dataType == 'company' ">
AND tjurm.use_unit_credit_code = #{dto.useUnitCreditCode}
</if>
-- 监管单位根据接受机构匹配
<if test="dto.dataType == 'supervision' ">
AND tjurm.receive_company_code = #{dto.receiveCompanyCode}
</if>
ORDER BY
<if test="sort != null">
tjurm.${sort.field} ${sort.sortType},
</if>
tjurm.rec_date DESC
</where>
</select>
</mapper>
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 @ 8728ea12
......@@ -2,13 +2,20 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
import cn.hutool.poi.excel.sax.SheetRidReader;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......@@ -109,12 +116,23 @@ public class JgUseRegistrationManageController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<JgUseRegistrationManageDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) {
public ResponseModel<Page<JgUseRegistrationManageDto>> queryForPage(JgUseRegistrationManageDto dto,
@RequestParam(value = "sort", required = false) String sort,
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) {
Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page));
ReginParams info = getSelectedOrgInfo();
if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
dto.setUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(info.getCompany().getCompanyType()) ?
info.getCompany().getCompanyCode().split("_")[1] : info.getCompany().getCompanyCode());
} else {
dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
dto.setReceiveCompanyCode(info.getCompany().getCompanyCode());
}
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page,dto,sort));
}
/**
......@@ -144,4 +162,19 @@ public class JgUseRegistrationManageController extends BaseController {
public ResponseModel<List<JSONObject>> queryEquByCertificateSeq(Long sequenceNbr) {
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeq(sequenceNbr));
}
/**
* 根据证的sequenceNbr 批量查询证下面的所有设备
* @param sequenceNbrs 证的sequenceNbr集合
* @return 证下的所有设备
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryEquByCertificateSeqList")
@ApiOperation(httpMethod = "GET",value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
public ResponseModel<List<JSONObject>> queryEquByCertificateSeqList(@RequestParam String sequenceNbrs) {
List<Long> collect = Arrays.stream(sequenceNbrs.split(","))
.map(Long::parseLong)
.collect(Collectors.toList());
return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryEquByCertificateSeqList(collect));
}
}
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 @ 8728ea12
......@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
......@@ -27,6 +28,7 @@ import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.TermsQueryBuilder;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -38,6 +40,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.*;
import java.util.stream.Collectors;
/**
* 服务实现类
......@@ -272,8 +275,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
/**
* 分页查询
*/
public Page<JgUseRegistrationManageDto> queryForJgUseRegistrationManagePage(Page<JgUseRegistrationManageDto> page) {
return this.queryForPage(page, null, false);
public Page<JgUseRegistrationManageDto> queryForJgUseRegistrationManagePage(Page<JgUseRegistrationManageDto> page,
JgUseRegistrationManageDto dto,
String sort) {
SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
return jgUseRegistrationManageMapper.queryForPage(page,dto,sortMap);
}
/**
......@@ -282,31 +288,33 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
public List<JgUseRegistrationManageDto> queryByUseUnitCreditCode(JgUseRegistrationManageDto dto) {
return jgUseRegistrationManageMapper.queryByUseUnitCreditCode(dto);
}
public List<JSONObject> queryEquByCertificateSeq(Long sequenceNbr) {
return queryEquByCertificateSeqList(Collections.singletonList(sequenceNbr));
}
/**
* 根据证的sequenceNbr 查询证下面的所有设备
* 根据证的sequenceNbr集合，批量查询证下面的所有设备
*/
public List<JSONObject> queryEquByCertificateSeq(Long sequenceNbr) {
JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectOne(new LambdaQueryWrapper<JgUseRegistrationManage>()
.eq(JgUseRegistrationManage::getSequenceNbr, sequenceNbr)
public List<JSONObject> queryEquByCertificateSeqList(List<Long> sequenceNbrList) {
List<JgUseRegistrationManage> jgUseRegistrationManageList = this.baseMapper.selectList(new LambdaQueryWrapper<JgUseRegistrationManage>()
.in(JgUseRegistrationManage::getSequenceNbr, sequenceNbrList)
.eq(JgUseRegistrationManage::getIsDelete, 0));
if (ValidationUtil.isEmpty(jgUseRegistrationManage) || ValidationUtil.isEmpty(jgUseRegistrationManage.getApplyNo())){
if (ValidationUtil.isEmpty(jgUseRegistrationManageList)){
return new ArrayList<>();
}
JgUseRegistration useRegistration = jgUseRegistrationMapper.selectOne(new LambdaQueryWrapper<JgUseRegistration>()
.eq(JgUseRegistration::getApplyNo, jgUseRegistrationManage.getApplyNo()));
List<JSONObject> result = new ArrayList<>();
Set<String> useOrgCodes = jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.toSet());
// es中通过查询【使用登记证编号】所有设备
SearchRequest request = new SearchRequest();
request.indices("idx_biz_view_jg_all");
SearchRequest request = new SearchRequest("idx_biz_view_jg_all");
SearchSourceBuilder builder = new SearchSourceBuilder();
builder.trackTotalHits(true);
BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
builder.query(boolMust);
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
pBuilder.must(QueryBuilders.termQuery("USE_ORG_CODE", useRegistration.getUseRegistrationCode()));
boolMust.must(pBuilder);
BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
TermsQueryBuilder termsQuery = QueryBuilders.termsQuery("USE_ORG_CODE", useOrgCodes);
boolQuery.must(termsQuery);
builder.query(boolQuery);
request.source(builder);
List<JSONObject> result = new ArrayList<>();
try {
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
for (SearchHit hit : response.getHits().getHits()) {
......
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