|
@@ -95,7 +95,7 @@ public class PosMachineController {
|
|
|
Gson gson =new Gson();
|
|
|
//返回结果集
|
|
|
ResultData resultData = null;
|
|
|
- if(stationId !=null && StringUtils.isNotBlank(oilGun) && StringUtils.isNotBlank(deviceType)){
|
|
|
+ if(stationId !=null && StringUtils.isNotBlank(deviceType)){
|
|
|
StationDeviceManager stationDeviceManager = new StationDeviceManager();
|
|
|
stationDeviceManager.setGunNo(oilGun);
|
|
|
stationDeviceManager.setStationId(stationId);
|
|
@@ -109,6 +109,26 @@ public class PosMachineController {
|
|
|
return gson.toJson(resultData);
|
|
|
}
|
|
|
|
|
|
+ //根据POS机tusn获取该油站油枪绑定的POS机信息
|
|
|
+ @RequestMapping (value = "/getStationDeviceManagerBytusn", method = RequestMethod.GET)
|
|
|
+ @ResponseBody
|
|
|
+ public String getStationDeviceManagerBytusn(@RequestParam String tusn){
|
|
|
+ Gson gson =new Gson();
|
|
|
+ //返回结果集
|
|
|
+ ResultData resultData = null;
|
|
|
+ if(StringUtils.isNotBlank(tusn)){
|
|
|
+ StationDeviceManager stationDeviceManager = new StationDeviceManager();
|
|
|
+ stationDeviceManager.setDeviceNo(tusn);
|
|
|
+ //获取油枪绑定的打印设备信息
|
|
|
+ StationDeviceManager stationDeviceManagerList = stationService.getStationDeviceManager(stationDeviceManager);
|
|
|
+ resultData = ResultData.success(stationDeviceManagerList);
|
|
|
+ }else {
|
|
|
+ resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
|
|
|
+ }
|
|
|
+ return gson.toJson(resultData);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
//查询POS机昨天和近七天数据
|
|
|
@RequestMapping (value = "/selectPosYesterDayAndSevenData", method = RequestMethod.GET)
|