Commit 056129d8 authored by sunyuhua's avatar sunyuhua

自动打卡后台清空完数据,通知前端清空数据

parent c7d14ac9
......@@ -414,7 +414,37 @@ public class RemoteService {
return null;
}
}
/**
* 根据号码牌获取此人是否有成绩,
* 有成绩就通知小程序不清空打卡内存数据,返回0L
* 没有成绩就通知小程序清空打卡内存数据,返回1L
* @param cmptId
* @param roadId
* @param markNo
* @return
*/
public long getIsCleanByMarkNo(Integer cmptId,Integer roadId,String markNo){
ResponseEntity<String> forEntity = restTemplate.getForEntity(timerURL + "personCPScore.do?cmptId="+ cmptId + "&markNo="+markNo, String.class);
log.info("计时个人详情请求地址:"+timerURL + "personCPScore.do?cmptId="+ cmptId + "&markNo="+markNo);
if (forEntity.getStatusCode() == HttpStatus.OK) {
String resultString = forEntity.getBody();
JSONObject object = JSONObject.parseObject(resultString);
JSONArray segsResult = object.getJSONArray("segs");
if(segsResult == null || segsResult.isEmpty()) return 0L;
for(int i=0;i<segsResult.size();i++){
JSONObject resultObject = (JSONObject) segsResult.get(i);
String segTimespan=resultObject.getString("segTimespan");
if("0".equals(segTimespan)){
//通知小程序清空内存数据
return 1L;
}else{
//不能清空内存数据
return 0L;
}
}
}
return 0L;
}
}
......@@ -992,13 +992,15 @@ public class MicroApiController {
}
@GetMapping(value = "/getRoadOpenTimeAndCloseTime/{cmptId}/{roadId}")
@GetMapping(value = "/getRoadOpenTimeAndCloseTime/{cmptId}/{roadId}/{markNo}")
@ApiResponses({
@ApiResponse(code = -1, message = "失败", response = ObjectUtils.Null.class),
@ApiResponse(code = 200, message = "成功", response = Result.class, responseContainer = "List")})
@ApiOperation(value = "自动打卡获取开枪时间或者结束时间", notes = "自动打卡获取开枪时间或者结束时间", tags = "自动打卡获取开枪时间或者结束时间")
public Result getRoadOpenTimeAndCloseTime(@PathVariable("cmptId") int cmptId,@PathVariable("roadId") int roadId){
public Result getRoadOpenTimeAndCloseTime(@PathVariable("cmptId") int cmptId,@PathVariable("roadId") int roadId,@PathVariable("markNo") String markNo){
HashMap<String,Long> roadsGpsCheckpointMapList=remoteService.getRoadOpenTimeAndCloseTime(cmptId,roadId);
long _isclean=remoteService.getIsCleanByMarkNo(cmptId,roadId,markNo);
roadsGpsCheckpointMapList.put("isClean",_isclean);
return Result.success().setContent(roadsGpsCheckpointMapList);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment