From 3403a2462434da327d89311b4b9a75ab7a9b5c0f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 十一月 2024 18:38:22 +0800
Subject: [PATCH] OSD宇视bug，工单删除、工单导出时间bug等等
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java | 2
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 8 +
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 18 +++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 10 ++
ycl-server/src/main/resources/mapper/zgyw/WorkOrderDistributeRecordMapper.xml | 4 +
ycl-common/src/main/java/constant/PointHeaderConstant.java | 3
ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java | 6 -
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 2
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 10 ++
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderDistributeRecordMapper.java | 3
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 37 ++++++++-
ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java | 3
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 1
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 38 ++++-----
ycl-server/src/main/java/com/ycl/api/YS/YSApi.java | 2
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 29 ++++--
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 4
18 files changed, 126 insertions(+), 56 deletions(-)
diff --git a/ycl-common/src/main/java/constant/PointHeaderConstant.java b/ycl-common/src/main/java/constant/PointHeaderConstant.java
index 3545f83..38ff7b3 100644
--- a/ycl-common/src/main/java/constant/PointHeaderConstant.java
+++ b/ycl-common/src/main/java/constant/PointHeaderConstant.java
@@ -12,6 +12,7 @@
public final static String Point_Name = "鐐逛綅鍚嶇О(鍙慨鏀�)";
public final static String Serial_Number = "鍥芥爣鐮�(涓嶅彲淇敼)";
public final static String Area = "鍖哄幙(涓嶅彲淇敼)";
+ public final static String Unit = "杩愮淮鍗曚綅(涓嶅彲淇敼)";
public final static String IP = "鐐逛綅IP(鍙慨鏀�)";
public final static String Province_Tag = "鏄惁鐪佸巺鏍囩(鍙慨鏀�)";
public final static String Impotrant_Command_Image = "鏄惁閲嶇偣鎸囨尌鍥惧儚(鍙慨鏀�)";
@@ -19,6 +20,6 @@
// 鍙互灏嗚繖浜涘凡鐭ョ殑閿斁鍏ヤ竴涓泦鍚堜腑锛屾柟渚挎鏌�
public static final Set<String> KNOWN_KEYS = new HashSet<>(Arrays.asList(
- ID,Point_Name, IP, Serial_Number,Area, Province_Tag, Impotrant_Command_Image, Dept_Tag
+ ID,Point_Name, IP, Serial_Number,Area, Unit,Province_Tag, Impotrant_Command_Image, Dept_Tag
));
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
index 09fbe11..e80c904 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -35,7 +35,7 @@
private Date startTime;
@ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
- @TableField("end_time")
+ @TableField(value = "end_time")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endTime;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
index 37d256b..adb6bfc 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -32,7 +32,6 @@
@ApiModelProperty("鐐逛綅鍚嶇О")
private String pointName;
- @NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮鍗曚綅")
private Integer unitId;
@@ -71,6 +70,15 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recoveryTime;
+ @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
+ @TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
if(entity == null) {
entity = new YwPoint();
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index f2cde76..f46261c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
import constant.ApiConstants;
+import enumeration.DeviceType;
import lombok.Data;
import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
@@ -30,6 +31,10 @@
*/
private Integer deviceBrand;
+ /**
+ * 鎽勫儚鏈哄搧鐗�0/1/2 娴峰悍/澶у崕/瀹囪
+ */
+ private String deviceBrandStr;
/**
* 璁惧绫诲瀷
*/
@@ -165,5 +170,10 @@
if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("姝ｇ‘");
else if(ApiConstants.OSD_Error.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("閿欒");
else { result.setOsdPartCorrectText("鏈煡"); }
+
+ if(DeviceType.DH.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.DH.getDesc());
+ else if(DeviceType.HK.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.HK.getDesc());
+ else if(DeviceType.YS.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.YS.getDesc());
+ else { result.setDeviceBrandStr("鏈煡"); }
}
}
diff --git a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
index 6ae2f35..16b1386 100644
--- a/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/YS/YSApi.java
@@ -92,7 +92,7 @@
}
stOSDInfo.read();
//鐪佷唤
- String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8);
+ String name = new String(stOSDInfo.stNameOSD.szOSDText, StandardCharsets.UTF_8).trim();
osdResult.setOSD1(name);
// log.info("name"+name);
int num = 0;
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderDistributeRecordMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderDistributeRecordMapper.java
index 478da48..0d0a814 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderDistributeRecordMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderDistributeRecordMapper.java
@@ -16,4 +16,7 @@
public interface WorkOrderDistributeRecordMapper extends BaseMapper<WorkOrderDistributeRecord> {
void insertBatch(List<WorkOrderDistributeRecord> list);
+
+ void deleteByWorkOrder(String workOrderNo);
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
index 89c1ff0..a17659f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwPointMapper.java
@@ -67,7 +67,7 @@
*
* @param pointList
*/
- int updatePoint(List<YwPoint> pointList);
+ int updatePoint(@Param("pointList") List<YwPoint> pointList,@Param("needUpdateUnit")Boolean needUpdateUnit);
/**
* 缁熻鏌愮偣浣嶅搴旂殑鏈畬鎴愬伐鍗曟暟閲忥紝鐞嗚涓婃渶澶у�间负1涓伐鍗�
@@ -132,4 +132,5 @@
*/
List<YwPointVO> selectToCount(Short examineCategory, Short examineTag);
+ void myUpdateById(YwPoint entity);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index 8da0676..aba88a9 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -1006,7 +1006,7 @@
@Override
public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
- List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, 3);
+ List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
Query query = new Query();
Criteria and = new Criteria();
and.andOperator(andCriteria);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 1ef0de4..32b9f2c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -134,7 +134,7 @@
for (TMonitorVO monitor : monitors) {
if (!CollectionUtils.isEmpty(voList)) {
for (WorkOrderVO workOrderVO : voList) {
- if (monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
+ if (monitor.getWorkOrderNo()!=null && monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
monitor.setUnitContact(workOrderVO.getUnitContact());
monitor.setUnitContactPhone(workOrderVO.getUnitContactPhone());
monitor.setYwPeopleName(workOrderVO.getYwPeopleName());
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 241e65b..86f83a0 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -114,14 +114,20 @@
private RedisCache redisCache;
@Override
- @Transactional(rollbackFor = Exception.class)
public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
+ //閬垮厤鍧�(浜嬪姟鍔犻攣浼氬け鏁堛�佹柟娉曞唴閮ㄨ皟鐢ㄤ簨鍔′細澶辨晥)
+ WorkOrderServiceImpl self = applicationContext.getBean(WorkOrderServiceImpl.class);
+ return self.batchAddWorkOrder(workOrderList);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean batchAddWorkOrder(List<WorkOrder> workOrderList){
int total = workOrderList.size();
// 鏌ヨ鍑虹櫧鍚嶅崟鍒楄〃
List<String> serialNumbers = workOrderWhiteMapper.selectList().stream().map(WorkOrderWhite::getSerialNumber).collect(Collectors.toList());
// 閬嶅巻宸ュ崟鍒楄〃锛屽垽鏂槸鍚﹀湪鐧藉悕鍗曚腑
workOrderList = workOrderList.stream().filter(item -> !serialNumbers.contains(item.getSerialNumber()))
- .collect(Collectors.toList());
+ .collect(Collectors.toList());
workOrderList = workOrderList.stream().filter(item -> {
return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());
}).collect(Collectors.toList());
@@ -317,7 +323,6 @@
log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}, 瀹為檯淇敼宸ュ崟鏁帮細{}", total, waitAddList.size(), updateNum);
return Boolean.TRUE;
}
-
/**
* 娣诲姞
*
@@ -563,6 +568,9 @@
*/
@Override
public Result removeById(String id) {
+ WorkOrder workOrder = baseMapper.selectById(id);
+ String workOrderNo = workOrder.getWorkOrderNo();
+ workOrderDistributeRecordMapper.deleteByWorkOrder(workOrderNo);
if (baseMapper.deleteById(id) > 0) {
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -581,8 +589,8 @@
if(query.getUnitId()==null) {
query.setUnitId(SecurityUtils.getUnitId());
}
- query.setStart(DateUtils.getDayStart(query.getStart()));
- query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ if(query.getStart()!=null) query.setStart(DateUtils.getDayStart(query.getStart()));
+ if(query.getEnd()!=null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
baseMapper.page(page, query);
if (!CollectionUtils.isEmpty(page.getRecords())) {
page.getRecords().stream().forEach(item -> {
@@ -600,6 +608,8 @@
@Override
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ if(query.getStart()!=null) query.setStart(DateUtils.getDayStart(query.getStart()));
+ if(query.getEnd()!=null) query.setEnd(DateUtils.getDayEnd(query.getEnd()));
baseMapper.distributePage(page, query);
return Result.ok().data(page).total(page.getTotal());
}
@@ -1028,22 +1038,10 @@
@Override
public List<WorkOrderVO> export (WorkOrderExportQuery query){
query.setUnitId(SecurityUtils.getUnitId());
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- if (query.getStart() == null) {
- query.setStart(format.format(DateUtils.getDayStart(new Date())));
- } else {
- query.setStart(query.getStart() + " 00:00:00");
- }
- if (query.getEnd() == null) {
- query.setEnd(format.format(DateUtils.getDayEnd(new Date())));
- } else {
- query.setEnd(query.getEnd() + " 23:59:59");
- }
+ if (query.getStart() != null) query.setStart(query.getStart() + " 00:00:00");
+ if (query.getEnd() != null) query.setEnd(query.getEnd() + " 23:59:59");
- List<WorkOrderVO> export = baseMapper.export(query);
-
- System.out.println(export);
- return export;
+ return baseMapper.export(query);
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index c4e154c..dc82f15 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -136,9 +136,14 @@
YwPoint entity = baseMapper.selectById(form.getId());
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
BeanUtils.copyProperties(form, entity);
+ if (form.getUnitId() != null) {
+ entity.setUnitId(Long.valueOf(form.getUnitId()));
+ }else {
+ entity.setUnitId(null);
+ }
Date now = new Date();
entity.setUpdateTime(now);
- baseMapper.updateById(entity);
+ baseMapper.myUpdateById(entity);
return Result.ok("淇敼鎴愬姛");
}
@@ -260,8 +265,9 @@
headers.add(PointHeaderConstant.ID);
headers.add(PointHeaderConstant.Point_Name);
headers.add(PointHeaderConstant.Serial_Number);
- headers.add(PointHeaderConstant.Area);
headers.add(PointHeaderConstant.IP);
+ headers.add(PointHeaderConstant.Area);
+ headers.add(PointHeaderConstant.Unit);
headers.add(PointHeaderConstant.Province_Tag);
headers.add(PointHeaderConstant.Impotrant_Command_Image);
headers.add(PointHeaderConstant.Dept_Tag);
@@ -279,8 +285,9 @@
list.add(export.getId());
list.add(export.getPointName());
list.add(export.getSerialNumber());
- list.add(export.getArea());
list.add(export.getPointIP());
+ list.add(export.getArea());
+ list.add(export.getUnitName());
list.add(export.getProvinceTagString());
list.add(export.getImportantCommandImageTagString());
list.add(export.getDeptTagString());
@@ -386,6 +393,8 @@
if (needUpdateUnit) {
if (Objects.nonNull(unitId)) {
point.setUnitId(Long.valueOf(unitId));
+ } else {
+ point.setUnitId(null);
}
point.setStartTime(startTime);
point.setEndTime(endTime);
@@ -399,7 +408,7 @@
point.setSerialNumber(item.getSerialNumber());
return point;
}).collect(Collectors.toList());
- this.waitAllFinishAndGetResult(pointList);
+ this.waitAllFinishAndGetResult(pointList, needUpdateUnit);
}
@Override
@@ -444,7 +453,7 @@
//鏁版嵁搴撻噷鏌ヤ笉鍒癳xcel閲岄潰鐨勮繖涓偣浣嶅姩鎬佸垪锛屽叏涓烘柊澧�
List<DynamicColumnVO> dynamicData = pointExport.getDynamicData();
for (DynamicColumnVO excelData : dynamicData) {
- if(excelData.getColumnValue()!=null) {
+ if (excelData.getColumnValue() != null) {
Integer dynamicId = dictionary.get(excelData.getLabelValue());
DynamicColumnValue entity = new DynamicColumnValue();
entity.setColumnValue(excelData.getColumnValue());
@@ -457,11 +466,11 @@
}
//mybaits鏂规硶
//鎻掑叆
- if(!CollectionUtils.isEmpty(insertList)) dynamicColumnMapper.saveBatch(insertList);
+ if (!CollectionUtils.isEmpty(insertList)) dynamicColumnMapper.saveBatch(insertList);
//鏇存柊
- if(!CollectionUtils.isEmpty(updateList)) dynamicColumnMapper.updateBatch(updateList);
+ if (!CollectionUtils.isEmpty(updateList)) dynamicColumnMapper.updateBatch(updateList);
//鍒犻櫎
- if(!CollectionUtils.isEmpty(deleteList)) dynamicColumnMapper.deleteBatch(deleteList);
+ if (!CollectionUtils.isEmpty(deleteList)) dynamicColumnMapper.deleteBatch(deleteList);
}
/**
@@ -476,9 +485,9 @@
return baseMapper.selectOne(new LambdaQueryWrapper<>(YwPoint.class).eq(YwPoint::getSerialNumber, serialNumber).eq(YwPoint::getDeleted, "0"));
}
- public void waitAllFinishAndGetResult(List<YwPoint> dataList) {
+ public void waitAllFinishAndGetResult(List<YwPoint> dataList, Boolean needUpdateUnit) {
Date startTime = new Date();
- this.baseMapper.updatePoint(dataList);
+ this.baseMapper.updatePoint(dataList, needUpdateUnit);
Date endTime = new Date();
log.error("鎬诲叡鑰楁椂锛�" + (endTime.getTime() - startTime.getTime()));
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index 3add210..76da7e9 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -216,8 +216,12 @@
@Override
public Result workList(DistributeWorkOrderQuery query) {
- query.setStart(DateUtils.getDayStart(query.getStart()));
- query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ if(query.getStart()!=null) {
+ query.setStart(DateUtils.getDayStart(query.getStart()));
+ }
+ if(query.getEnd()!=null) {
+ query.setEnd(DateUtils.getDayEnd(query.getEnd()));
+ }
List<YwUnit> ywUnits = baseMapper.selectList(null);
List<YwUnitVO> lists = ywUnits.stream().map(item -> {
YwUnitVO vo = new YwUnitVO();
diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
index 1a5a659..eed5164 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -104,7 +104,6 @@
//灏佽OsdCheckResult
OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
checkCorrect(osdResult, monitor, osdCheckResult);
- log.info("鏍￠獙缁撴灉锛歿}", osdCheckResult);
checkResults.add(osdCheckResult);
}
}
diff --git a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
index f07f09f..fa9788b 100644
--- a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
+++ b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
@@ -93,7 +93,6 @@
OSDResult osd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
- log.info("娴峰悍璋冪敤鎴愬姛" + osd);
return osd;
}else {
return null;
@@ -103,7 +102,6 @@
OSDResult osd = DHApi.getOsd(monitor.getIp(), DHUserName, DHPassword);
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
- log.info("澶у崕璋冪敤鎴愬姛" + osd);
return osd;
}else {
return null;
@@ -113,7 +111,6 @@
OSDResult osd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
- log.info("瀹囪璋冪敤鎴愬姛" + osd);
return osd;
}else {
return null;
@@ -129,21 +126,18 @@
OSDResult hkosd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
if (hkosd != null) {
hkosd.setSerialNumber(monitor.getSerialNumber());
- log.info("娴峰悍璋冪敤鎴愬姛" + hkosd);
return hkosd;
}
//灏濊瘯澶у崕鐨刟pi
OSDResult dhosd = DHApi.getOsd(monitor.getIp(), DHUserName, DHPassword);
if (dhosd != null) {
dhosd.setSerialNumber(monitor.getSerialNumber());
- log.info("澶у崕璋冪敤鎴愬姛" + dhosd);
return dhosd;
}
//瀹囪api
OSDResult ysosd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
if (ysosd != null) {
ysosd.setSerialNumber(monitor.getSerialNumber());
- log.info("瀹囪璋冪敤鎴愬姛" + ysosd);
return ysosd;
}
return null;
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 655bd26..af04ecb 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -121,14 +121,14 @@
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
camera_capture_area, p.online as onState, civil_code, d.dept_id, d.dept_name, d.area, p.province_tag,p.dept_tag,
- IF(COUNT(w.id) OVER() > 0, '鏄�', '鍚�') AS error, u.unit_name,p.recovery_time,p.reason,p.start_time,p.end_time,w.work_order_no
+ IF(COUNT(w.id) OVER() > 0, '鏄�', '鍚�') AS error, u.unit_name,p.recovery_time,p.reason,p.start_time,p.end_time, w.work_order_no
from t_monitor m
left join t_yw_point p on m.serial_number = p.serial_number and p.deleted = 0
left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
left join (
WITH cte AS (
SELECT *,row_number() OVER(PARTITION BY serial_number ORDER BY create_time DESC) rn FROM t_work_order
- WHERE deleted = 0 AND status != 'AUDITING_SUCCESS'
+ WHERE deleted = 0 AND status == 'AUDITING_SUCCESS'
) SELECT * FROM cte WHERE rn=1
) w on m.serial_number = w.serial_number and w.deleted = 0
left join t_yw_unit u on p.unit_id = u.id and u.deleted = 0
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderDistributeRecordMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderDistributeRecordMapper.xml
index 5578c87..087d4c3 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderDistributeRecordMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderDistributeRecordMapper.xml
@@ -10,4 +10,8 @@
(#{item.workOrderNo}, #{item.userId}, now(), '0', #{item.distributeWay})
</foreach>
</insert>
+
+ <delete id="deleteByWorkOrder">
+ delete from t_work_order_distribute_record where work_order_no = #{workOrderNo}
+ </delete>
</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index b6307bf..d7da245 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -189,7 +189,10 @@
</if>
<if test="query.keyword != null and query.keyword != ''">
AND (tm.name like concat('%', #{query.keyword}, '%') or tm.serial_number like concat('%', #{query.keyword},
- '%'))
+ '%') or wo.work_order_no like concat('%', #{query.keyword}, '%'))
+ </if>
+ <if test="query.start != null and query.end != null">
+ AND wo.create_time BETWEEN #{query.start} AND #{query.end}
</if>
<if test="query.errorTypeList != null and query.errorTypeList.size() > 0">
AND (EXISTS (
@@ -417,8 +420,15 @@
INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
- WHERE
- wo.deleted = 0
+ where
+ wo.deleted = 0 and wo.status != 'WAIT_DISTRIBUTED'
+<!-- <if test="orders !=null and orders.size >0 ">-->
+<!-- wo.work_order_no in-->
+<!-- <foreach collection="orders" item="workOrderNo" separator="," open="(" close=")">-->
+<!-- #{workOrderNo}-->
+<!-- </foreach>-->
+<!-- </if>-->
+<!-- </where>-->
GROUP BY
wo.work_order_no,
u.unit_name,
@@ -426,4 +436,6 @@
u.unit_contact_phone,
p.yw_person_name
</select>
+
+
</mapper>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index e4e9379..0b266b3 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -260,13 +260,9 @@
<if test="point.pointName != null and point.pointName != ''">
point_name = #{point.pointName},
</if>
- <if test="point.unitId != null">
+ <if test="needUpdateUnit != null and needUpdateUnit">
unit_id = #{point.unitId},
- </if>
- <if test="point.startTime != null">
start_time = #{point.startTime},
- </if>
- <if test="point.endTime != null">
end_time = #{point.endTime},
</if>
province_tag = #{point.provinceTag},
@@ -374,4 +370,35 @@
</if>
</where>
</select>
+ <update id="myUpdateById">
+ update t_yw_point
+ <set>
+ <if test="pointName !=null and pointName !=''">
+ point_name = #{pointName},
+ </if>
+ <if test="updateTime !=null">
+ update_time = #{updateTime},
+ </if>
+ <if test="deptId !=null">
+ dept_id = #{deptId},
+ </if>
+ <if test="provinceTag !=null">
+ province_tag = #{provinceTag},
+ </if>
+ <if test="importantTag !=null">
+ important_tag = #{importantTag},
+ </if>
+ <if test="importantCommandImageTag !=null">
+ important_command_image_tag = #{importantCommandImageTag},
+ </if>
+ <if test="deptTag !=null">
+ dept_tag = #{deptTag},
+ </if>
+ unit_id = #{unitId},
+ start_time = #{startTime},
+ end_time = #{endTime},
+ remark = #{remark},
+ </set>
+ where id =#{id}
+ </update>
</mapper>
--
Gitblit v1.8.0