查询货道

src/main/java/com/minpay/shouhuo/equmentaction/MachineManageAction.java

@@ -25,10 +25,7 @@ import com.startup.minpay.frame.target.MINAction;
 import com.startup.minpay.frame.target.MINComponent;
 import com.startup.minpay.frame.target.MINParam;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 设备管理
@@ -428,6 +425,7 @@ public class MachineManageAction implements IMINAction {
     public MINActionResult queryProEquRelManage(
             @MINParam(key = "equId") String equId,
             @MINParam(key = "gameType") String gameType,
+            @MINParam(key = "perRow") String perRow,
             MINSession session
     ) throws MINBusinessException {
 
@@ -447,6 +445,7 @@ public class MachineManageAction implements IMINAction {
         map.put("channel", "V01");
         map.put("equId", equId);
         map.put("gameType", gameType);
+        map.put("perRow", perRow);
         List<Map<String, Object>> list = Service.lookup(IMINDataBaseService.class)
                 .getMybatisMapper(MachineManageMapper.class)
                 .queryProEquRel(map);
@@ -454,9 +453,33 @@ public class MachineManageAction implements IMINAction {
         list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
         list = new MINCopyFormat("{perState:'sttDesc',isPromotton:'isPromottonDesc',isFragile:'isFragileDesc',type:'gameType'}").format(list);
         list = Service.lookup(IFormatService.class).formatEnum(list, "{sttDesc:'PROEQUREL_STATE',isPromottonDesc:'IS_PROMOTION',isFragileDesc:'IS_FRAGILE','gameType':'GAME_SETUP_TYPE'}");
+        int h = 6;
+        int l = 10;
+        List<Map<String, Object>> reslist = new ArrayList<Map<String, Object>>();
+        for (int j = 0; j < l; j++) {
+            Map<String, Object> map1 = new HashMap<>();
+            //map1.put("perLine",j);
+            for (int k = 0; k < list.size(); k++) {
+                Map<String, Object> map2 =  list.get(k);
+                String perLine = String.valueOf(map2.get("perLine"));
+                if(String.valueOf(j).equals(perLine)){
+                    map1 = map2;
+                    break;
+                }
+            }
+            if(map1.size() == 0){
+                map1.put("proFmpic"," ");
+                map1.put("perLine",j);
+            }
+            reslist.add(map1);
+        }
+
         //传递数据
         res.set("equType",vmEquipmentInf.getEquType());
-        res.set(IMINBusinessConstant.F_PAGING_LAY, list);
+        res.set("imeiAddr",vmEquipmentInf.getImeiAddr());
+        res.set("exchangeRate",vmEquipmentInf.getExchangeRate());
+        res.set("state",vmEquipmentInf.getState());
+        res.set(IMINBusinessConstant.F_PAGING_LAY, reslist);
         return res;
     }
 

src/main/resources/com/minpay/db/table/own/mapper/MachineManageMapper.xml

@@ -109,6 +109,10 @@
 		<if test="gameType != null and gameType != ''">
 			AND rel.VCI_GAME_TYPE = #{gameType, jdbcType = VARCHAR}
 		</if>
+		<if test="perRow != null and perRow != ''">
+			AND rel.VCI_CARGO_WAY_ROW  = #{perRow, jdbcType = VARCHAR}
+		</if>
+
 		ORDER BY rel.VCI_AISLE ASC
 	</select>
 	<select id="queryProductz" resultType="hashmap" parameterType="java.util.Map">