增加端口配置

ruoyi-admin/src/main/resources/application-dev.yml

@@ -210,9 +210,7 @@ xss:
 # knif4jAPI测试文档
 knife4j:
   enable: true
-deviceName: 869636060423465
-productKey: 52
-splitTable: true
 receiveService: http://127.0.0.1:8052
+msgService: http://127.0.0.1:8051
 
 

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -22,7 +22,7 @@ import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
 
 /**
  * spring security配置
- * 
+ *
  * @author ruoyi
  */
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
@@ -33,7 +33,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
      */
     @Autowired
     private UserDetailsService userDetailsService;
-    
+
     /**
      * 认证失败处理类
      */
@@ -51,7 +51,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
      */
     @Autowired
     private JwtAuthenticationTokenFilter authenticationTokenFilter;
-    
+
     /**
      * 跨域过滤器
      */
@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/websocket/**").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/device/addMsg").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

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

@@ -6,13 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.iot.domain.TDevicePlan;
 import com.ruoyi.iot.domain.WeitiandiDeviceInfo;
 import com.ruoyi.iot.entity.param.DeviceParam;
 import com.ruoyi.iot.queue.MsgQueue;
-import com.ruoyi.iot.service.DeviceControlerService;
-import com.ruoyi.iot.service.ITChargeRecordService;
-import com.ruoyi.iot.service.ITDeviceRecordService;
-import com.ruoyi.iot.service.IWeitiandiDeviceInfoService;
+import com.ruoyi.iot.service.*;
 import com.ruoyi.iot.transdata.RpcResult;
 import com.ruoyi.iot.transdata.entity.MainBoard;
 import io.swagger.annotations.ApiImplicitParam;
@@ -32,6 +30,8 @@ import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
 @RequestMapping("/device")
 public class DeviceController {
 
+    @Autowired
+    private ITDevicePlanService itDevicePlanService;
     @Autowired
     private ITDeviceRecordService itDeviceRecordService;
 
@@ -83,14 +83,14 @@ public class DeviceController {
         // 对电流值进行处理
         LoginUser loginUser = getLoginUser();
         Long userId = loginUser.getUserId();
-        itChargeRecordService.startCharge(deviceParam.getDeviceId(),deviceParam.getCcid(),userId);
+        itChargeRecordService.startCharge(deviceParam.getDeviceId(),deviceParam.getCcid(),userId,deviceParam.getPort());
         return AjaxResult.success();
     }
 
     @PostMapping("/stopCharge")
     public AjaxResult stopCharge(@RequestBody DeviceParam deviceParam) {
         // 对电流值进行处理
-        deviceControlerService.stopCharge(deviceParam.getDeviceId(),deviceParam.getCcid());
+        deviceControlerService.stopCharge(deviceParam.getDeviceId(),deviceParam.getCcid(),deviceParam.getPort());
         return AjaxResult.success();
     }
 
@@ -151,4 +151,18 @@ public class DeviceController {
         return "ok";
     }
 
+
+    @RequestMapping("/getPlanInfo")
+    public AjaxResult getPlanInfo(String deviceId,String port){
+        Long userId = getLoginUser().getUserId();
+        TDevicePlan tDevicePlan = itDevicePlanService.getPlanInfo(deviceId,port,userId);
+        return  AjaxResult.success(tDevicePlan);
+    }
+
+    @RequestMapping("/cancelPlan/{id}")
+    public RpcResult cancelPlan(@PathVariable("id") Long planId){
+        RpcResult rpcResult = itDevicePlanService.cancelPlan(planId);
+        return rpcResult;
+    }
+
 }

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

@@ -54,6 +54,7 @@ public class TDevicePlanController extends BaseController {
         String createTime = String.valueOf(LocalDateTime.now());
         long planType = realData.getLongValue("planType");
         long status = realData.getLongValue("status");
+        Integer port = realData.getInteger("port");
         LoginUser loginUser = getLoginUser();
         Long userId = loginUser.getUserId();
         String runTime = realData.getString("runTime");
@@ -75,6 +76,7 @@ public class TDevicePlanController extends BaseController {
         tDevicePlanAddNewDTO.setRepeatTime(repeatTime);
         tDevicePlanAddNewDTO.setDeviceId(deviceId);
         tDevicePlanAddNewDTO.setCcid(ccid);
+        tDevicePlanAddNewDTO.setPort(port);
 //        TDevicePlanAddNewDTO tDevicePlanAddNewDTO=new TDevicePlanAddNewDTO();
 //        BeanUtils.copyProperties(params, tDevicePlanAddNewDTO);
 

ruoyi-iot/src/main/java/com/ruoyi/iot/domain/dto/TDevicePlanAddNewDTO.java

@@ -34,4 +34,6 @@ public class TDevicePlanAddNewDTO implements Serializable {
 
     /**流量卡号*/
     private String ccid;
