Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorMaintenanceInfoDto.java

@@ -15,15 +15,15 @@ import java.util.Date;
 public class ElevatorMaintenanceInfoDto {
 
     @ApiModelProperty(value = "最新维保日期")
-    private Date maintenanceTime;
+    private Date maintainTime;
 
     @ApiModelProperty(value = "下次维保日期")
-    private Date nextMaintenanceTime;
+    private Date nextMaintainTime;
 
     @ApiModelProperty(value = "维保单位")
-    private String maintenanceUnit;
+    private String maintainUnit;
 
     @ApiModelProperty(value = "维保人员")
-    private String maintenancePerson;
+    private String maintainPerson;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/AlertCalledMapper.java

@@ -62,4 +62,10 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
                                                              String alertStage,
                                                              String alertStatus,
                                                              String address);
+    Map<String, Integer> getTodayEmergencyCount();
+    
+	Map<String, Integer> getImportantEventCount();
+	
+	
+	Map<String, Integer> getImportantEventDetail();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

@@ -300,17 +300,17 @@ public class ElevatorController extends BaseController {
         if(StringUtils.isBlank(rescueCode) && sequenceNbr == null) {
             throw new BadRequest("参数错误");
         }
-
+        Elevator elevator;
         ElevatorInfoDto elevatorInfoDto = new ElevatorInfoDto();
         if(null != sequenceNbr) {
             ElevatorBaseInfoDto baseInfoDto = new ElevatorBaseInfoDto();
-            Elevator elevator = elevatorService.getById(sequenceNbr);
+            elevator = elevatorService.getById(sequenceNbr);
             Bean.toPo(elevator,baseInfoDto);
             elevatorInfoDto.setElevatorBaseInfoDto(baseInfoDto);
         } else  {
             QueryWrapper<Elevator> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("rescue_code",rescueCode);
-            Elevator elevator = elevatorService.getOne(queryWrapper);
+            elevator = elevatorService.getOne(queryWrapper);
             if(null == elevator) {
                 throw new BadRequest("电梯应急救援码错误");
             }
@@ -320,7 +320,7 @@ public class ElevatorController extends BaseController {
         }
 
         QueryWrapper<MaintainInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enevator_id", null == sequenceNbr ? rescueCode : String.valueOf(sequenceNbr));
+        queryWrapper.eq("enevator_id", null == sequenceNbr ? elevator.getSequenceNbr() : String.valueOf(sequenceNbr));
         MaintainInfo maintainInfo =   maintainInfoService.getOne(queryWrapper);
         if(null != maintainInfo) {
             ElevatorMaintenanceInfoDto elevatorMaintenanceInfoDto = new ElevatorMaintenanceInfoDto();
@@ -329,7 +329,7 @@ public class ElevatorController extends BaseController {
         }
 
         QueryWrapper<TestInfo> queryWrapper1 = new QueryWrapper<>();
-        queryWrapper.eq("enevator_id", null == sequenceNbr ? rescueCode : String.valueOf(sequenceNbr));
+        queryWrapper1.eq("enevator_id", null == sequenceNbr ? elevator.getSequenceNbr() : String.valueOf(sequenceNbr));
         TestInfo testInfo =   testInfoService.getOne(queryWrapper1);
         if(null != testInfo) {
             ElevatorTestInfoDto elevatorTestInfoDto = new ElevatorTestInfoDto();

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
+import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -36,6 +37,7 @@ import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -393,4 +395,27 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         return result;
     }
 
+	public Object getTodayEmergencyCount() {
+	return	alertCalledMapper.getTodayEmergencyCount();
+	}
+
+	public Object getImportantEventCount() {
+		return alertCalledMapper.getImportantEventCount();
+	}
+
+	public Object getImportantEventOrTodayEmergencyCount(String type) {
+		List<Map<String, Object>> map=null;
+		LambdaQueryWrapper<AlertCalled> queryWrapper=new LambdaQueryWrapper<AlertCalled>();
+		queryWrapper.eq(AlertCalled::getIsDelete, 0);
+		queryWrapper.eq(AlertCalled::getAlarmTypeCode, "960");
+		if("rescueTotal".equals(type)) {
+			queryWrapper.in(AlertCalled::getAlertStageCode,Arrays.asList("861","862"));
+		}else if("rescueComplete".equals(type)) {
+			queryWrapper.in(AlertCalled::getAlertStageCode,Arrays.asList("864","865","866"));
+		}
+		if("importantEventCount".equals(type)) {
+			return alertCalledMapper.getImportantEventDetail();
+		}
+		return this.baseMapper.selectMaps(queryWrapper);	
+		}
 }
\ No newline at end of file