Commit 77e92940 authored by suhuiguang's avatar suhuiguang

fix(综合搜索):数据同步自测bug

1.设备总价值、事务捕获
parent 2c6e060f
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)
......
...@@ -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;
/** /**
* 新增移装变更登记登记 * 新增移装变更登记登记
......
...@@ -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();
......
...@@ -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();
......
...@@ -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);
......
...@@ -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);
......
...@@ -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");
......
...@@ -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",
......
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