|
@@ -4,12 +4,10 @@ import com.github.pagehelper.PageInfo;
|
|
|
import com.google.gson.Gson;
|
|
|
import com.platform.yijia.param.request.LoginBody;
|
|
|
import com.platform.yijia.pojo.*;
|
|
|
-import com.platform.yijia.service.IStationClassStructureService;
|
|
|
-import com.platform.yijia.service.IStationClassesSummaryService;
|
|
|
-import com.platform.yijia.service.PayOrderService;
|
|
|
-import com.platform.yijia.service.PosMachineService;
|
|
|
+import com.platform.yijia.service.*;
|
|
|
import com.platform.yijia.utils.CodeMsg;
|
|
|
import com.platform.yijia.utils.ResultData;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.ibatis.annotations.Param;
|
|
|
import org.omg.CORBA.ObjectHelper;
|
|
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
|
@@ -38,6 +36,9 @@ public class PosMachineController {
|
|
|
private PosMachineService posMachineService;
|
|
|
|
|
|
@Resource
|
|
|
+ private StationService stationService;
|
|
|
+
|
|
|
+ @Resource
|
|
|
private IStationClassStructureService stationClassStructureService;
|
|
|
|
|
|
@Resource
|
|
@@ -87,6 +88,28 @@ public class PosMachineController {
|
|
|
return gson.toJson(resultData);
|
|
|
}
|
|
|
|
|
|
+ //获取该油站油枪绑定的POS机信息
|
|
|
+ @RequestMapping (value = "/getStationDeviceManager", method = RequestMethod.GET)
|
|
|
+ @ResponseBody
|
|
|
+ public String getStationDeviceManager(@RequestParam Integer stationId, String oilGun, String deviceType){
|
|
|
+ Gson gson =new Gson();
|
|
|
+ //返回结果集
|
|
|
+ ResultData resultData = null;
|
|
|
+ if(stationId !=null && StringUtils.isNotBlank(oilGun) && StringUtils.isNotBlank(deviceType)){
|
|
|
+ StationDeviceManager stationDeviceManager = new StationDeviceManager();
|
|
|
+ stationDeviceManager.setGunNo(oilGun);
|
|
|
+ stationDeviceManager.setStationId(stationId);
|
|
|
+ stationDeviceManager.setDeviceType(deviceType);
|
|
|
+ //获取油枪绑定的打印设备信息
|
|
|
+ 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)
|
|
|
@ResponseBody
|