daima tijaio

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

@@ -205,13 +205,14 @@ public class PlanVisual3dController extends BaseController {
     @ApiOperation(value = "根据批次号获取预案的消息等记录", notes = "根据批次号获取预案的消息等记录")
     @GetMapping(value = "/plan/getPlaneRecordByNew")
     public ResponseModel<ContingencyPlanInstanceVO> getPlaneRecordByNew(@RequestParam Integer pageNum, @RequestParam Integer size, @RequestParam(required = false) String batchNo) {
+        AgencyUserModel user = getUserInfo();
         if (!StringUtil.isNotEmpty(batchNo)) {
             batchNo = planVisual3dService.getNewestBatchNo();
         }
         if (!StringUtil.isNotEmpty(batchNo)) {
             return CommonResponseUtil.successNew(null);
         }
-        return CommonResponseUtil.successNew(planVisual3dService.getPlaneRecordByNew(pageNum, size, batchNo));
+        return CommonResponseUtil.successNew(planVisual3dService.getPlaneRecordByNew(pageNum, size, batchNo, user));
     }
 
     @Permission

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

@@ -40,6 +40,7 @@ import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -375,7 +376,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     }
 
     @Override
-    public Page<ContingencyPlanInstanceVO> getPlaneRecordByNew(Integer pageNum, Integer size, String batchNo) {
+    public Page<ContingencyPlanInstanceVO> getPlaneRecordByNew(Integer pageNum, Integer size, String batchNo, AgencyUserModel user) {
         Integer planInstanceCount = contingencyPlanInstanceMapper.getPlanInstanceCount(batchNo);
         // 根据批次号获取预案记录
         List<ContingencyPlanInstance> planInstanceListByPage = contingencyPlanInstanceMapper.getPlanInstanceListByPage(batchNo, (pageNum - 1) * size, size);
@@ -383,7 +384,8 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         if (!CollectionUtils.isEmpty(planInstanceListByPage)) {
             planInstanceListByPage.stream().forEach(item -> {
                 ContingencyPlanInstanceVO instanceVO = new ContingencyPlanInstanceVO();
-                BeanUtils.copyProperties(planInstanceListByPage, instanceVO);
+                BeanUtils.copyProperties(item, instanceVO);
+                instanceVO.setLoginUserId(user.getUserId());
                 list.add(instanceVO);
             });
             list.stream().sorted(Comparator.comparing(ContingencyPlanInstanceVO::getCreateDate)).collect(Collectors.toList());
@@ -432,6 +434,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
         dto.setCreateDate(new Date());
         Map<String, String> userInfo = contingencyPlanInstanceMapper.getUserByUserId(user.getUserId());
         dto.setPersonImg(userInfo.get("personImg"));
+        dto.setContent(StringUtil.isNotEmpty(dto.getContent()) ? dto.getContent() : "");
         repository.save(dto);
         try {
             String topic = String.format("/%s/%s/%s", serviceName, stationName, "plan");

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

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