Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -7,33 +7,32 @@ import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDictData;
-import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.entity.*;
-import com.ozs.entity.vo.*;
+import com.ozs.entity.vo.MsgAlarmResp;
+import com.ozs.entity.vo.MsgAlarmVo;
 import com.ozs.mapper.MsgAlarmMapper;
 import com.ozs.service.*;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -167,10 +166,10 @@ public class MsgAlarmController extends BaseController {
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
-//                if (StringUtils.isNotEmpty(o.getReleasedBy())) {
-//                    BaseUser user = baseUserService.getUser(o.getReleasedBy());
-//                    o.setReleasedByName(user.getNickName());
-//                }
+                if (StringUtils.isNotEmpty(o.getReleasedBy())) {
+                    BaseUser user = baseUserService.getUser(o.getReleasedBy());
+                    o.setReleasedByName(user.getNickName());
+                }
                 String mils = AppendUtils.stringAppend(o.getAlarmMile());
                 o.setAlarmMiles(mils);
                 o.setLineDirName(o.getLineDir() == 1 ? "上行" : "下行");