|  | @@ -9,7 +9,6 @@ import org.slf4j.Logger;
 | 
											
												
													
														|  |  import org.slf4j.LoggerFactory;
 |  |  import org.slf4j.LoggerFactory;
 | 
											
												
													
														|  |  import org.springframework.beans.factory.annotation.Autowired;
 |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
											
												
													
														|  |  import org.springframework.stereotype.Service;
 |  |  import org.springframework.stereotype.Service;
 | 
											
												
													
														|  | -import org.springframework.web.bind.annotation.RequestParam;
 |  | 
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  import static com.ruoyi.sim.constant.CommConst.*;
 |  |  import static com.ruoyi.sim.constant.CommConst.*;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -67,10 +66,19 @@ public class CommBuildService {
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      public SimMsg buildSendMsg(final String simNum, final String cmd, final String cmdId) {
 |  |      public SimMsg buildSendMsg(final String simNum, final String cmd, final String cmdId) {
 | 
											
												
													
														|  | -        return buildSendMsg(simNum, cmd, cmdId, CMD_DATA_PLACE_HOLDER);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        return buildSendMsg(simNum, ORN_SEND, cmd, cmdId, CMD_DATA_PLACE_HOLDER);
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -    public SimMsg buildSendMsg(final String simNum, final String cmd, final String cmdId, final String data) {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    /**
 | 
											
												
													
														|  | 
 |  | +     *
 | 
											
												
													
														|  | 
 |  | +     * @param simNum
 | 
											
												
													
														|  | 
 |  | +     * @param orn
 | 
											
												
													
														|  | 
 |  | +     * @param cmd
 | 
											
												
													
														|  | 
 |  | +     * @param cmdId
 | 
											
												
													
														|  | 
 |  | +     * @param data
 | 
											
												
													
														|  | 
 |  | +     * @return
 | 
											
												
													
														|  | 
 |  | +     */
 | 
											
												
													
														|  | 
 |  | +    public SimMsg buildSendMsg(final String simNum, final String orn, final String cmd, final String cmdId, final String data) {
 | 
											
												
													
														|  |          SimMsg smS = new SimMsg();
 |  |          SimMsg smS = new SimMsg();
 | 
											
												
													
														|  |          smS.setSimMsgId(idService.nextId());
 |  |          smS.setSimMsgId(idService.nextId());
 | 
											
												
													
														|  |          if (StringUtils.isEmpty(simNum) || StringUtils.isEmpty(cmd) || StringUtils.isEmpty(cmdId) || StringUtils.isEmpty(data)) {
 |  |          if (StringUtils.isEmpty(simNum) || StringUtils.isEmpty(cmd) || StringUtils.isEmpty(cmdId) || StringUtils.isEmpty(data)) {
 | 
											
										
											
												
													
														|  | @@ -91,7 +99,7 @@ public class CommBuildService {
 | 
											
												
													
														|  |          StringBuffer m = new StringBuffer();
 |  |          StringBuffer m = new StringBuffer();
 | 
											
												
													
														|  |          m.append(PREFIX);
 |  |          m.append(PREFIX);
 | 
											
												
													
														|  |          m.append(simNum);
 |  |          m.append(simNum);
 | 
											
												
													
														|  | -        m.append(ORN_SEND);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        m.append(orn);
 | 
											
												
													
														|  |          m.append(cmd);
 |  |          m.append(cmd);
 | 
											
												
													
														|  |          m.append(cmdId);
 |  |          m.append(cmdId);
 | 
											
												
													
														|  |          m.append(data);
 |  |          m.append(data);
 | 
											
										
											
												
													
														|  | @@ -115,11 +123,12 @@ public class CommBuildService {
 | 
											
												
													
														|  |          return smS;
 |  |          return smS;
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -    public AjaxResult debugBuildSendMsg(@RequestParam final String simNum,
 |  | 
 | 
											
												
													
														|  | -                                        @RequestParam final String cmd,
 |  | 
 | 
											
												
													
														|  | -                                        @RequestParam final String cmdId,
 |  | 
 | 
											
												
													
														|  | -                                        @RequestParam final String data) {
 |  | 
 | 
											
												
													
														|  | -        SimMsg sm = buildSendMsg(simNum, cmd, cmdId, data);
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult buildSendMsgAR(final String simNum,
 | 
											
												
													
														|  | 
 |  | +                                     final String orn,
 | 
											
												
													
														|  | 
 |  | +                                     final String cmd,
 | 
											
												
													
														|  | 
 |  | +                                     final String cmdId,
 | 
											
												
													
														|  | 
 |  | +                                     final String data) {
 | 
											
												
													
														|  | 
 |  | +        final SimMsg sm = buildSendMsg(simNum, orn, cmd, cmdId, data);
 | 
											
												
													
														|  |          return AjaxResult.success(sm);
 |  |          return AjaxResult.success(sm);
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 |