Sfoglia il codice sorgente

添加获取油枪绑定POS机的信息

jk-GitHub-coder 4 anni fa
parent
commit
61bc0fdb42

+ 27 - 4
YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -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

+ 4 - 0
YijiaRestful/src/main/java/com/platform/yijia/dao/StationInfoMapper.java

@@ -1,5 +1,6 @@
 package com.platform.yijia.dao;
 
+import com.platform.yijia.pojo.StationDeviceManager;
 import com.platform.yijia.pojo.StationInfo;
 import com.platform.yijia.pojo.StationInfoExample;
 import java.util.List;
@@ -10,6 +11,9 @@ import org.apache.ibatis.annotations.Param;
 
 public interface StationInfoMapper {
 
+    //获取油站的油枪所绑定的打印设备
+    StationDeviceManager getStationDeviceManager(StationDeviceManager stationDeviceManager);
+
     //获取油站信息
     StationInfo selectStationInfo(StationInfo stationInfo);
     //获取油站的打印机

+ 4 - 4
YijiaRestful/src/main/java/com/platform/yijia/service/StationService.java

@@ -3,16 +3,16 @@ package com.platform.yijia.service;
 import com.platform.yijia.param.request.StationRequest;
 import com.platform.yijia.param.response.StationInfoResponse;
 import com.platform.yijia.param.response.StationInfoVo;
-import com.platform.yijia.pojo.StationInfo;
-import com.platform.yijia.pojo.StationOilPrice;
-import com.platform.yijia.pojo.StationPayManage;
-import com.platform.yijia.pojo.StationPic;
+import com.platform.yijia.pojo.*;
 
 import java.util.List;
 import java.util.Map;
 
 public interface StationService {
 
+    //获取油站的油枪所绑定的打印设备
+    StationDeviceManager getStationDeviceManager(StationDeviceManager stationDeviceManager);
+
     //获取油站信息
     StationInfo selectStationInfo(StationInfo stationInfo);
 

+ 6 - 0
YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationServiceImpl.java

@@ -29,6 +29,12 @@ public class StationServiceImpl implements StationService {
     @Resource
     private StationPayManageMapper stationPayManageMapper;
 
+    //获取油站的油枪所绑定的打印设备
+    @Override
+    public StationDeviceManager getStationDeviceManager(StationDeviceManager stationDeviceManager) {
+        return stationInfoMapper.getStationDeviceManager(stationDeviceManager);
+    }
+
     //查询油站配置信息
     @Override
     public StationPayManage selectStationPayManage(StationPayManage stationPayManage) {

+ 1 - 1
YijiaRestful/src/main/java/com/platform/yijia/utils/PosPrinterUtil.java

@@ -35,7 +35,7 @@ public class PosPrinterUtil {
 
     //推送要打印小票的信息
     public static String sendPosPrintDirectMessage(Map<String, Object> args){
-        logger.info("开始推送消息:" +args.toString());
+        logger.info("要推送的订单的信息:" +args.toString());
         Map<String, Object> params = new Hashtable<>();
         params.put("messageTitle", "pos");
         params.put("messageType", "sys");

+ 29 - 1
YijiaRestful/src/main/resources/mapper/StationInfoMapper.xml

@@ -540,5 +540,33 @@
     </where>
   </select>
 
-
+  <!--获取油站的打印设备信息-->
+  <select id="getStationDeviceManager" parameterType="com.platform.yijia.pojo.StationDeviceManager" resultType="com.platform.yijia.pojo.StationDeviceManager">
+    SELECT
+        device_id                   AS deviceId,
+        device_no                   AS deviceNo,
+        device_name                 AS deviceName,
+        station_id                  AS stationId,
+        station_name                AS stationName,
+        device_type                 AS deviceType,
+        device_serial_num           AS deviceSerialNum,
+        gun_no                      AS gunNo,
+        device_status               AS deviceStatus,
+        device_factory              AS deviceFactory,
+        pos_fanout_exchange         AS posFanoutExchange,
+        pos_queue                   AS posQueue
+    FROM  station_device_manage
+    <where>
+        device_status = "1"
+      <if test="stationId != null and stationId !=''">
+        AND station_id = #{stationId}
+      </if>
+      <if test="deviceType != null and deviceType !=''">
+        AND device_type = #{deviceType}
+      </if>
+      <if test="gunNo != null and gunNo !=''">
+        AND FIND_IN_SET(#{gunNo}, gun_no)
+      </if>
+    </where>
+  </select>
 </mapper>