ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
@@ -42,4 +42,9 @@ * 重点指挥图像 */ private Boolean importantCommandImageTag; /** * 新设备 */ private Boolean newDevice; } ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -140,4 +140,12 @@ int batchUpdateDeviceType(@Param("numbers") List<String> list,@Param("deviceType") Integer deviceType); List<TMonitor> selectByNumbers(@Param("numbers")List<String> numbers); /** * 国标码查国标码 * * @param gbList * @return */ List<String> getGBbyGB(@Param("gbList") List<String> gbList); } ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -135,10 +135,18 @@ ReportAuditingRecordVO getReportResult(String serialNumber, String reportType); /** * 根据国标获取tag * 根据国标设置tag * * @param dataList 数据 * @return */ <T extends BaseResult> void setDeviceTagByGB(List<T> dataList); /** * 根据国标设置是否新点位 * * @param dataList 数据 * @return */ <T extends BaseResult> void setNew(List<T> dataList); } ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -17,6 +17,7 @@ import com.ycl.platform.domain.vo.CheckTagVO; import com.ycl.platform.domain.vo.ReportAuditingRecordVO; import com.ycl.platform.domain.vo.YwPointVO; import com.ycl.platform.mapper.TMonitorMapper; import com.ycl.platform.mapper.YwPeopleMapper; import com.ycl.platform.mapper.YwPointMapper; import com.ycl.platform.service.YwPointService; @@ -34,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; @@ -53,8 +55,7 @@ public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService { private final SysDeptMapper sysDeptMapper; private final YwUnitService unitService; private final YwPeopleMapper ywPeopleMapper; private final TMonitorMapper monitorMapper; private static final ExecutorService executorService = new ThreadPoolExecutor(8, 24, @@ -324,4 +325,17 @@ } } } @Override public <T extends BaseResult> void setNew(List<T> dataList) { List<String> gbList = dataList.stream().map(BaseResult::getNo).collect(Collectors.toList()); Map<String, BaseResult> pointMap = dataList.stream().collect(Collectors.toMap(BaseResult::getNo, item -> item)); List<String> dbGBList = monitorMapper.getGBbyGB(gbList); for (String gb : dbGBList) { BaseResult data = pointMap.get(gb); if (Objects.nonNull(data)) { data.setNewDevice(Boolean.TRUE); } } } } ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -122,6 +122,7 @@ } }); pointService.setDeviceTagByGB(records); pointService.setNew(records); //存放在mongo中 mongoTemplate.insertAll(records); // 工单生成 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -573,4 +573,13 @@ <delete id="deleteAll"> delete from t_monitor </delete> <select id="getGBbyGB" resultType="string"> SELECT DISTINCT serial_number FROM t_monitor WHERE deleted = 0 AND serial_number in <foreach collection="gbList" open="(" separator="," close=")" item="no">#{no}</foreach> </select> </mapper>