Browse Source

/*1.

华软对接:华软点位编码中含有下划线,跟我们得分隔符相互冲突,导致从数据库里获取点位信息错误,调整分隔符为竖线。2.
基础数据模块写表得时候字段映射错误。*/
master
htjcAdmin 9 months ago
parent
commit
8b88917024
7 changed files with 21 additions and 18 deletions
  1. +6
    -5
      inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java
  2. +1
    -1
      inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
  3. +1
    -1
      inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml
  4. +2
    -2
      inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java
  5. +9
    -7
      inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java
  6. +1
    -1
      inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml
  7. +1
    -1
      inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml

+ 6
- 5
inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java View File

@ -89,7 +89,7 @@ public class SftpClient {
= fileFullPath.startsWith(sftpLoginConfig.getBasePath()) ? fileFullPath : sftpLoginConfig.getBasePath() + fileFullPath;
final String fileFullNameTmpEx = StringUtils.isNotEmpty(sftpLoginConfig.getPrefix()) ? sftpLoginConfig.getPrefix() + fileFullPathTmp : fileFullPathTmp;
log.info("[FTP] fileFullNameTmpEx: {}", fileFullPathTmp);
log.info(Color.CYAN + "[FTP] fileFullPath: {}, fileFullNameTmpEx: {}" + Color.END, fileFullPath, fileFullPathTmp);
connect((ftps) -> {
InputStream inputStream = ftps.retrieveFileStream(fileFullNameTmpEx);
if (inputStream == null) {
@ -175,19 +175,20 @@ public class SftpClient {
// ftps.connect("192.168.1.198", 21);
// boolean loginRes = ftps.login("hangtian", "123qweasd");
// ftps.connect("124.221.104.159", 10990);
ftps.connect("k", 10990);
ftps.connect("124.221.104.159", 10990);
// ftps.connect("192.168.1.116", 1990);
boolean loginRes = ftps.login("ftpuser", "atia2018");
System.out.println(loginRes);
ftps.setFileType(2);
// ftps.enterLocalPassiveMode();
// ftps.enterLocalPassiveMode();
ftps.enterLocalPassiveMode();
ftps.setControlEncoding("UTF-8");
ftps.setFileTransferMode(10);
ftps.execPROT("P");
ftps.storeFile("11.jpg", new FileInputStream("E:/1.jpg"));
ftps.storeFile("1122234567.jpg", new FileInputStream("E:/1.jpg"));
String fileFullPathTmp = "1/2025/02/26/1339/CCD/1339_20250226095445_2023833_02160558340721910141.jpg";
String fileFullPathTmp = "1122.jpg";
//String fileFullPathTmp = "/home/hangtian/11.jpg";
InputStream inputStream = ftps.retrieveFileStream(fileFullPathTmp);
if (inputStream == null) {


+ 1
- 1
inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java View File

@ -592,7 +592,7 @@ public class PatrolTaskController extends BaseController {
}
} else {
List<String> infoList = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId()));
logger.info("-----------------patrolTask.getTaskId(): " + patrolTask.getTaskId());
logger.info("[TASK] taskId: {}", patrolTask.getTaskId());
if (!infoList.isEmpty()) {
patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, infoList));
} else {


+ 1
- 1
inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml View File

@ -104,7 +104,7 @@
</where>
</select>
<select id="selectPatrolTaskInfoListByMajorId" parameterType="String" resultType="String">
select substring_index(patrol_point_code, '_', -1)
select substring_index(patrol_point_code, '|', -1)
from basedata_patrolpoint
where patrol_point_id
in (select DISTINCT(device_id) from patrol_task_info where task_major_id = #{taskId})


+ 2
- 2
inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/component/BasedataMontPatrolPointHandleComponent.java View File

@ -159,7 +159,7 @@ public class BasedataMontPatrolPointHandleComponent {
String originalDeviceId = modelItem.getComponent_id();
String originalAlgSubtypeIds = modelItem.getRecognition_type_list();
BasedataPatrolPoint basedataPatrolpoint = new BasedataPatrolPoint();
basedataPatrolpoint.setPatrolPointCode(sendCode + "_" + device_id);
basedataPatrolpoint.setPatrolPointCode(sendCode + "|" + device_id);
List<BasedataPatrolPoint> patrolpointList = this.basedataPatrolPointService.selectBasedataPatrolPointList(basedataPatrolpoint);
if (null != patrolpointList && !patrolpointList.isEmpty()) {
BasedataPatrolPoint patrolPoint = patrolpointList.get(0);
@ -171,7 +171,7 @@ public class BasedataMontPatrolPointHandleComponent {
List<BasedataDevice> devices = this.basedataDeviceMapper.selectBasedataDeviceList(basedataDevice);
if (CollectionUtils.isNotEmpty(devices) && !devices.isEmpty()) {
BasedataDevice device = devices.get(0);
patrolPointInsert.setPatrolPointCode(sendCode + "_" + device_id);
patrolPointInsert.setPatrolPointCode(sendCode + "|" + device_id);
patrolPointInsert.setPatrolPointName(device_name);
patrolPointInsert.setOriginalMainDeviceId(main_device_id);
patrolPointInsert.setDeviceId(device.getDeviceId());


+ 9
- 7
inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java View File

@ -2,6 +2,7 @@ package com.inspect.metadata.montdatamqhandle.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.inspect.base.core.constant.Color;
import com.inspect.metadata.alg.mapper.BasedataAlgSubtypeMapper;
import com.inspect.metadata.bdconfig.domain.BasedataBdConfigMainSystem;
import com.inspect.metadata.bdconfig.mapper.BasedataBdConfigAlgConvertMapper;
@ -26,11 +27,15 @@ import java.util.Iterator;
import java.util.List;
import javax.annotation.Resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component("basedataMont-modelup-1024")
public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataHandleService {
private final Logger log = LoggerFactory.getLogger(BasedataMontPatrolPointConsumerHandle.class);
@Resource
private IBasedataPatrolPointService basedataPatrolPointService;
@Resource
@ -60,7 +65,7 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH
String Type = jsonObject.getString("Type");
String convertFlag = "0";
String SendCode = jsonObject.getString("SendCode");
BasedataBdConfigMainSystem mainSystem = this.basedataBdconfigMainsystemMapper.selectBasedataBdConfigMainSystemByMainSystemCode(SendCode);
BasedataBdConfigMainSystem mainSystem = basedataBdconfigMainsystemMapper.selectBasedataBdConfigMainSystemByMainSystemCode(SendCode);
if (null != mainSystem) {
String flag = mainSystem.getConvertFlag();
if (null != flag && flag.equals("1")) {
@ -72,22 +77,19 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH
List<ModelFileItem> list = jsonObjectItems.toJavaList(ModelFileItem.class);
if (null != list && !list.isEmpty()) {
String modelString;
for (Iterator<ModelFileItem> iterator = list.iterator(); iterator.hasNext(); this.basedataMontPatrolPointHandleComponent.handPointModelData(SendCode, modelString)) {
for (Iterator<ModelFileItem> iterator = list.iterator(); iterator.hasNext(); basedataMontPatrolPointHandleComponent.handPointModelData(SendCode, modelString)) {
ModelFileItem item = iterator.next();
String deviceFilePath = item.getDevice_file_path();
String source = deviceFilePath;
System.out.println("目标文件待下载路径:" + deviceFilePath);
log.info(Color.BLUE + "[METADATA] TCPSERVER文件路径: {}" + Color.END, deviceFilePath);
ByteBuf byteBuf = Unpooled.buffer();
try {
this.sftpClient.downLoad(source, (inputStream) -> {
sftpClient.downLoad(source, (inputStream) -> {
byte[] bytes = new byte[1024];
int index;
while ((index = inputStream.read(bytes)) > -1) {
byteBuf.writeBytes(Arrays.copyOfRange(bytes, 0, index));
}
});
} catch (Exception e) {
e.printStackTrace();


+ 1
- 1
inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskResultMapper.xml View File

@ -117,7 +117,7 @@
<if test="recognitionType != null">recognition_type,</if>
<if test="recognitionTypeName != null">recognition_type_name,</if>
<if test="fileType != null">file_type,</if>
<if test="file_path != null">file_path,</if>
<if test="filePath != null">file_path,</if>
<if test="rectangle != null">rectangle,</if>
<if test="taskPatrolledId != null">task_patrolled_id,</if>
<if test="valid != null">valid,</if>


+ 1
- 1
inspect-metadata/src/main/resources/mapper/montdata/BasedataMontTaskStaDataMapper.xml View File

@ -95,7 +95,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskPatrolledId != null and taskPatrolledId != ''">#{taskPatrolledId},</if>
<if test="taskName != null">#{task_name},</if>
<if test="taskName != null">#{taskName},</if>
<if test="taskCode != null">#{taskCode},</if>
<if test="taskState != null">#{taskState},</if>
<if test="taskStateName != null">#{taskStateName},</if>


Loading…
Cancel
Save