更新

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java

@@ -184,19 +184,6 @@ public class PlanVisual3dController extends BaseController {
     }
 
     @Permission
-    @ApiOperation(value = "根据批次号获取预案状态", notes = "根据批次号获取预案状态")
-    @GetMapping(value = "/plan/getPlaneIfDataMock")
-    public ResponseModel getPlaneRecord(@RequestParam("batchNo") String batchNo) {
-        if (StringUtils.isBlank(batchNo)) {
-            batchNo = planVisual3dService.getLastBatchNo();
-        }
-        if (StringUtils.isBlank(batchNo)) {
-            return CommonResponseUtil.successNew(null);
-        }
-        return CommonResponseUtil.successNew(planVisual3dService.judgeIfPlanDataMock(batchNo));
-    }
-
-    @Permission
     @ApiOperation(value = "预案智能辅助", notes = "预案智能辅助")
     @GetMapping(value = "/plan/getPlaneRecordOne")
     public ResponseModel getPlaneRecordOne() {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java

@@ -281,6 +281,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
             if (!ObjectUtils.isEmpty(infoVO.getPosition())) {
                 contingencyOriginalData.setPosition(infoVO.getPosition());
             }
+            toipResponse.setMockData(judgeIfPlanDataMock(batchNo));
             toipResponse.setMsgType("recordarea");
             toipResponse.setMsgContext(msgContext);
             toipResponse.setContingency(contingencyOriginalData);
@@ -288,7 +289,6 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         return toipResponse;
     }
 
-    @Override
     public boolean judgeIfPlanDataMock(String batchNo) {
         PlanOperationRecord planOperationRecord = planOperationRecordDao.findByBatchNo(batchNo);
         if (planOperationRecord == null) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IPlanVisual3dService.java

@@ -74,14 +74,6 @@ public interface IPlanVisual3dService {
     ToipResponse getPlaneRecordByBatchNo(String batchNo);
 
     /**
-     * 根据批次号获取预案状态
-     *
-     * @param batchNo 批次号
-     * @return 预案记录
-     */
-    boolean judgeIfPlanDataMock(String batchNo);
-
-    /**
      * 根据批次号获取预案记录
      *
      * @param batchNo 批次号

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/ToipResponse.java

@@ -30,11 +30,6 @@ public class ToipResponse implements Serializable
 	 * </pre>
 	 */
 	private static final long serialVersionUID = -7035041461377884452L;
-	
-	/**
-	 * 
-	 */
-	
 
 	/**
 	 * 界面域  
@@ -56,6 +51,8 @@ public class ToipResponse implements Serializable
 	 * marker
 	 */
 	private Object contingency;
+
+	private boolean mockData;
 	
 	public String toJsonStr() {
 		return JSON.toJSONString(this,SerializerFeature.WriteMapNullValue,SerializerFeature.DisableCircularReferenceDetect,SerializerFeature.SkipTransientField);