Merge remote-tracking branch 'origin/master'

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/service/impl/AlarmSaveServiceImpl.java

@@ -6,14 +6,18 @@ import com.hnac.hzims.alarm.config.entity.AlarmEntity;
 import com.hnac.hzims.alarm.monitor.service.AlarmSaveService;
 import com.hnac.hzims.alarm.show.service.AlarmService;
 import com.hnac.hzims.alarm.config.vo.AlarmHandleMarkVo;
+import com.hnac.hzims.operational.station.entity.StationEntity;
 import com.hnac.hzims.operational.station.feign.IStationClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author ysj
@@ -38,13 +42,12 @@ public class AlarmSaveServiceImpl implements AlarmSaveService {
      */
     @Override
     public Boolean save(List<AlarmEntity> alarms) {
-
-        /*// 步骤1.查询告警数据对应站点
+        // 步骤1.查询告警数据对应站点
         R<List<StationEntity>> result = stationClient.querySatationByCodes(alarms.stream().map(AlarmEntity::getStationId).collect(Collectors.toList()));
         if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){
             log.error("alarm query station is null : {}",alarms.stream().map(AlarmEntity::getAlarmId).collect(Collectors.toList()));
             return false;
-        }*/
+        }
         // 步骤2.遍历保存告警数据
         alarms.forEach(alarm->{
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/controller/ConstructionController.java

@@ -72,7 +72,7 @@ public class ConstructionController extends BladeController {
 	public R<IPage<ConstructionVo>> list(ConstructionVo construction, Query query) {
 		return R.data(service.pageCondition(Condition.getPage(query), construction));
 	}
-
+	
 	@GetMapping("/preview")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "检修施工日志预览", notes = "检修施工日志预览")

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyRecServiceImpl.java

@@ -1420,17 +1420,18 @@ public class ImsDutyRecServiceImpl extends BaseServiceImpl<ImsDutyRecMapper, Ims
             // 交接班接班信息填充
             recDTO.setStatus(DutyRecStatus.ACCEPT.getVal());
             recDTO.setAcceptTime(new Date());
-            ImsDutyLogEntity imsDutyLogEntity = recDTO.getImsDutyLogEntity();
             ImsDutyLogEntity update = imsDutyLogService.getOne(Wrappers.<ImsDutyLogEntity>lambdaQuery()
-                    .eq(ImsDutyLogEntity::getDutyId, imsDutyLogEntity.getDutyId())
+                    .eq(ImsDutyLogEntity::getDutyId, headDutyMain.getId())
                     .last("limit 1"));
-            update.setCarryTime(DateUtil.format(new Date(), PATTERN_DATETIME));
-            imsDutyLogService.updateById(update);
+            if(ObjectUtil.isNotEmpty(update)) {
+                update.setCarryTime(DateUtil.format(new Date(), PATTERN_DATETIME));
+                imsDutyLogService.updateById(update);
 //            imsDutyLogService.update(Wrappers.<ImsDutyLogEntity>lambdaUpdate()
 //                    .set(ImsDutyLogEntity::getCarryTime, DateUtil.format(new Date(), PATTERN_DATETIME))
 //                    .eq(ImsDutyLogEntity::getDutyId,imsDutyLogEntity.getDutyId())
 //            );
-            log.info("更新值班日志");
+                log.info("更新值班日志");
+            }
         }
         ImsDutyRecEntity dutyRec = BeanUtil.copy(recDTO, ImsDutyRecEntity.class);
         // 更新交班值班