代码优化

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -342,7 +342,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
             re.setTotalTime(totalTime == "" ? "0分钟" : totalTime);
             //re.setTotalTime(re.getTimeNum() < 1 ? BigDecimal.ZERO + "h" : new BigDecimal(numberFormat.format((float) re.getTimeNum() / (float) 3600)) + "h");
             //re.setTotalTime(re.getTimeNum() / 60 + "分钟");
-            list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()));
+            //list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()));
         });
 
         return resultList;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -218,12 +218,14 @@ public class CustomerStaffController {
         Result<CustomerStaffDTO> result = customerStaffService.addStaff(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
+        if (result.success()) {
             OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
             mq.setCustomerId(fromDTO.getCustomerId());
             mq.setOrgId(result.getData().getUserId());
             mq.setOrgType("staff");
             mq.setType("staff_create");
             SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        }
         //2021-10-18  end
 
         return result;
@@ -240,12 +242,14 @@ public class CustomerStaffController {
         Result result = customerStaffService.editStaff(fromDTO);
 
         //2021-10-18 推送mq，数据同步到中介库 start
+        if (result.success()) {
             OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
             mq.setCustomerId(fromDTO.getCustomerId());
             mq.setOrgId(fromDTO.getStaffId());
             mq.setOrgType("staff");
             mq.setType("staff_change");
             SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        }
         //2021-10-18  end
 
         return result;