xzzn/SIPAIIS_WMS_JSSW
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

维修工单

Browse Source
This commit is contained in:
Timer
2026-03-08 19:00:58 +08:00
parent 7fd0768e8a
commit 0b265d817b
7 changed files with 164 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/sipai/controller/pipeline/PipelineDataController.java
View File

@ -54,7 +54,35 @@ public class PipelineDataController {
wherestr += " and pipe_material like '%" + request.getParameter("search_pipe_material") + "%'";
}
if (request.getParameter("search_associated_plant") != null && !request.getParameter("search_associated_plant").isEmpty()) {
wherestr += " and associated_plant like '%" + request.getParameter("search_associated_plant") + "%'";
wherestr += " and associated_plant = '" + request.getParameter("search_associated_plant") + "'";
}
// 管道管径查询（支持范围或精确匹配）
if (request.getParameter("search_diameter_min") != null && !request.getParameter("search_diameter_min").isEmpty()) {
wherestr += " and diameter_mm >= " + request.getParameter("search_diameter_min");
}
if (request.getParameter("search_diameter_max") != null && !request.getParameter("search_diameter_max").isEmpty()) {
wherestr += " and diameter_mm <= " + request.getParameter("search_diameter_max");
}
// 管道管长查询（支持范围）
if (request.getParameter("search_length_min") != null && !request.getParameter("search_length_min").isEmpty()) {
wherestr += " and length_m >= " + request.getParameter("search_length_min");
}
if (request.getParameter("search_length_max") != null && !request.getParameter("search_length_max").isEmpty()) {
wherestr += " and length_m <= " + request.getParameter("search_length_max");
}
// 起点埋深查询（支持范围）
if (request.getParameter("search_start_depth_min") != null && !request.getParameter("search_start_depth_min").isEmpty()) {
wherestr += " and start_burial_depth_m >= " + request.getParameter("search_start_depth_min");
}
if (request.getParameter("search_start_depth_max") != null && !request.getParameter("search_start_depth_max").isEmpty()) {
wherestr += " and start_burial_depth_m <= " + request.getParameter("search_start_depth_max");
}
// 终点埋深查询（支持范围）
if (request.getParameter("search_end_depth_min") != null && !request.getParameter("search_end_depth_min").isEmpty()) {
wherestr += " and end_burial_depth_m >= " + request.getParameter("search_end_depth_min");
}
if (request.getParameter("search_end_depth_max") != null && !request.getParameter("search_end_depth_max").isEmpty()) {
wherestr += " and end_burial_depth_m <= " + request.getParameter("search_end_depth_max");
}
PageHelper.startPage(page, rows);
List<PipelineData> list = this.pipelineDataService.selectListByWhere(wherestr + orderstr);

39
src/main/java/com/sipai/controller/work/MPointController.java
View File

@ -70,6 +70,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
import org.springframework.data.elasticsearch.core.query.SearchQuery;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@ -573,7 +574,7 @@ public class MPointController {
nativeSearchQueryBuilder.withSort(SortBuilders.fieldSort(sort).order(sortOrder));
nativeSearchQueryBuilder.withQuery(boolQueryBuilder);
nativeSearchQueryBuilder.withPageable(PageRequest.of(page - 1, rows));
Page<MPoint> list = this.mPointService.selectListByES(nativeSearchQueryBuilder);
Page<MPoint> list = this.selectListByES(nativeSearchQueryBuilder);
// 查询工艺段
for (MPoint mp : list) {
@ -591,6 +592,42 @@ public class MPointController {
return new ModelAndView("result");
}
/**
* 通过ES搜索查询，返回Page类型
*
* @param nativeSearchQueryBuilder
* @return
*/
public Page<MPoint> selectListByES(NativeSearchQueryBuilder nativeSearchQueryBuilder) {
SearchQuery searchQuery = nativeSearchQueryBuilder.build();
Page<MPoint> mPage = mPointRepo.search(searchQuery);
for (MPoint mPoint : mPage) {
if (mPoint.getNumtail() != null) {
BigDecimal value = CommUtil.formatMPointValue(mPoint.getParmvalue(), mPoint.getNumtail(), mPoint.getRate());
if (value != null) {
try {
mPoint.setParmvalue(value);
} catch (Exception e) {
// TODO: handle exception
e.printStackTrace();
}
}
}
if (mPoint.getBizid() != null && !mPoint.getBizid().isEmpty()) {
Unit unit = this.unitService.getUnitById(mPoint.getBizid());
if (unit != null) {
String unitName = unit.getSname();
if (unitName == null || unitName.isEmpty()) {
unitName = unit.getName();
}
mPoint.setBizname(unitName);
}
}
}
return mPage;
}
public void syncAllDbDataToEs() {
logger.info("ES与数据库数据总数不一致，开始全量同步数据库数据到ES...");
MPoint query = new MPoint();

36
src/main/java/com/sipai/service/scada/MPointService.java
View File

@ -659,42 +659,6 @@ public class MPointService {
}
/**
* 通过ES搜索查询，返回Page类型
*
* @param nativeSearchQueryBuilder
* @return
*/
public Page<MPoint> selectListByES(NativeSearchQueryBuilder nativeSearchQueryBuilder) {
SearchQuery searchQuery = nativeSearchQueryBuilder.build();
Page<MPoint> mPage = mPointRepo.search(searchQuery);
for (MPoint mPoint : mPage) {
if (mPoint.getNumtail() != null) {
BigDecimal value = CommUtil.formatMPointValue(mPoint.getParmvalue(), mPoint.getNumtail(), mPoint.getRate());
if (value != null) {
try {
mPoint.setParmvalue(value);
} catch (Exception e) {
// TODO: handle exception
e.printStackTrace();
}
}
}
if (mPoint.getBizid() != null && !mPoint.getBizid().isEmpty()) {
Unit unit = this.unitService.getUnitById(mPoint.getBizid());
if (unit != null) {
String unitName = unit.getSname();
if (unitName == null || unitName.isEmpty()) {
unitName = unit.getName();
}
mPoint.setBizname(unitName);
}
}
}
return mPage;
}
/**
* 获取数据库中测量点总数
*/