feat:ic卡功能

ruoyi-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java

@@ -216,5 +216,23 @@ public class DeviceController {
         RpcResult rpcResult = itDevicePlanService.cancelPlan(planId);
         return rpcResult;
     }
+    @RequestMapping("/listCard")
+    public AjaxResult listCard(@RequestParam("deviceId") String deviceId){
+        deviceControlerService.listCard(deviceId);
+        return AjaxResult.success();
+    }
+    @RequestMapping("/bindCardMode")
+    public AjaxResult bindCardMode(@RequestParam("deviceId") String deviceId,@RequestParam("mode") int mode){
+        deviceControlerService.bindCardMode(deviceId,mode);
+        return AjaxResult.success();
+    }
+    @RequestMapping("/mgrCard")
+    public AjaxResult mgrCard(@RequestParam("deviceId") String deviceId,@RequestParam("mode") int mode,@RequestParam("cardNo") String cardNo){
+        deviceControlerService.mgrCard(deviceId,mode,cardNo);
+        return AjaxResult.success();
+    }
+
+
+
 
 }

ruoyi-iot/src/main/java/com/ruoyi/iot/queue/TaskRunner.java

@@ -29,7 +29,7 @@ public class TaskRunner {
 
             log.info("msg coming,{}",s);
             String imei = jsonObject.getString("imei");
-            if(type == 101 || type == 116 || type == 103 || type == 96 || type == 113){//
+            if(type == 101 || type == 116 || type == 103 || type == 96 || type == 113 || type == 145 || type == 147){//
                 JSONObject real_data = jsonObject.getJSONObject("real_data");
                 JSONObject data = new JSONObject();
                 data.put("real_data",real_data);

ruoyi-iot/src/main/java/com/ruoyi/iot/service/DeviceControlerService.java

@@ -174,4 +174,51 @@ public class DeviceControlerService {
     }
 
 
+    public void listCard(String deviceId) {
+        DataParam dataParam = new DataParam();
+        JSONObject object1 = new JSONObject();
+        dataParam.setData(object1);
+        dataParam.setCcid(deviceId);
+        dataParam.setDeviceId(deviceId);
+        dataParam.setType(OperEnum.ListICCARDs.getType());
+        RpcResult rpcResult = msgService.sendMsg(dataParam);
+        log.info("发送获取IC卡列表的消息，{}",deviceId);
+    }
+
+    /**
+     * 切换模式
+     * @param deviceId
+     * @param mode
+     */
+    public void bindCardMode(String deviceId,int mode) {
+        DataParam dataParam = new DataParam();
+        JSONObject object1 = new JSONObject();
+        object1.put("mode",mode);
+        dataParam.setData(object1);
+        dataParam.setCcid(deviceId);
+        dataParam.setDeviceId(deviceId);
+        dataParam.setType(OperEnum.BindCardMode.getType());
+        RpcResult rpcResult = msgService.sendMsg(dataParam);
+        log.info("切换绑卡模式，{},{}",deviceId,mode);
+    }
+
+
+    /**
+     * 卡管理
+     * @param deviceId
+     * @param mode
+     * @param cardNo
+     */
+    public void mgrCard(String deviceId,int mode,String cardNo) {
+        DataParam dataParam = new DataParam();
+        JSONObject object1 = new JSONObject();
+        object1.put("mode",mode);
+        object1.put("cardNo",cardNo);
+        dataParam.setData(object1);
+        dataParam.setCcid(deviceId);
+        dataParam.setDeviceId(deviceId);
+        dataParam.setType(OperEnum.MGRCARD.getType());
+        RpcResult rpcResult = msgService.sendMsg(dataParam);
+        log.info("卡管理，{},{},{}",deviceId,mode,cardNo);
+    }
 }

ruoyi-iot/src/main/java/com/ruoyi/iot/transdata/entity/opertype/OperEnum.java

@@ -10,9 +10,12 @@ public enum OperEnum {
     PortDetail(7,"查看端口详情"),
     PortOper(8,"操作端口"),
     DEVICESTATUS(9,"获取设备状态39761"),
-    ResetDevice(10,"重置设备状态"),
+    ResetDevice(10,"重置设备"),
     PlanCHarge(11,"预约充电"),
-    CancelPlanCHarge(12,"取消预约充电");
+    CancelPlanCHarge(12,"取消预约充电"),
+    BindCardMode(13,"绑卡模式切换"),
+    ListICCARDs(14,"获取或有IC卡"),
+    MGRCARD(15,"绑卡或取消绑卡");
     private int type;
 
     private String desc;
@@ -29,4 +32,4 @@ public enum OperEnum {
     public String getDesc() {
         return desc;
     }
-}
+}