daima tijiao

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.fas.business.controller;
 
 import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.business.util.StringUtil;
+import com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO;
 import com.yeejoin.amos.fas.business.vo.PlanStepVo;
 import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.config.Permission;
@@ -203,7 +204,7 @@ public class PlanVisual3dController extends BaseController {
     @Permission
     @ApiOperation(value = "根据批次号获取预案的消息等记录", notes = "根据批次号获取预案的消息等记录")
     @GetMapping(value = "/plan/getPlaneRecordByNew")
-    public ResponseModel<ContingencyPlanInstance> getPlaneRecordByNew(@RequestParam Integer pageNum, @RequestParam Integer size, @RequestParam(required = false) String batchNo) {
+    public ResponseModel<ContingencyPlanInstanceVO> getPlaneRecordByNew(@RequestParam Integer pageNum, @RequestParam Integer size, @RequestParam(required = false) String batchNo) {
         if (!StringUtil.isNotEmpty(batchNo)) {
             batchNo = planVisual3dService.getNewestBatchNo();
         }

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

@@ -29,6 +29,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.apache.commons.io.IOUtils;
 import org.eclipse.paho.client.mqttv3.MqttException;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -374,18 +375,24 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     }
 
     @Override
-    public Page<ContingencyPlanInstance> getPlaneRecordByNew(Integer pageNum, Integer size, String batchNo) {
+    public Page<ContingencyPlanInstanceVO> getPlaneRecordByNew(Integer pageNum, Integer size, String batchNo) {
         Integer planInstanceCount = contingencyPlanInstanceMapper.getPlanInstanceCount(batchNo);
         // 根据批次号获取预案记录
         List<ContingencyPlanInstance> planInstanceListByPage = contingencyPlanInstanceMapper.getPlanInstanceListByPage(batchNo, (pageNum - 1) * size, size);
+        List<ContingencyPlanInstanceVO> list = new ArrayList<>();
         if (!CollectionUtils.isEmpty(planInstanceListByPage)) {
-            planInstanceListByPage.stream().sorted(Comparator.comparing(ContingencyPlanInstance::getCreateDate)).collect(Collectors.toList());
+            planInstanceListByPage.stream().forEach(item -> {
+                ContingencyPlanInstanceVO instanceVO = new ContingencyPlanInstanceVO();
+                BeanUtils.copyProperties(planInstanceListByPage, instanceVO);
+                list.add(instanceVO);
+            });
+            list.stream().sorted(Comparator.comparing(ContingencyPlanInstanceVO::getCreateDate)).collect(Collectors.toList());
         }
-        Page<ContingencyPlanInstance> page = new Page<>();
+        Page<ContingencyPlanInstanceVO> page = new Page<>();
         page.setTotal(planInstanceCount);
         page.setCurrent(pageNum);
         page.setSize(size);
-        page.setRecords(planInstanceListByPage);
+        page.setRecords(list);
         return page;
     }
 

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

@@ -92,7 +92,7 @@ public interface IPlanVisual3dService {
      * @param batchNo
      * @return
      */
-    Page<ContingencyPlanInstance> getPlaneRecordByNew(Integer pageNum, Integer size, String batchNo);
+    Page<ContingencyPlanInstanceVO> getPlaneRecordByNew(Integer pageNum, Integer size, String batchNo);
 
     ContingencyPlanInstance replyMessage(AgencyUserModel user, ContingencyPlanInstance dto);
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/ContingencyPlanInstanceVO.java

@@ -8,9 +8,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import javax.persistence.Column;
+import java.util.Date;
+
 
 @Data
-@TableName("contingency_plan_instance")
 public class ContingencyPlanInstanceVO  {
 
 
@@ -52,6 +54,14 @@ public class ContingencyPlanInstanceVO  {
 
     private String name;
 
+    private Date createDate;
+
+    private String createUser;
+
+    private Date updateDate;
+
+    private String updateUser;
 
+    private Boolean isDelete = false;
 }