suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PDA 安全巡检提交&废水巡检

Browse Source
liweidong
张乾翔 1 day ago
parent fb4c14cbe0
commit e6473d787d
12 changed files with 260 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java
  2. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java
  3. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java
  4. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java
  5. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java
  6. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java
  7. 60
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java
  8. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java
  9. 29
      blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java
  10. 49
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java
  11. 9
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java
  12. 76
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java

40
blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java
Unescape View File

@ -112,25 +112,51 @@ public class BsSafePatrolInspectionEntity extends BaseEntity {
@Schema(description = "任务状态:1、已检，2、待检，3、未准时完成")
private String taskStatus;
///**
// * 待检
// */
//public static Short PREPARE_TEXT = 1;
///**
// * 未检
// */
//public static Short NO_CHECK = 2;
///**
// * 已检
// */
//public static Short CHECKED = 3;
//
//public static Map<Short, String> taskStatusMap = new HashMap<Short, String>(2);
//
//static {
// taskStatusMap.put(CHECKED, "已检");
// taskStatusMap.put(PREPARE_TEXT, "待检");
// taskStatusMap.put(NO_CHECK, "未检");
//}
/**
* 已检
*/
public static Short CHECKED = 1;
/**
* 待检
*/
public static Short PREPARE_TEXT = 1;
public static Short PREPARE_TEXT = 2;
/**
* 未检
* 未准时完成
*/
public static Short NO_CHECK = 2;
public static Short NOT_ON_TIME = 3;
/**
* 已检
* 缺卡(默认处理)
*/
public static Short CHECKED = 3;
public static Short NO_CHECK = 4;
public static Map<Short, String> taskStatusMap = new HashMap<Short, String>(2);
static {
taskStatusMap.put(CHECKED, "已检");
taskStatusMap.put(PREPARE_TEXT, "待检");
taskStatusMap.put(NO_CHECK, "未检");
taskStatusMap.put(NOT_ON_TIME, "未准时完成");
taskStatusMap.put(NO_CHECK, "缺卡");
}
}

2
blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java
Unescape View File

@ -60,4 +60,6 @@ public interface IBsEpciuInspectionPointService extends BaseService<BsEpciuInspe
List<BsEpciuInspectionPointExcel> exportBsEpciuInspectionPoint(Wrapper<BsEpciuInspectionPointEntity> queryWrapper);
List<BsEpciuInspectionPointEntity> getByCode(String code);
List<BsEpciuInspectionPointEntity> listByCode(String code);
}

4
blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java
Unescape View File

@ -62,6 +62,8 @@ public interface IBsEpciuPatrolInspectionService extends BaseService<BsEpciuPatr
void epInspectionTasks(boolean b);
List<BsEpciuPatrolInspectionEntity> ListPi(String code, Long userId);
List<BsEpciuPatrolInspectionEntity> ListPi(String code,Short eipType);
void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection);
}

2
blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java
Unescape View File

