Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
48aefc47
Commit
48aefc47
authored
Jun 06, 2023
by
曹盼盼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
es接口查询
parent
96d69783
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
222 additions
and
3 deletions
+222
-3
EquipmentCategoryController.java
...odule/tzs/biz/controller/EquipmentCategoryController.java
+13
-0
EquipmentCategoryServiceImpl.java
...le/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
+209
-3
No files found.
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java
View file @
48aefc47
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
biz
.
controller
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
biz
.
controller
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.utils.Menu
;
import
com.yeejoin.amos.boot.biz.common.utils.Menu
;
import
com.yeejoin.amos.boot.biz.common.utils.TreeParser
;
import
com.yeejoin.amos.boot.biz.common.utils.TreeParser
;
import
com.yeejoin.amos.boot.module.tzs.api.dto.ESEquipmentCategoryDto
;
import
com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto
;
import
com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory
;
...
@@ -315,4 +317,15 @@ public class EquipmentCategoryController extends BaseController {
...
@@ -315,4 +317,15 @@ public class EquipmentCategoryController extends BaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/viewJgAll"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"viewJgAll"
,
notes
=
"viewJgAll"
)
public
ResponseModel
<
Page
<
ESEquipmentCategoryDto
>>
viewJgAll
(
@RequestParam
Map
<
String
,
Object
>
map
)
{
JSONObject
jsonObject
=
new
JSONObject
(
map
);
return
ResponseHelper
.
buildResponse
(
equipmentCategoryServiceImpl
.
queryByKeys
(
jsonObject
));
}
}
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @
48aefc47
...
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
...
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yeejoin.amos.boot.biz.common.bo.CompanyBo
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.bo.ReginParams
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisKey
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisKey
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
...
@@ -30,6 +31,21 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
...
@@ -30,6 +31,21 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import
com.yeejoin.amos.feign.privilege.model.CompanyModel
;
import
com.yeejoin.amos.feign.privilege.model.CompanyModel
;
import
io.netty.util.internal.ObjectUtil
;
import
io.netty.util.internal.ObjectUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.http.HttpHost
;
import
org.apache.http.auth.AuthScope
;
import
org.apache.http.auth.UsernamePasswordCredentials
;
import
org.apache.http.client.CredentialsProvider
;
import
org.apache.http.impl.client.BasicCredentialsProvider
;
import
org.apache.http.impl.nio.client.HttpAsyncClientBuilder
;
import
org.elasticsearch.action.search.SearchRequest
;
import
org.elasticsearch.action.search.SearchResponse
;
import
org.elasticsearch.client.RequestOptions
;
import
org.elasticsearch.client.RestClient
;
import
org.elasticsearch.client.RestClientBuilder
;
import
org.elasticsearch.client.RestHighLevelClient
;
import
org.elasticsearch.index.query.BoolQueryBuilder
;
import
org.elasticsearch.index.query.QueryBuilders
;
import
org.elasticsearch.search.builder.SearchSourceBuilder
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
...
@@ -44,6 +60,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
...
@@ -44,6 +60,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
java.io.IOException
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -106,6 +123,18 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
...
@@ -106,6 +123,18 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
//一码通复制功能url参数key
//一码通复制功能url参数key
private
static
final
String
COPY_KEY
=
"stashType"
;
private
static
final
String
COPY_KEY
=
"stashType"
;
@Value
(
"${biz.elasticsearch.address}"
)
private
String
esAddress
;
@Value
(
"${biz.elasticsearch.port}"
)
private
Integer
esPort
;
@Value
(
"${elasticsearch.username}"
)
private
String
esUserName
;
@Value
(
"${elasticsearch.password}"
)
private
String
esPwd
;
/**
/**
* 分页查询
* 分页查询
*/
*/
...
@@ -550,7 +579,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
...
@@ -550,7 +579,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
*/
*/
public
List
<
JSONObject
>
getCompanyType
()
{
public
List
<
JSONObject
>
getCompanyType
()
{
ResponseModel
<
AgencyUserModel
>
me
=
privilegeFeginService
.
getMe
();
ReginParams
reginParams
=
JSON
.
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
);
List
<
CompanyModel
>
companys
=
reginParams
.
getUserModel
().
getCompanys
();
List
<
CompanyModel
>
companys
=
reginParams
.
getUserModel
().
getCompanys
();
...
@@ -779,7 +808,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
...
@@ -779,7 +808,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
* es数据同步
* es数据同步
* @return
* @return
*/
*/
@Scheduled
(
cron
=
"${tzs.equipmentCategory.cron}"
)
public
void
saveEs
()
{
public
void
saveEs
()
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
TABLENAME
,
"idx_biz_view_jg_all"
);
map
.
put
(
TABLENAME
,
"idx_biz_view_jg_all"
);
...
@@ -808,9 +837,185 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
...
@@ -808,9 +837,185 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
//同步到es后修改
//同步到es后修改
SuperviseInfo
superviseInfo
=
new
SuperviseInfo
();
SuperviseInfo
superviseInfo
=
new
SuperviseInfo
();
superviseInfo
.
setIsNotEs
(
1
);
superviseInfo
.
setIsNotEs
(
1
);
superviseInfoMapper
.
update
(
superviseInfo
,
new
QueryWrapper
<
SuperviseInfo
>().
eq
(
"
SEQUENCE_NBR
"
,
map
.
get
(
"SEQUENCE_NBR"
).
toString
()));
superviseInfoMapper
.
update
(
superviseInfo
,
new
QueryWrapper
<
SuperviseInfo
>().
eq
(
"
RECORD
"
,
map
.
get
(
"SEQUENCE_NBR"
).
toString
()));
}
}
return
save
;
return
save
;
}
}
public
Page
<
ESEquipmentCategoryDto
>
queryByKeys
(
JSONObject
map
)
{
//根据当前登录人查询
if
(!
ValidationUtil
.
isEmpty
(
map
.
get
(
EQUSTATE
)))
{
map
.
put
(
EQUSTATE
,
EquimentEnum
.
getCode
.
get
(
map
.
get
(
EQUSTATE
).
toString
()).
toString
());
}
ResponseModel
<
Page
<
Map
<
String
,
Object
>>>
model
=
new
ResponseModel
<>();
JSONObject
object
=
getCompanyType
().
get
(
0
);
String
level
=
object
.
getString
(
"level"
);
String
code
=
object
.
getString
(
"orgCode"
);
String
companyCode
=
object
.
getString
(
"companyCode"
);
if
(!
ValidationUtil
.
isEmpty
(
level
))
{
if
(
LEVEL
.
equals
(
level
))
{
//企业
map
.
put
(
"USE_UNIT_CREDIT_CODE"
,
companyCode
);
}
else
{
//监管单位
map
.
put
(
"ORG_BRANCH_CODE"
,
code
);
}
}
Page
<
ESEquipmentCategoryDto
>
result
=
new
Page
<
ESEquipmentCategoryDto
>(
map
.
getInteger
(
"number"
),
map
.
getInteger
(
"size"
));
final
CredentialsProvider
credentialsProvider
=
new
BasicCredentialsProvider
();
credentialsProvider
.
setCredentials
(
AuthScope
.
ANY
,
new
UsernamePasswordCredentials
(
esUserName
,
esPwd
));
//es账号密码
RestHighLevelClient
esClient
=
new
RestHighLevelClient
(
RestClient
.
builder
(
new
HttpHost
(
esAddress
,
esPort
)
).
setHttpClientConfigCallback
(
new
RestClientBuilder
.
HttpClientConfigCallback
()
{
public
HttpAsyncClientBuilder
customizeHttpClient
(
HttpAsyncClientBuilder
httpClientBuilder
)
{
httpClientBuilder
.
disableAuthCaching
();
return
httpClientBuilder
.
setDefaultCredentialsProvider
(
credentialsProvider
);
}
})
);
SearchRequest
request
=
new
SearchRequest
();
request
.
indices
(
"idx_biz_view_jg_all"
);
//通用匹配规则,条件构建
boolean
flag
=
true
;
SearchSourceBuilder
builder
=
new
SearchSourceBuilder
();
BoolQueryBuilder
boolMust
=
QueryBuilders
.
boolQuery
();
//SEQUENCE_NBR
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"SEQUENCE_NBR"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"SEQUENCE_NBR"
,
map
.
getString
(
"SEQUENCE_NBR"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"ORG_BRANCH_NAME"
)))
{
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
query
.
must
(
QueryBuilders
.
matchQuery
(
"ORG_BRANCH_NAME"
,
"*"
+
map
.
getString
(
"ORG_BRANCH_NAME"
)
+
"*"
));
boolMust
.
must
(
query
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"ORG_BRANCH_CODE"
)))
{
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
query
.
must
(
QueryBuilders
.
matchQuery
(
"ORG_BRANCH_CODE"
,
"*"
+
map
.
getString
(
"ORG_BRANCH_CODE"
)
+
"*"
));
boolMust
.
must
(
query
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"USE_UNIT_NAME"
)))
{
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
query
.
must
(
QueryBuilders
.
matchQuery
(
"USE_UNIT_NAME"
,
"*"
+
map
.
getString
(
"USE_UNIT_NAME"
)
+
"*"
));
boolMust
.
must
(
query
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"USE_UNIT_CREDIT_CODE"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"USE_UNIT_CREDIT_CODE"
,
map
.
getString
(
"USE_UNIT_CREDIT_CODE"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"EQU_LIST_CODE"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"EQU_LIST_CODE"
,
map
.
getString
(
"EQU_LIST_CODE"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"EQU_LIST"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"EQU_LIST"
,
map
.
getString
(
"EQU_LIST"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"EQU_CATEGORY"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"EQU_CATEGORY"
,
map
.
getString
(
"EQU_CATEGORY"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"USE_ORG_CODE"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"USE_ORG_CODE"
,
map
.
getString
(
"USE_ORG_CODE"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"CODE96333"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"CODE96333"
,
map
.
getString
(
"CODE96333"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"EQU_CODE"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"EQU_CODE"
,
map
.
getString
(
"EQU_CODE"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"SUPERVISORY_CODE"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"SUPERVISORY_CODE"
,
map
.
getString
(
"SUPERVISORY_CODE"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"USE_PLACE"
)))
{
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
query
.
must
(
QueryBuilders
.
matchQuery
(
"USE_PLACE"
,
"*"
+
map
.
getString
(
"USE_PLACE"
)
+
"*"
));
boolMust
.
must
(
query
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"ADDRESS"
)))
{
BoolQueryBuilder
query
=
QueryBuilders
.
boolQuery
();
query
.
must
(
QueryBuilders
.
matchQuery
(
"ADDRESS"
,
"*"
+
map
.
getString
(
"ADDRESS"
)
+
"*"
));
boolMust
.
must
(
query
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"EQU_STATE"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"EQU_STATE"
,
map
.
getString
(
"EQU_STATE"
)));
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"STATUS"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
meBuilder
.
must
(
QueryBuilders
.
matchQuery
(
"STATUS"
,
map
.
getString
(
"STATUS"
)));
boolMust
.
must
(
meBuilder
);
}
builder
.
query
(
boolMust
);
builder
.
from
((
map
.
getInteger
(
"number"
)
-
1
)
*
map
.
getInteger
(
"size"
));
builder
.
size
(
map
.
getInteger
(
"size"
));
request
.
source
(
builder
);
List
<
ESEquipmentCategoryDto
>
list
=
new
LinkedList
<>();
long
totle
=
0
;
try
{
SearchResponse
response
=
esClient
.
search
(
request
,
RequestOptions
.
DEFAULT
);
for
(
org
.
elasticsearch
.
search
.
SearchHit
hit
:
response
.
getHits
())
{
System
.
out
.
println
(
hit
);
JSONObject
jsonObject
=
(
JSONObject
)
JSONObject
.
toJSON
(
hit
);
ESEquipmentCategoryDto
dto2
=
JSONObject
.
toJavaObject
(
jsonObject
.
getJSONObject
(
"sourceAsMap"
),
ESEquipmentCategoryDto
.
class
);
list
.
add
(
dto2
);
}
totle
=
response
.
getInternalResponse
().
hits
().
getTotalHits
().
value
;
result
.
setRecords
(
list
);
result
.
setTotal
(
totle
);
}
catch
(
IOException
e
)
{
throw
new
RuntimeException
(
e
);
}
return
result
;
}
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment