Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/DPStatisticsController.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.elevator.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertMaintenanceUnitStatisticsDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertMsgDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertPaperInfoDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertUseUnitStatisticsDto;
 import com.yeejoin.amos.boot.module.elevator.biz.service.impl.DPStatisticsServiceImpl;
 import io.swagger.annotations.Api;
@@ -85,6 +87,17 @@ public class DPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-即时警情列表", notes = "大屏-应急-即时警情列表")
+    @PostMapping(value = "/yj/instantAlert")
+    public ResponseModel<List<AlertPaperInfoDto>> instantAlert(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.instantAlert(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-应急-月度困人故障高发使用单位", notes = "大屏-应急-月度困人故障高发使用单位")
     @PostMapping(value = "/yj/trappedUserHighCompanyCount")
     public ResponseModel<List<AlertUseUnitStatisticsDto>> trappedUserHighCompanyCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DPStatisticsServiceImpl.java

@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.module.common.api.constant.TZSCommonConstant;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertMaintenanceUnitStatisticsDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertMsgDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertPaperInfoDto;
 import com.yeejoin.amos.boot.module.elevator.api.dto.AlertUseUnitStatisticsDto;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertMaintenanceUnitStatistics;
 import com.yeejoin.amos.boot.module.elevator.api.entity.AlertRescueStatistics;
@@ -18,6 +20,7 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.DateTimeUtil;
@@ -54,6 +57,9 @@ public class DPStatisticsServiceImpl {
 
     private AlertStatisticsMapper alertStatisticsMapper;
 
+    @Autowired
+    AlertCalledServiceImpl alertCalledService;
+
     private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
 
     private static Map<String, List<RegionModel>> regionChildRegionMap = new ConcurrentHashMap<>();
@@ -139,6 +145,13 @@ public class DPStatisticsServiceImpl {
         return jsonObject;
     }
 
+    public List<AlertPaperInfoDto> instantAlert(DPFilterParamDto dpFilterParamDto) throws Exception {
+        List<String> regionCodes = new ArrayList<>();
+        regionCodes.add(dpFilterParamDto.getCityCode());
+        List<AlertPaperInfoDto> alertPaperInfoDtoList = alertCalledService.getAlertPaperInfoList(alertCalledService.authRegionCodeList(regionCodes), false);
+        return alertPaperInfoDtoList;
+    }
+
     public JSONObject trappedUserCount(DPFilterParamDto dpFilterParamDto) throws Exception {
         String date = DateUtil.formatDate(new Date(), "yyyy-MM");
         String orgCode = this.getAndSetOrgCode(dpFilterParamDto);

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java

@@ -411,7 +411,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getName()));
         }
         jgEnableDisable.setEquList(String.valueOf(map.get("equListDesc")));
-        jgEnableDisable.setSupervisoryCode(String.valueOf(map.get("supervisoryCode")));
         jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
         jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());