+
+    private  Integer port;
 }

ruoyi-iot/src/main/java/com/ruoyi/iot/entity/param/DeviceParam.java

@@ -1,5 +1,6 @@
 package com.ruoyi.iot.entity.param;
 
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 @Data
@@ -10,4 +11,6 @@ public class DeviceParam {
     private String ccid;
 
     private String time;
+
+    private Integer port;
 }

ruoyi-iot/src/main/java/com/ruoyi/iot/openfeign/MsgService.java

@@ -2,6 +2,7 @@ package com.ruoyi.iot.openfeign;
 
 import com.ruoyi.iot.transdata.DataParam;
 import com.ruoyi.iot.transdata.RpcResult;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 
@@ -11,8 +12,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class MsgService {
 
+    @Value("${msgService}")
+    private String url;
+
     public RpcResult sendMsg(DataParam dataParam){
-        RpcResult rpcResult = FeginClientFactory.getFeginClient(FeginClientProxy.class, "http://113.141.88.28:8051").sendMsg(dataParam);
+        RpcResult rpcResult = FeginClientFactory.getFeginClient(FeginClientProxy.class, url).sendMsg(dataParam);
         return rpcResult;
     }
 

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

@@ -2,6 +2,7 @@ package com.ruoyi.iot.queue;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.iot.service.ITDevicePlanService;
+import com.ruoyi.iot.socket.WebSocket;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -23,13 +24,21 @@ public class TaskRunner {
             }
 
             String imei = jsonObject.getString("imei");
-            if (type.equals(103)) {//
+            if(type == 101 || type == 116 || type == 103 || type == 96 || type == 113){//
                 JSONObject real_data = jsonObject.getJSONObject("real_data");
                 JSONObject data = new JSONObject();
-                data.put("real_data", real_data);
-                data.put("type", type);
-                itDevicePlanService.runPlanChargeJob(imei, real_data);
+                data.put("real_data",real_data);
+                data.put("type",type);
+                WebSocket.sendMsg(imei,data);
 
+
+                if(type == 103){
+                    itDevicePlanService.runPlanChargeJob(imei,real_data);
+                }
+
+                if(type == 113){
+//                    itChargeRecordService.endChargeNotice(imei);
+                }
             }
 //            /**
 //             * 116端口发生变化

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

@@ -6,8 +6,10 @@ import com.ruoyi.iot.entity.param.DeviceParam;
 import com.ruoyi.iot.openfeign.MsgService;
 import com.ruoyi.iot.transdata.DataParam;
 import com.ruoyi.iot.transdata.RpcResult;
+import com.ruoyi.iot.transdata.entity.EndCharge;
 import com.ruoyi.iot.transdata.entity.MainBoard;
 import com.ruoyi.iot.transdata.entity.PlanCharge;
+import com.ruoyi.iot.transdata.entity.StartCharge;
 import com.ruoyi.iot.transdata.entity.opertype.OperEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,9 +59,10 @@ public class DeviceControlerService {
      * 开始充电
      * @param deviceId
      */
-    public void startCharge(String deviceId,String ccid){
+    public void startCharge(String deviceId,String ccid,Integer port){
         DataParam dataParam = new DataParam();
-        MainBoard mainBoard = new MainBoard();
+        StartCharge mainBoard = new StartCharge();
+        mainBoard.setPort(port);
         JSONObject object1 = JSONObject.parseObject(JSON.toJSONString(mainBoard));
         dataParam.setData(object1);
         dataParam.setCcid(ccid);
@@ -74,9 +77,10 @@ public class DeviceControlerService {
      * @param deviceId
      * @param ccid
      */
-    public void stopCharge(String deviceId,String ccid){
+    public void stopCharge(String deviceId,String ccid,Integer port){
         DataParam dataParam = new DataParam();
-        MainBoard mainBoard = new MainBoard();
+        EndCharge mainBoard = new EndCharge();
+        mainBoard.setPort(port);
         JSONObject object1 = JSONObject.parseObject(JSON.toJSONString(mainBoard));
         dataParam.setData(object1);
         dataParam.setCcid(ccid);

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

@@ -13,7 +13,7 @@ import com.ruoyi.iot.domain.TChargeRecord;
  */
 public interface ITChargeRecordService extends IService<TChargeRecord>{
 
-    public void startCharge(String deviceId,String ccid ,Long userId);
+    public void startCharge(String deviceId,String ccid ,Long userId,Integer port);
 
 
     public void endChargeNotice(String deviceId);

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

@@ -35,4 +35,5 @@ public interface ITDevicePlanService extends IService<TDevicePlan>  {
     void runPlanChargeJob(String deviceId,JSONObject object);
 
 
+    TDevicePlan getPlanInfo(String deviceId, String port, Long userId);
 }

ruoyi-iot/src/main/java/com/ruoyi/iot/service/impl/TChargeRecordServiceImpl.java

@@ -20,8 +20,8 @@ public class TChargeRecordServiceImpl extends ServiceImpl<TChargeRecordMapper, T
     @Autowired
     private DeviceControlerService deviceControlerService;
     @Override
-    public void startCharge(String deviceId, String ccid, Long userId) {
-        deviceControlerService.startCharge(deviceId,ccid);
+    public void startCharge(String deviceId, String ccid, Long userId,Integer port) {
+        deviceControlerService.startCharge(deviceId,ccid,port);
         TChargeRecord tChargeRecord = new TChargeRecord();
         tChargeRecord.setCreateTime(LocalDateTime.now());
         tChargeRecord.setDeviceId(deviceId);

ruoyi-iot/src/main/java/com/ruoyi/iot/service/impl/TDevicePlanServiceImpl.java

@@ -264,6 +264,17 @@ public class TDevicePlanServiceImpl extends ServiceImpl<TDevicePlanMapper, TDevi
 
 
     }
+
+    @Override
+    public TDevicePlan getPlanInfo(String deviceId, String port, Long userId) {
+        LambdaQueryWrapper<TDevicePlan> objectLambdaQueryWrapper = Wrappers.lambdaQuery();
+        objectLambdaQueryWrapper.eq(TDevicePlan::getUserId,userId).eq(TDevicePlan::getStatus,1)
+                .eq(TDevicePlan::getDeviceId,deviceId).eq(TDevicePlan::getPort,port).orderByDesc(TDevicePlan::getCreateTime)
+                .last("limit 1");
+        TDevicePlan one = this.getOne(objectLambdaQueryWrapper);
+        return one;
+    }
+
     @Override
     public void addNew(TDevicePlanAddNewDTO tDevicePlanAddNewDTO) {
         log.info("开始处理【添加预约】的业务，参数：{}", tDevicePlanAddNewDTO);
@@ -274,8 +285,8 @@ public class TDevicePlanServiceImpl extends ServiceImpl<TDevicePlanMapper, TDevi
         // 调用Mapper对象的insert()执行插入预约数据
         log.info("即将执行插入数据，参数：{}", tDevicePlan);
         tDevicePlan.setStatus(1L);
-        int rows = tDevicePlanMapper.insert(tDevicePlan);
-        if (rows != 1) {
+        boolean save = this.save(tDevicePlan);
+        if (!save) {
             String message = "添加预约失败，服务器忙，请稍后再次尝试！";
             log.warn(message);
             throw new ServiceException(ServiceCode.ERR_INSERT, message);
@@ -336,7 +347,7 @@ public class TDevicePlanServiceImpl extends ServiceImpl<TDevicePlanMapper, TDevi
                     String ccid = planRecord.getCcid();
                     String deviceId1 = planRecord.getDeviceId();
                     planRecord.setStatus(-2);
-                    deviceControlerService.startCharge(deviceId,ccid);
+                    deviceControlerService.startCharge(deviceId,ccid,port);
                     log.info("检测端口：{}未在充电--发送充电指令,{}",port, deviceId);
                 }else{
                     planRecord.setStatus(3);

ruoyi-iot/src/main/resources/mapper/TDevicePlanMapper.xml

@@ -7,10 +7,10 @@
     <insert id="insert" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO t_device_plan (
         plan_type,status,create_time,run_time,
-        repeat_days,repeat_time,user_id,device_id,ccid
+        repeat_days,repeat_time,user_id,device_id,ccid,port
         ) VALUES (
         #{planType}, #{status},#{createTime},#{runTime},
-        #{repeatDays}, #{repeatTime}, #{userId}, #{deviceId},#{ccid}
+        #{repeatDays}, #{repeatTime}, #{userId}, #{deviceId},#{ccid},#{port}
         )
     </insert>