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
77e92940
Commit
77e92940
authored
Jul 09, 2025
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(综合搜索):数据同步自测bug
1.设备总价值、事务捕获
parent
2c6e060f
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
3 deletions
+15
-3
ESEquipmentInfo.java
...n/amos/boot/module/common/api/entity/ESEquipmentInfo.java
+8
-0
JgChangeRegistrationTransferController.java
...iz/controller/JgChangeRegistrationTransferController.java
+1
-3
EquipmentRefreshHandler.java
...odule/jg/biz/refresh/handler/EquipmentRefreshHandler.java
+1
-0
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+1
-0
JgChangeRegistrationTransferServiceImpl.java
...service/impl/JgChangeRegistrationTransferServiceImpl.java
+1
-0
JgChangeRegistrationUnitServiceImpl.java
...biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
+1
-0
JgReformNoticeServiceImpl.java
...module/jg/biz/service/impl/JgReformNoticeServiceImpl.java
+1
-0
IdxBizJgUseInfoMapper.xml
...t-api/src/main/resources/mapper/IdxBizJgUseInfoMapper.xml
+1
-0
No files found.
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/ESEquipmentInfo.java
View file @
77e92940
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
api
.
entity
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
common
.
api
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine
;
import
com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter
;
import
com.yeejoin.amos.boot.biz.common.annotation.TechnicalParameter
;
import
com.yeejoin.amos.boot.module.common.api.dto.TechParamItem
;
import
com.yeejoin.amos.boot.module.common.api.dto.TechParamItem
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -364,6 +366,12 @@ public class ESEquipmentInfo {
...
@@ -364,6 +366,12 @@ public class ESEquipmentInfo {
private
LocalDate
INSPECT_DATE
;
private
LocalDate
INSPECT_DATE
;
/**
/**
* 设备总价值(万元)
*/
@Field
(
type
=
FieldType
.
Scaled_Float
,
scalingFactor
=
100
)
private
BigDecimal
equPrice
;
/**
* 单位类型-多个逗号分隔开-实时的单位类型
* 单位类型-多个逗号分隔开-实时的单位类型
*/
*/
@Field
(
type
=
FieldType
.
Keyword
)
@Field
(
type
=
FieldType
.
Keyword
)
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationTransferController.java
View file @
77e92940
...
@@ -32,12 +32,10 @@ import java.util.Map;
...
@@ -32,12 +32,10 @@ import java.util.Map;
@Api
(
tags
=
"移装变更登记登记Api"
)
@Api
(
tags
=
"移装变更登记登记Api"
)
@RequestMapping
(
value
=
"/jg-change-registration-transfer"
)
@RequestMapping
(
value
=
"/jg-change-registration-transfer"
)
public
class
JgChangeRegistrationTransferController
extends
BaseController
{
public
class
JgChangeRegistrationTransferController
extends
BaseController
{
private
static
final
String
TABLE_PAGE_ID
=
"changeRegistrationTransfer"
;
@Autowired
@Autowired
IJgChangeRegistrationTransferService
jgChangeRegistrationTransferService
;
IJgChangeRegistrationTransferService
jgChangeRegistrationTransferService
;
@Autowired
IJgInstallationNoticeService
iJgInstallationNoticeService
;
/**
/**
* 新增移装变更登记登记
* 新增移装变更登记登记
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/refresh/handler/EquipmentRefreshHandler.java
View file @
77e92940
...
@@ -52,6 +52,7 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler {
...
@@ -52,6 +52,7 @@ public class EquipmentRefreshHandler implements IDataRefreshHandler {
switch
(
DataRefreshEvent
.
Operation
.
valueOf
(
message
.
getOperation
()))
{
switch
(
DataRefreshEvent
.
Operation
.
valueOf
(
message
.
getOperation
()))
{
case
DELETE:
case
DELETE:
esEquipmentDao
.
deleteById
(
message
.
getDataId
());
esEquipmentDao
.
deleteById
(
message
.
getDataId
());
break
;
case
INSERT:
case
INSERT:
case
UPDATE:
case
UPDATE:
String
record
=
message
.
getDataId
();
String
record
=
message
.
getDataId
();
...
...
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 @
77e92940
...
@@ -3960,6 +3960,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
...
@@ -3960,6 +3960,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
@Override
@Override
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
,
timeoutMills
=
6000000
)
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
,
timeoutMills
=
6000000
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
Object
savePressureVesselData
(
Map
<
String
,
Object
>
paramMap
)
{
public
Object
savePressureVesselData
(
Map
<
String
,
Object
>
paramMap
)
{
ReginParams
reginParams
=
JSONObject
.
parseObject
(
redisUtils
.
get
(
RedisKey
.
buildReginKey
(
RequestContext
.
getExeUserId
(),
RequestContext
.
getToken
())).
toString
(),
ReginParams
.
class
);
ReginParams
reginParams
=
JSONObject
.
parseObject
(
redisUtils
.
get
(
RedisKey
.
buildReginKey
(
RequestContext
.
getExeUserId
(),
RequestContext
.
getToken
())).
toString
(),
ReginParams
.
class
);
CompanyBo
company
=
reginParams
.
getCompany
();
CompanyBo
company
=
reginParams
.
getCompany
();
...
...
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 @
77e92940
...
@@ -462,6 +462,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
...
@@ -462,6 +462,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
* @param comment
* @param comment
*/
*/
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
)
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
flowExecute
(
Long
id
,
String
instanceId
,
String
operate
,
String
comment
,
String
nextTaskId
)
{
public
void
flowExecute
(
Long
id
,
String
instanceId
,
String
operate
,
String
comment
,
String
nextTaskId
)
{
String
lockKey
=
CommonServiceImpl
.
buildJgExecuteLockKey
(
instanceId
);
String
lockKey
=
CommonServiceImpl
.
buildJgExecuteLockKey
(
instanceId
);
RLock
lock
=
redissonClient
.
getLock
(
lockKey
);
RLock
lock
=
redissonClient
.
getLock
(
lockKey
);
...
...
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/JgChangeRegistrationUnitServiceImpl.java
View file @
77e92940
...
@@ -1123,6 +1123,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
...
@@ -1123,6 +1123,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
* @date 2024/7/18 11:00
* @date 2024/7/18 11:00
**/
**/
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
,
timeoutMills
=
6000000
)
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
,
timeoutMills
=
6000000
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
accept
(
JgChangeRegistrationUnitDto
dto
,
String
op
,
ReginParams
reginParams
)
{
public
void
accept
(
JgChangeRegistrationUnitDto
dto
,
String
op
,
ReginParams
reginParams
)
{
String
lockKey
=
CommonServiceImpl
.
buildJgExecuteLockKey
(
dto
.
getInstanceId
());
String
lockKey
=
CommonServiceImpl
.
buildJgExecuteLockKey
(
dto
.
getInstanceId
());
RLock
lock
=
redissonClient
.
getLock
(
lockKey
);
RLock
lock
=
redissonClient
.
getLock
(
lockKey
);
...
...
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/JgReformNoticeServiceImpl.java
View file @
77e92940
...
@@ -904,6 +904,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
...
@@ -904,6 +904,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
* @param op 通过或驳回
* @param op 通过或驳回
*/
*/
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
)
@GlobalTransactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
accept
(
Map
<
String
,
Object
>
map
,
String
op
)
{
public
void
accept
(
Map
<
String
,
Object
>
map
,
String
op
)
{
LinkedHashMap
model1
=
(
LinkedHashMap
)
map
.
get
(
"model"
);
LinkedHashMap
model1
=
(
LinkedHashMap
)
map
.
get
(
"model"
);
String
opinion
=
(
String
)
map
.
get
(
"opinion"
);
String
opinion
=
(
String
)
map
.
get
(
"opinion"
);
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgUseInfoMapper.xml
View file @
77e92940
...
@@ -96,6 +96,7 @@
...
@@ -96,6 +96,7 @@
ibjri."CYLINDER_CATEGORY",
ibjri."CYLINDER_CATEGORY",
ibjri."WHETHER_SPHERICAL_TANK",
ibjri."WHETHER_SPHERICAL_TANK",
ibjri."CAR_NUMBER",
ibjri."CAR_NUMBER",
ibjri."EQU_PRICE",
concat_ws ( '/', ibjui."PROVINCE_NAME", ibjui."CITY_NAME", ibjui."COUNTY_NAME", ibjui."STREET_NAME" ) AS "USE_PLACE",
concat_ws ( '/', ibjui."PROVINCE_NAME", ibjui."CITY_NAME", ibjui."COUNTY_NAME", ibjui."STREET_NAME" ) AS "USE_PLACE",
concat_ws ( '#', ibjui."PROVINCE", ibjui."CITY", ibjui."COUNTY", ibjui."FACTORY_USE_SITE_STREET" ) AS "USE_PLACE_CODE",
concat_ws ( '#', ibjui."PROVINCE", ibjui."CITY", ibjui."COUNTY", ibjui."FACTORY_USE_SITE_STREET" ) AS "USE_PLACE_CODE",
ibjui."ADDRESS",
ibjui."ADDRESS",
...
...
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