1.添加对外接口
This commit is contained in:
@@ -47,4 +47,7 @@ public interface WlRecordFeignClient {
|
|||||||
|
|
||||||
@GetMapping("/dayDealNoEndTimeEvent")
|
@GetMapping("/dayDealNoEndTimeEvent")
|
||||||
void dayDealNoEndTimeEvent(@RequestParam("date") String date);
|
void dayDealNoEndTimeEvent(@RequestParam("date") String date);
|
||||||
|
|
||||||
|
@GetMapping("/getWlAssByWlId")
|
||||||
|
HttpResult<List<WlRecord>> getWlAssByWlId(@RequestParam("wlId")String wlId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,6 +57,12 @@ public class WlRecordClientFallbackFactory implements FallbackFactory<WlRecordFe
|
|||||||
log.error("{}异常,降级处理,异常为:{}","每日处理没有结束时间的测试基础数据",cause.toString());
|
log.error("{}异常,降级处理,异常为:{}","每日处理没有结束时间的测试基础数据",cause.toString());
|
||||||
throw new BusinessException(finalExceptionEnum);
|
throw new BusinessException(finalExceptionEnum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public HttpResult<List<WlRecord>> getWlAssByWlId(String wlId) {
|
||||||
|
log.error("{}异常,降级处理,异常为:{}","根据测试项id获取测试项详细条目",cause.toString());
|
||||||
|
throw new BusinessException(finalExceptionEnum);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -207,5 +207,18 @@ public class WlRecordController extends BaseController {
|
|||||||
String methodDescribe = getMethodDescribe("dayDealNoEndTimeEvent");
|
String methodDescribe = getMethodDescribe("dayDealNoEndTimeEvent");
|
||||||
wlRecordService.dayDealNoEndTimeEvent(date);
|
wlRecordService.dayDealNoEndTimeEvent(date);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据测试项获取测试项绑定测点数据
|
||||||
|
*/
|
||||||
|
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
|
||||||
|
@GetMapping("/getWlAssByWlId")
|
||||||
|
@ApiOperation("根据测试项获取测试项绑定测点数据")
|
||||||
|
public HttpResult<List<WlRecord>> getWlAssByWlId(@RequestParam("wlId") String wlId) {
|
||||||
|
String methodDescribe = getMethodDescribe("getWlAssByWlId");
|
||||||
|
List<WlRecord> result = wlRecordService.getWlAssByWlId(wlId);
|
||||||
|
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,4 +48,6 @@ public interface WlRecordMapper extends BaseMapper<WlRecord> {
|
|||||||
List<CsLedgerVO> getAll();
|
List<CsLedgerVO> getAll();
|
||||||
|
|
||||||
List<CsLedgerVO> getAllLine(@Param("devId") String devId);
|
List<CsLedgerVO> getAllLine(@Param("devId") String devId);
|
||||||
|
|
||||||
|
List<WlRecord> getWlAssByWlId(String wlId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,4 +93,8 @@
|
|||||||
)
|
)
|
||||||
order by start_time
|
order by start_time
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getWlAssByWlId" resultType="com.njcn.csdevice.pojo.po.WlRecord">
|
||||||
|
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
@@ -108,4 +108,6 @@ public interface IWlRecordService extends IService<WlRecord> {
|
|||||||
*/
|
*/
|
||||||
void dayDealNoEndTimeEvent(String date);
|
void dayDealNoEndTimeEvent(String date);
|
||||||
|
|
||||||
|
List<WlRecord> getWlAssByWlId(String wlId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -615,6 +615,11 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<WlRecord> getWlAssByWlId(String wlId) {
|
||||||
|
return this.baseMapper.getDataRecordByTestId(wlId,0);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 数据项内的时间进行覆盖:解决多个数据项的startTime及endTime之间存在时间冲突
|
* 数据项内的时间进行覆盖:解决多个数据项的startTime及endTime之间存在时间冲突
|
||||||
* @param data 数据项
|
* @param data 数据项
|
||||||
|
|||||||
Reference in New Issue
Block a user