@ -62,6 +62,8 @@ public interface IBsSafeInspectionPointService extends BaseService<BsSafeInspect
List<BsSafeInspectionPointEntity> listByCode(String code);
BsSafeInspectionPointEntity getByKey(Long ipId);
/**
* 导出pdf
* @param list

5
blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java
Unescape View File

@ -32,6 +32,7 @@ import org.springblade.desk.energy.excel.BsSafePatrolInspectionExcel;
import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity;
import org.springblade.desk.energy.pojo.vo.BsSafePatrolInspectionVO;
import java.util.Date;
import java.util.List;
/**
@ -62,4 +63,8 @@ public interface IBsSafePatrolInspectionService extends BaseService<BsSafePatrol
void createSafPatrolTask();
void handleSafPatrolTask();
List<BsSafePatrolInspectionEntity> getByCode(String code);
void updateOldPatrol(Long ipId, Date launchTime, Long id);
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java
Unescape View File

@ -69,4 +69,9 @@ public class BsEpciuInspectionPointServiceImpl extends BaseServiceImpl<BsEpciuIn
.eq(BsEpciuInspectionPointEntity::getInsNum, code));
}
@Override
public List<BsEpciuInspectionPointEntity> listByCode(String code) {
return getByCode(code);
}
}

60
blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java
Unescape View File

@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.desk.energy.excel.BsEpciuPatrolInspectionExcel;
import org.springblade.desk.energy.mapper.BsEpciuPatrolInspectionMapper;
import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity;
@ -49,6 +50,7 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
@ -63,10 +65,6 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl<BsEpciuP
private final IBsEpciuInspectionPointService bsEpciuInspectionPointService;
private final IBsSafePatrolInspectionService bsSafePatrolInspectionservice;
private final IBsSafeInspectionPointService iBsSafeInspectionPointService;
@Override
public IPage<BsEpciuPatrolInspectionVO> selectBsEpciuPatrolInspectionPage(IPage<BsEpciuPatrolInspectionVO> page, BsEpciuPatrolInspectionVO bsEpciuPatrolInspection) {
if(bsEpciuPatrolInspection.getQueryLaunchTime()!=null){
@ -157,12 +155,56 @@ public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl<BsEpciuP
}
@Override
public List<BsEpciuPatrolInspectionEntity> ListPi(String code, Long userId) {
List<BsSafeInspectionPointEntity> safeInspectionPointList = iBsSafeInspectionPointService.listByCode(code);
List<Long> safeInspectionPointIdList = safeInspectionPointList.stream().map(BsSafeInspectionPointEntity::getId).toList();
public List<BsEpciuPatrolInspectionEntity> ListPi(String code, Short eipType) {
//String sql = "select*from(SELECT a.* FROM EP_PATROL_INSPECTION a INNER join " +
// "EP_INSPECTION_POINT b ON a.ip_id = b.eip_id WHERE b.patrol_register =:code AND a.task_status =:taskStatus AND b.eip_type =:eipType " +
// "ORDER BY a.launch_time DESC )where rownum<2 ";
//Query<EpPatrolInspection> query = this.getSession().createSQLQuery(sql).addEntity(EpPatrolInspection.class);
//query.setParameter("code", code);
//query.setParameter("eipType", eipType);
//query.setParameter("taskStatus", EpPatrolInspection.PREPARE_TEXT);
//return query.uniqueResult();
List<BsEpciuInspectionPointEntity> safeInspectionPointList = bsEpciuInspectionPointService.listByCode(code);
List<Long> safeInspectionPointIdList = safeInspectionPointList.stream().map(BsEpciuInspectionPointEntity::getId).toList();
return list(Wrappers.lambdaQuery(BsEpciuPatrolInspectionEntity.class)
.in(BsEpciuPatrolInspectionEntity::getEpcId, safeInspectionPointIdList)
.eq(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.NO_CHECK.toString()));
}
.eq(BsEpciuPatrolInspectionEntity::getInsType, eipType)
//旧mes中查询待检状态任务
.eq(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.PREPARE_TEXT.toString())
.orderByDesc(BsEpciuPatrolInspectionEntity::getLaunchTime)
.last("rownum<2"));
}
@Override
public void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection) {
//epPatrolInspection.setTestTime(new Date());
//epPatrolInspection.setInsMan(pfUserInfo);
//epPatrolInspection.setTaskStatus(EpPatrolInspection.CHECKED);
//epPatrolInspectionDao.update(epPatrolInspection);
////将其他同类的巡检任务置为未检
////
//epPatrolInspectionDao.updateTaskStatus(epPatrolInspection.getEpInspectionPoint().getPatrolRegister());
//String sql = " update EP_PATROL_INSPECTION a set a.TASK_STATUS =:taskStatusNo where a.epi_id in " +
// "(select a.epi_id from EP_PATROL_INSPECTION a inner join EP_INSPECTION_POINT b on a.ip_id = b.eip_id " +
// "where a.TASK_STATUS=:taskStatusText and b.patrol_register =:code) ";
//Query<String> query = this.getSession().createSQLQuery(sql);
//query.setParameter("taskStatusNo", EpPatrolInspection.NO_CHECK);
//query.setParameter("taskStatusText", EpPatrolInspection.PREPARE_TEXT);
//query.setParameter("code", code);
//query.executeUpdate();
BsEpciuPatrolInspectionEntity bsEpciuPatrolInspection = getById(epPatrolInspection.getId());
bsEpciuPatrolInspection.setTaskStatus(BsEpciuPatrolInspectionEntity.CHECKED.toString());
bsEpciuPatrolInspection.setTestTime(new Date());
bsEpciuPatrolInspection.setInsMan(AuthUtil.getUserId().toString());
updateById(bsEpciuPatrolInspection);
// 将其他同类的巡检任务置为未检
List<BsEpciuInspectionPointEntity> safeInspectionPointList = bsEpciuInspectionPointService.listByCode(bsEpciuPatrolInspection.getInsNum());
Set<Long> pointIds = safeInspectionPointList.stream().map(BsEpciuInspectionPointEntity::getId).collect(Collectors.toSet());
update(Wrappers.lambdaUpdate(BsEpciuPatrolInspectionEntity.class)
.in(BsEpciuPatrolInspectionEntity::getEpcId, pointIds)
.eq(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.PREPARE_TEXT.toString())
.set(BsEpciuPatrolInspectionEntity::getTaskStatus, BsEpciuPatrolInspectionEntity.NO_CHECK.toString()));
}
}

5
blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java
Unescape View File

@ -173,4 +173,9 @@ public class BsSafeInspectionPointServiceImpl extends BaseServiceImpl<BsSafeInsp
return list(Wrappers.lambdaQuery(BsSafeInspectionPointEntity.class)
.eq(BsSafeInspectionPointEntity::getInsNum, code));
}
@Override
public BsSafeInspectionPointEntity getByKey(Long ipId) {
return getById(ipId);
}
}

29
blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java
Unescape View File

@ -43,6 +43,7 @@ import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 巡检任务表 服务实现类
@ -107,4 +108,32 @@ public class BsSafePatrolInspectionServiceImpl extends BaseServiceImpl<BsSafePat
baseMapper.update(Wrappers.<BsSafePatrolInspectionEntity>update().lambda().set(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.NO_CHECK).eq(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.PREPARE_TEXT));
}
@Override
public List<BsSafePatrolInspectionEntity> getByCode(String code) {
//String sql = "select a.* from safe_patrol_inspection a " +
// "INNER join safe_inspection_point b on a.IP_ID = b.IP_ID " +
// "where b.patrol_register=:code and a.task_status =:taskStatus order by a.launch_time desc";
//Query<SafePatrolInspection> query = this.getSession().createSQLQuery(sql).addEntity(SafePatrolInspection.class);
//query.setParameter("code", code);
//query.setParameter("taskStatus", SafePatrolInspection.PREPARE_TEXT);
//return query.list();
List<BsSafeInspectionPointEntity> bsSafeInspectionPointEntities = bsSafeInspectionPointService.listByCode(code);
List<Long> ipIds = bsSafeInspectionPointEntities.stream().map(BsSafeInspectionPointEntity::getId).toList();
return list(Wrappers.lambdaQuery(BsSafePatrolInspectionEntity.class)
.in(BsSafePatrolInspectionEntity::getIpId, ipIds)
.eq(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.PREPARE_TEXT)
.orderByDesc(BsSafePatrolInspectionEntity::getLaunchTime));
}
@Override
public void updateOldPatrol(Long ipId, Date launchTime, Long id) {
update(Wrappers.lambdaUpdate(BsSafePatrolInspectionEntity.class)
.eq(BsSafePatrolInspectionEntity::getIpId, id)
.lt(BsSafePatrolInspectionEntity::getLaunchTime, launchTime)
.eq(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.PREPARE_TEXT)
.set(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.NO_CHECK)
.set(BsSafePatrolInspectionEntity::getInsMan, id));
}
}

49
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java
Unescape View File

@ -6,11 +6,15 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.exception.BusinessException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.desk.device.pojo.entity.EquipmentEntity;
import org.springblade.desk.device.pojo.entity.FeiBaSetEntity;
import org.springblade.desk.device.pojo.entity.RackSetEntity;
import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity;
import org.springblade.desk.oldv1.constant.Constant;
import org.springblade.desk.oldv1.pojo.ResultInfo;
import org.springblade.desk.produce.pojo.vo.BindModelVO;
import org.springblade.desk.produce.pojo.vo.PdaProRelevantVO;
@ -28,6 +32,7 @@ import java.util.List;
* @Version 1.0
* 注意：本内容仅限于内部传阅，禁止外泄及用于其他的商业目的
*/
@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping("/pdaLoad")
@ -108,15 +113,49 @@ public class PdaLoadController {
}
@ApiOperationSupport(order = 11)
@Operation(summary = "根据巡检器编码查询数据", description = "")
@Operation(summary = "根据巡检器编码查询数据，查询安全巡检任务", description = "")
@GetMapping("/getInspectionByEcCode/{code}")
public ResultInfo getInspectionByEcCode(@PathVariable String code, HttpServletRequest request) throws Exception {
return ResultInfo.ok(pdaLoadService.getInspectionByEcCode(code, true,request));
}
@Operation(summary = "安全巡检保存", description = "")
@PostMapping("/saveByInspection")
public ResultInfo saveByInspection(@RequestBody JSONObject data, HttpServletRequest request) throws Exception {
pdaLoadService.saveByInspection(data,true);
@Operation(summary = "安全巡检处理，修改安全巡检任务", description = "")
@PostMapping(value = "/saveByInspection")
public ResultInfo saveSafetyInspection(HttpServletRequest request) throws Exception {
JSONObject params = (JSONObject) request.getAttribute(Constant.WEBAPI_REQUEST_PARAMETERS);
if (params == null || params.size() == 0) {
throw new BusinessException("参数传递异常!");
}
String code = params.getString("code");
String man = params.getString("reviewMan");
String memo = params.getString("memo");
if (code == null || man == null) {
throw new BusinessException("参数传递异常!");
}
log.info("安全巡检处理传递参数---编码:" + code + " 人员:" + man + " 备注:" + memo);
pdaLoadService.saveSafetyInspection(code, man, memo);
return ResultInfo.ok();
}
@Operation(summary = "根据巡检器编码查询环保巡检数据（PDA废水巡检））", description = "")
@PostMapping("/getInspectionBySan")
public ResultInfo getInspectionBySan(@RequestBody JSONObject data) throws Exception {
Short eipType = data.getShort("eipType");
String code = data.getString("code");
return ResultInfo.ok(pdaLoadService.getInspectionBySan(code, eipType));
}
@Operation(summary = "环保巡检检验", description = "")
@RequestMapping(value = "/savePatrolIns", method = RequestMethod.POST)
public ResultInfo savePatrolIns(@RequestBody BsEpciuPatrolInspectionEntity epPatrolInspection, HttpServletRequest request) {
pdaLoadService.savePatrolIns(epPatrolInspection);
return ResultInfo.ok();
}

9
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IPdaLoadService.java
Unescape View File

@ -6,6 +6,7 @@ import org.springblade.core.mp.base.BaseService;
import org.springblade.desk.device.pojo.entity.EquipmentEntity;
import org.springblade.desk.device.pojo.entity.FeiBaSetEntity;
import org.springblade.desk.device.pojo.entity.RackSetEntity;
import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity;
import org.springblade.desk.order.pojo.entity.YieldOrder;
import org.springblade.desk.produce.pojo.entity.WorkOrder;
import org.springblade.desk.produce.pojo.entity.WorkPlan;
@ -76,5 +77,11 @@ public interface IPdaLoadService extends BaseService<WorkPlan> {
Object getInspectionByEcCode(String code,Boolean flag, HttpServletRequest request);
void saveByInspection(JSONObject data, boolean b);
void saveSafetyInspection(String code, String man, String memo);
Object getInspectionBySan(String code, Short eipType);
void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection);
}

76
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package org.springblade.desk.produce.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -23,8 +24,11 @@ import org.springblade.desk.device.service.IEquipmentService;
import org.springblade.desk.device.service.IFeiBaSetService;
import org.springblade.desk.device.service.IRackSetService;
import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity;
import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity;
import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity;
import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService;
import org.springblade.desk.energy.service.IBsSafeInspectionPointService;
import org.springblade.desk.energy.service.IBsSafePatrolInspectionService;
import org.springblade.desk.order.pojo.entity.YieldOrder;
import org.springblade.desk.order.service.IYieldOrderService;
import org.springblade.desk.produce.mapper.WorkPlanMapper;
@ -38,6 +42,8 @@ import org.springblade.desk.quality.pojo.entity.InspectionTask;
import org.springblade.desk.quality.service.IInspectionTaskService;
import org.springblade.desk.quality.service.IWorkPlanItemService;
import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
@ -90,6 +96,10 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
private final IBsEpciuPatrolInspectionService bsEpciuPatrolInspectionService;
private final IBsSafePatrolInspectionService inspectionService;
private final IUserClient userClient;
private final IBsSafeInspectionPointService bsSafeInspectionPointService;
// @Value("${request.device.prefixId}")
private String prefixId;
@ -438,9 +448,10 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
if (StringUtils.isBlank(code) || flag == null) {
throw new RuntimeException("pda.dataFormat.incorrect", null);
}
List<BsEpciuPatrolInspectionEntity> piList = bsEpciuPatrolInspectionService.ListPi(code, userId);
//安全 - 巡检
List<BsSafePatrolInspectionEntity> piList = inspectionService.getByCode(code);
piList = piList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
new TreeSet<>(Comparator.comparing(BsEpciuPatrolInspectionEntity::getEpcId))), ArrayList::new));
new TreeSet<>(Comparator.comparing(BsSafePatrolInspectionEntity::getIpId))), ArrayList::new));
if (piList == null || piList.size() == 0) {
if (flag) {
throw new RuntimeException("product.noPatrolCheckTask", null);
@ -450,7 +461,66 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
}
@Override
public void saveByInspection(JSONObject data, boolean b) {
public void saveSafetyInspection(String code, String man, String memo) {
// 根据编码去拿未检验的数据
List<BsSafePatrolInspectionEntity> spiList = inspectionService.getByCode(code);
if (spiList == null || spiList.size() == 0) {
throw new RuntimeException("根据编码未找到需要处理数据");
}
List<User> users = userClient.listByNameNolike(man);
if (CollUtil.isEmpty(users)) {
throw new RuntimeException("根据域账号未找到对应的处理人");
}
User user = users.get(0);
Date date = new Date();
for (BsSafePatrolInspectionEntity safePatrolInspection : spiList) {
// 不超过一个小时算正常检验
if (new Date().getTime() - safePatrolInspection.getLaunchTime().getTime() <= 60 * 60 * 1000) {
safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.CHECKED.toString());
} else {
// 超过一个小时但是下个任务并没有触发
int hours = safePatrolInspection.getLaunchTime().getHours();
int hours1 = new Date().getHours();
if (hours == 0 && hours1 < 2) {
safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NOT_ON_TIME.toString());
} else if (hours == 2 && hours1 < 5) {
safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NOT_ON_TIME.toString());
} else if (hours == 5 && hours1 < 7) {
safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NOT_ON_TIME.toString());
} else if (hours == 7 && hours1 < 8) {
safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NOT_ON_TIME.toString());
} else {
// 超过一个小时但是下个任务已触发
safePatrolInspection.setTaskStatus(BsSafePatrolInspectionEntity.NO_CHECK.toString());
}
}
safePatrolInspection.setTestTime(date);
safePatrolInspection.setInsMan(man);
safePatrolInspection.setParMemo(memo);
BsSafeInspectionPointEntity safeInspectionPoint = bsSafeInspectionPointService.getByKey(safePatrolInspection.getIpId());
safeInspectionPoint.setLastInsCycle(date);
inspectionService.updateOldPatrol(safePatrolInspection.getIpId(), safePatrolInspection.getLaunchTime(), user.getId());
}
}
@Override
public Object getInspectionBySan(String code, Short eipType) {
return bsEpciuPatrolInspectionService.ListPi(code, eipType);
}
@Override
public void savePatrolIns(BsEpciuPatrolInspectionEntity epPatrolInspection) {
//if (epPatrolInspection.getEpiId() != null) {
//
//}
if (Objects.isNull(epPatrolInspection.getId())) {
return;
}
bsEpciuPatrolInspectionService.savePatrolIns(epPatrolInspection);
}

Write Preview
Loading…
Cancel
Save