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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -34,6 +34,11 @@ public class DateUtils {
     private static final SimpleDateFormat shortDateNew = new SimpleDateFormat("yyyy/M/d");
 
     /**
+     * 获取时分秒
+     */
+    private static final SimpleDateFormat timeSdf = new SimpleDateFormat("HH:mm:ss");
+
+    /**
      * 获取当前时间
      *
      * @return 当前日期时间
@@ -687,4 +692,19 @@ public class DateUtils {
         int age = birth.until(now).getYears();
         return age;
     }
+
+
+    /**
+     * 根据两个日期返回相差的时分秒
+     * @param newTime 靠后时间
+     * @param oldTime 靠前时间
+     * @return
+     */
+    public static String getTimestr(Date newTime, Date oldTime) {
+        Long newTimes = newTime.getTime();
+        Long oldTimes = oldTime.getTime();
+        // 不改时间会多加八个小时
+        timeSdf.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
+        return timeSdf.format(newTimes-oldTimes);
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RequestData.java

@@ -36,4 +36,7 @@ public class RequestData {
 
     @ApiModelProperty(value = "灾情状态")
     private int status =0;
+
+    @ApiModelProperty(value = "灾情ID")
+    private Long alertId ;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FailureRepairlog.java

@@ -26,7 +26,7 @@ public class FailureRepairlog extends BaseEntity {
      * 流程处理人
      */
 	@TableField("process_auditor_id")
-    private Long processAuditorId;
+    private Integer processAuditorId;
     /**
      * 流程处理人
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -139,7 +139,17 @@ public interface EquipFeignClient {
      * @param
      * @return
      */
-    @RequestMapping(value = "//building/video/page", method = RequestMethod.GET)
+    @RequestMapping(value = "/building/video/page", method = RequestMethod.GET)
     ResponseModel<Page<Map<String, Object>>> getVideo( @RequestParam Page page, @RequestParam Long buildingId);
 
+    /**
+     *
+     *获取视频列表
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/video/pageVideo", method = RequestMethod.GET)
+    ResponseModel<Page<Map<String, Object>>> pageVideo( @RequestParam Integer pageNum, @RequestParam Integer pageSize, @RequestParam Double longitude,@RequestParam Double latitude,@RequestParam Double distance);
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/common/enums/CheckRecordOrderByEnum.java

@@ -5,15 +5,15 @@ import java.util.stream.Collectors;
 
 /**
  * @author DELL
- * 维保任务排序
+ * 维保记录排序
  */
 
 public enum CheckRecordOrderByEnum {
     /**
      * 维保记录排序
      */
-    DATE_DESC("维保记录时间倒序", "1", "checkDate desc"),
-    DATE_ASC("维保记录时间正序", "2", "checkDate asc");
+    DATE_DESC("时间倒序", "1", "checkDate desc"),
+    DATE_ASC("时间正序", "2", "checkDate asc");
 
     /**
      * 名字

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

@@ -48,4 +48,7 @@ public class VoiceRecordFileDto  extends BaseDto {
     @ApiModelProperty(value = "警情阶段code")
     private String alertStageCode;
 
+    @ApiModelProperty(value = "通话时长")
+    private String telTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/DispatchPaperEnums.java

@@ -52,7 +52,10 @@ public  enum DispatchPaperEnums {
 	repairUnit("950","repairUnit","维保单位"),
 	levelOneUnit("951","levelOneUnit","一级响应"),
 	levelTwoUnit("952","levelTwoUnit","二级响应"),
-	levelThreeUnit("953","levelThreeUnit","三级响应");
+	levelThreeUnit("953","levelThreeUnit","三级响应"),
+
+	hasDispatched("956","hasDispatched","已派遣"),
+	notDispatched("957","notDispatched","未派遣");
 
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -235,6 +235,29 @@ public class CommandController extends BaseController {
 
 
 
+
+    /**
+     * 水源列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "video/list")
+    @ApiOperation(httpMethod = "GET", value = " 视频分页查询88", notes = "视频分页查询88")
+    public ResponseModel<Object> getVideo(Integer pageNum, Integer pageSize, RequestData par) {
+
+      if(par.getAlertId()!=null){
+          AlertCalled alertCalled=   iAlertCalledService.getAlertCalledById(par.getAlertId());
+          par.setLatitude(alertCalled.getCoordinateX());
+          par.setLongitude(alertCalled.getCoordinateY());
+      }
+        ResponseModel<Page<Map<String, Object>>> data=  equipFeignClient.pageVideo(pageNum,pageSize,par.getLongitude(),par.getLatitude(),par.getDistance());
+        return ResponseHelper.buildResponse(data!=null?data.getResult():null);
+    }
+
+
+
+
     /**
      * 水源列表分页查询
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureAuditController.java

@@ -40,9 +40,9 @@ public class FailureAuditController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<FailureAuditDto> save(@RequestBody FailureAuditDto model, ReginParams userInfo) throws Exception {
+	public ResponseModel<FailureAuditDto> save(@RequestBody FailureAuditDto model) throws Exception {
 
-		model = failureAuditServiceImpl.savemodel(model,userInfo);
+		model = failureAuditServiceImpl.savemodel(model,getSelectedOrgInfo());
 	    return ResponseHelper.buildResponse(model);
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureDetailsController.java

@@ -5,10 +5,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
-import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -26,11 +22,17 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
+import com.yeejoin.amos.boot.module.common.api.dto.FailureStatusCountDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
+import com.yeejoin.amos.boot.module.common.biz.constats.Constants;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -61,15 +63,7 @@ public class FailureDetailsController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<Object> save(@RequestBody FailureDetailsDto model )  {
-	  	Object result;
-		try {
-			result = failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo());
-			 return ResponseHelper.buildResponse(result);
-		} catch (Exception e) {
-			e.printStackTrace();
-			// TODO Auto-generated catch block
-			 return ResponseHelper.buildResponse("error");
-		}
+			 return ResponseHelper.buildResponse( failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo()));
 	}
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureMaintainController.java

@@ -53,7 +53,7 @@ public class FailureMaintainController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "验收操作", notes = "根据sequenceNbr更新")
-	public ResponseModel<FailureMaintainDto> updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model,Integer status,@PathVariable(value = "sequenceNbr") Long sequenceNbr,ReginParams userInfo) {
+	public Object updateBySequenceNbrFailureMaintain(@RequestBody FailureMaintainDto model,Integer status,@PathVariable(value = "sequenceNbr") Long sequenceNbr,ReginParams userInfo) {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.updateModel(model,status,userInfo));
 	}
@@ -128,9 +128,6 @@ public class FailureMaintainController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "设备故障报修单详情-报修日志",   notes = "设备故障报修单详情-报修日志")
 	@GetMapping(value = "/getProcessHistory/{sequenceNbr}")
 	public ResponseModel<List<Object>> getProcessHistory(@PathVariable Long sequenceNbr ) {
-		if(sequenceNbr==null) {
-			 return ResponseHelper.buildResponse(null);
-		}
 	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.getProcessHistoryList(sequenceNbr));
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureAuditServiceImpl.java

@@ -56,62 +56,56 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
     @Transactional
     public FailureAuditDto savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
 
-      /*  if (model.getAuditResult().equals(5)) {
-            model.setAuditTime(new Date());
-            model.setIsDelete(false);
-            this.createWithModel(model);
-            return model;
-        }*/
-
-
         int condition = Integer.parseInt(model.getCondition());
         //根据审核的结果进行业务操作
         if (condition == AuditResultEnum.AGREE.getCode()) {
-            updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo);
+            updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo,condition);
         } else if (condition == (AuditResultEnum.REFUSE.getCode())) {
-            updateStatus(model, FailureStatuEnum.REFUSE, userInfo);
+            updateStatus(model, FailureStatuEnum.REFUSE, userInfo,condition);
         } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
-            updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo);
+            updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo,condition);
         }
-        return model;
+        return   this.createWithModel(model);
     }
 
     /**
      * 修改故障保修单任务状态
      */
     @Transactional
-    FailureDetailsDto updateStatus(FailureAuditDto model, FailureStatuEnum status, ReginParams userInfo) throws Exception {
-
-
-
+    FailureDetailsDto updateStatus(FailureAuditDto model, FailureStatuEnum status, ReginParams userInfo,int condition) throws Exception {
 
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         failureDetailsDto.setCurrentStatus(status.getCode());
         failureDetailsDto.setSequenceNbr(model.getFaultId());
-        String condition;
-        failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(),userInfo);
+        String conditionText;
+        boolean result = failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(), userInfo);
+        if (result){
             //添加报修日志
             Long faultId = model.getFaultId();
+            model.setAuditTime(new Date());
+            model.setAuditDepartmentId(userInfo.getDepartment().getSequenceNbr());
+            model.setAuditor(userInfo.getRole().getRoleName());
+            model.setAuditDepartment(userInfo.getDepartment().getDepartmentName());
             Date processTime = model.getAuditTime();
             String processDepartment = model.getAuditDepartment();
             String processAuditor = model.getAuditor();
-        Integer processAuditorId = Integer.parseInt(model.getRecUserId());
-        Long auditDepartmentId = model.getAuditDepartmentId();
-        if (status.equals(AuditResultEnum.AGREE)) {
-            condition = AuditResultEnum.AGREE.getName();
-            repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,condition);
+            Integer processAuditorId =Integer.parseInt(userInfo.getUserModel().getUserId()) ;
+            Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
+            if (condition == AuditResultEnum.AGREE.getCode()) {
+                conditionText = AuditResultEnum.AGREE.getName();
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
             }
-        if (status.equals(AuditResultEnum.SEND_BACK)) {
-            condition = AuditResultEnum.SEND_BACK.getName();
-            repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,condition);
+            if (condition == AuditResultEnum.SEND_BACK.getCode()) {
+                conditionText = AuditResultEnum.SEND_BACK.getName();
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
             }
-        condition = AuditResultEnum.REFUSE.getName();
-
-        failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo, condition);
-
-        repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,condition);
+            conditionText = AuditResultEnum.REFUSE.getName();
+            repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
+            failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo,condition+"");
             return failureDetailsService.updateWithModel(failureDetailsDto);
         }
+       return null;
+    }
 
     /**
      * 添加报修日志

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureDetailsServiceImpl.java

@@ -132,9 +132,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		}
 		QueryWrapper<FailureDetails> wrapper = new QueryWrapper<>();
 		wrapper.eq("submission_pid",submissionPid);
-		wrapper.lt("current_status",FailureStatuEnum.REFUSE.getCode());
-		wrapper.lt("current_status",FailureStatuEnum.FINISH.getCode());
-		wrapper.lt("current_status",FailureStatuEnum.WAITING_AUDIT.getCode());
+		wrapper.notIn("current_status",FailureStatuEnum.REFUSE.getCode(),
+				FailureStatuEnum.FINISH.getCode(),
+				FailureStatuEnum.WAITING_AUDIT.getCode());
 		wrapper.orderByDesc("submission_time");
 		IPage<FailureDetails> failureDetailsPage = new Page<>(page.getCurrent(), page.getSize());
 		return  baseMapper.selectPage(failureDetailsPage, wrapper);
@@ -249,7 +249,6 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	 *
 	 * @throws Exception
 	 */
-	@Transactional
 	public Object savemodel(FailureDetailsDto failureDetailsDto, ReginParams userInfo) throws Exception {
 		String businessKey = buildOrderNo();
 		JSONObject body = new JSONObject();
@@ -281,32 +280,26 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
 				sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
 			}
-
+			//添加至报修日志
+			try {
 				Long faultId = model.getSequenceNbr();
 				String processAuditor = model.getRecUserName();
 				Integer processAuditorId = model.getSubmissionPid();
 				String processResult = "提交报修单";
 				String processDepartment = userInfo.getDepartment().getDepartmentName();
 				Long departmentId= userInfo.getDepartment().getSequenceNbr();
-
 				Date processTime = model.getSubmissionTime();
 				repairlog(faultId, processAuditor,processAuditorId,departmentId, processTime, processDepartment, processResult);
-
-
-/*			FailureAuditDto failureAuditDto = new FailureAuditDto();
-			failureAuditDto.setAuditor(model.getRecUserName());
-			failureAuditDto.setFaultId(model.getSequenceNbr());
-			failureAuditDto.setAuditOpinion("已发起");
-			failureAuditDto.setAuditTime(new Date());
-			failureAuditDto.setIsDelete(true);
-			failureAuditDto.setAuditResult(5);
-
-			if (ObjectUtils.isNotEmpty(failureAuditDto)) {
-				failureAuditServiceImpl.savemodel(failureAuditDto, userInfo);
-			}*/
+			}catch (Exception e){
+				e.printStackTrace();
+				logger.info("添加流程日志到数据库失败");
+				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+				return false;
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.info("添加故障维修信息到数据库失败");
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 			return false;
 			// return CommonResponseUtil.failure("添加失败");
 		}
@@ -325,7 +318,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	/**
 	 * 添加报修日志
 	 */
-	public void repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId, Date processTime, String processDepartment,
+	@Transactional
+	public Boolean repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId, Date processTime, String processDepartment,
 			String processResult) {
 		FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
 		failureRepairlogDto.setFaultId(faultId);
@@ -335,8 +329,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		failureRepairlogDto.setProcessTime(processTime);
 		failureRepairlogDto.setProcessDepartment(processDepartment);
 		failureRepairlogDto.setProcessResult(processResult);
-		failureRepairlogDto.setIsDelete(false);
-		failureRepairlogService.createWithModel(failureRepairlogDto);
+		FailureRepairlogDto RepairlogModel = failureRepairlogService.createWithModel(failureRepairlogDto);
+		if (ObjectUtils.isNotEmpty(RepairlogModel)){
+			return true;
+		}
+		return false;
 	}
 
 	public boolean excuteTask(Long sequenceNbr, ReginParams userInfo, String condition) {
@@ -395,7 +392,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		map.put("checkFlag", false);
 		FailureDetailsDto failureDetailsDto = this.queryBySeq(sequenceNbr);
 		// 获取送达部门的ID
-		Integer failureEquipmentId = failureDetailsDto.getFailureEquipmentId();
+		Long failureEquipmentId = failureDetailsDto.getSubmissionBranchId();
 		// 获取上一级操作部门的Id
 		FailureDetails details = this.baseMapper.selectById(sequenceNbr);
 		String procressId = details.getProcessId();
@@ -528,16 +525,16 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		Map<String, Object> map = this.checkExcuteTaskAuthMap(sequenceNbr, userInfo);
 		 if(Boolean.parseBoolean(map.get("checkFlag").toString())) {
 			String  buttonValueString = map.get("name").toString();
-			if(buttonValueString.endsWith(PROCESS_NAME[1])) { //提交维修单
+			if(buttonValueString.endsWith(PROCESS_NAME[0])) { //提交维修单
 				flag=1;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {  //审核
-				if(buttonValueString.startsWith(PROCESS_NAME[3])) {
+			}else if(buttonValueString.endsWith(PROCESS_NAME[1])) {  //审核
+				flag=2;
+				if(buttonValueString.startsWith(PROCESS_NAME[2])) {
 					flag=3;
 				}
-				flag=2;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//维修
+			}else if(buttonValueString.endsWith(PROCESS_NAME[2])) {//维修
 				flag=4;
-			}else if(buttonValueString.endsWith(PROCESS_NAME[4])) {//验收
+			}else if(buttonValueString.endsWith(PROCESS_NAME[3])) {//验收
 				flag=5;
 			}
 		 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java

@@ -84,10 +84,10 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     /**
      *根据审核结果更新维修表
      */
-    public FailureMaintainDto updateModel(FailureMaintainDto failureMaintainDto, Integer status, ReginParams userInfo)   {
-
-        failureDetailsService.checkExcuteTaskAuthMap(failureMaintainDto.getFaultId(),userInfo);
+    public Boolean updateModel(FailureMaintainDto failureMaintainDto, Integer status, ReginParams userInfo)   {
 
+        boolean result = failureDetailsService.checkExcuteTaskAuth(failureMaintainDto.getFaultId(), userInfo);
+        if (result){
             this.updateWithModel(failureMaintainDto);
             //根据status修改状态
             String processResult = new String();
@@ -104,14 +104,15 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
                 processResult = "验证未通过";
                 condition = AuditResultEnum.REFUSE.getName();
             }
-
-        failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
-
             //添加报修日志
             Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
             repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),processAuditorId, userInfo.getDepartment().getSequenceNbr(),failureMaintainDto.getMaintainTime(),
                     failureMaintainDto.getDepartment(),processResult);
-        return failureMaintainDto;
+            failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition);
+            return true;
+        }
+            return false;
+
     }
    /**
     * 查询当前故障报修单的流程的审批历史节点

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/CheckController.java

@@ -488,6 +488,7 @@ public class CheckController extends AbstractBaseController {
             @ApiParam(value = "结束时间") @RequestParam(value = "endTime", required = false) String endTime,
             @ApiParam(value = "维保人员") @RequestParam(value = "personId", required = false) String person,
             @ApiParam(value = "业主单位") @RequestParam(value = "teamId", required = false) String teamId,
+            @ApiParam(value = "设施Id") @RequestParam(value = "equipId", required = false) String equipId,
             @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
             @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception{
         HashMap<String, Object> params = new HashMap<>();
@@ -503,6 +504,7 @@ public class CheckController extends AbstractBaseController {
         params.put("endTime", endTime);
         params.put("person", person);
         params.put("teamId", teamId);
+        params.put("equipId", equipId);
         params.put("orgCode", loginOrgCode);
         CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
         return CommonResponseUtil.success(checkService.getCheckPage(params, pageable));

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

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.SystemClock;
@@ -325,12 +327,12 @@ public class AlertCalledController extends BaseController {
 	}
 
 	void getResponseLevel(Long alertId, AlertCalledDto alertCalledDto, ESAlertCalledDto esAlertCalledDto) {
-		QueryWrapper<DispatchPaper> dispatchPaperQueryWrapper = new QueryWrapper<>();
-		dispatchPaperQueryWrapper.eq("alert_id",alertId);
+		LambdaQueryWrapper<DispatchPaper> dispatchPaperQueryWrapper = new LambdaQueryWrapper<>();
+		dispatchPaperQueryWrapper.eq(DispatchPaper::getAlertId,alertId);
 		DispatchPaper dispatchPaper = dispatchPaperServiceImpl.getOne(dispatchPaperQueryWrapper);
 		if(null != dispatchPaper) {
-			QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("alert_called_id", dispatchPaper.getSequenceNbr()).eq("alert_type_code", DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
+			LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(AlertFormValue::getAlertCalledId, dispatchPaper.getSequenceNbr()).eq(AlertFormValue::getAlertTypeCode, DispatchPaperEnums.getEnumById(dispatchPaper.getAlertCode()).getDynamicCode());
 			// 派遣单动态表单数据
 			List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
 			// map 存取数据
@@ -385,10 +387,10 @@ public class AlertCalledController extends BaseController {
 				|| ValidationUtil.isEmpty(forzenResult)){
 			throw new BadRequest("参数校验失败.");
 		}
-		UpdateWrapper<AlertCalled> updateWrapper = new UpdateWrapper<>();
-		updateWrapper.set("forzen_result",forzenResult);
-		updateWrapper.set("alert_status",1);
-		updateWrapper.eq("sequence_nbr",alertId);
+		LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
+		updateWrapper.set(AlertCalled::getForzenResult,forzenResult);
+		updateWrapper.set(AlertCalled::getAlertStage,1);
+		updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
 		return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
 	}
 
@@ -406,10 +408,10 @@ public class AlertCalledController extends BaseController {
 				|| ValidationUtil.isEmpty(alertId)){
 			throw new BadRequest("参数校验失败.");
 		}
-		UpdateWrapper<AlertCalled> updateWrapper = new UpdateWrapper<>();
-		updateWrapper.set("final_reason",finalReason);
-		updateWrapper.set("alert_status",1);
-		updateWrapper.eq("sequence_nbr",alertId);
+		LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
+		updateWrapper.set(AlertCalled::getFinalReason,finalReason);
+		updateWrapper.set(AlertCalled::getAlertStage,1);
+		updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
 		return ResponseHelper.buildResponse(iAlertCalledService.update(updateWrapper));
 	}
 

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -78,8 +79,8 @@ public class DispatchTaskController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据警情id 查找力量调派信息",   notes = "根据警情id 查找力量调派信息")
 	@GetMapping(value = "/list/alert/{alertId}")
 	public ResponseModel<List<DispatchTask>> selectForListByAlertId(@PathVariable Long alertId) {
-		QueryWrapper<DispatchTask> queryWrapper = new QueryWrapper<DispatchTask>();
-		queryWrapper.eq("alert_id", alertId);
+		LambdaQueryWrapper<DispatchTask> queryWrapper = new LambdaQueryWrapper<DispatchTask>();
+		queryWrapper.eq(DispatchTask::getAlertId, alertId);
 		List<DispatchTask> list = dispatchTaskServiceImpl.list(queryWrapper);
 	    return ResponseHelper.buildResponse(list);
 	}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorNewDto;
@@ -11,6 +12,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -51,6 +53,9 @@ public class ElevatorController extends BaseController {
     @Autowired
     ElevatorServiceImpl elevatorService;
 
+    @Autowired
+    private AmosFeignService amosFeignService;
+
     /**
      * 新增电梯
      *
@@ -248,5 +253,23 @@ public class ElevatorController extends BaseController {
         IPage<ElevatorDto> elevatorDtoIPage = BeanDtoVoUtils.elevatorIPageDto(page);
         return ResponseHelper.buildResponse(elevatorDtoIPage);
     }
+
+
+    /**
+     * 获取电梯使用单位
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/usesiteCategory", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取电梯使用单位", notes = "获取电梯使用单位")
+    public ResponseModel<List<DictionarieValueModel>> selectUsesiteCategory() {
+        List<DictionarieValueModel>  elevatorUseSiteCategory = null;
+        try {
+            elevatorUseSiteCategory = amosFeignService.listDictionaryByDictCode("ELEVATOR_USE_SITE_CATEGORY");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ResponseHelper.buildResponse(elevatorUseSiteCategory);
+    }
 }
 

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

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -62,8 +63,8 @@ public class RepairConsultController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据警情id 查找处置过程日志",   notes = "根据警情id 查找处置过程日志")
 	@GetMapping(value = "/list/alert/{alertId}")
 	public ResponseModel<List<RepairConsult>> selectForListByAlertId(@PathVariable Long alertId) {
-		QueryWrapper<RepairConsult> queryWrapper = new QueryWrapper<RepairConsult>();
-		queryWrapper.eq("parent_id", alertId).orderByDesc("rec_date");
+		LambdaQueryWrapper<RepairConsult> queryWrapper = new LambdaQueryWrapper<RepairConsult>();
+		queryWrapper.eq(RepairConsult::getParentId, alertId).orderByDesc(RepairConsult::getRecDate);
 		List<RepairConsult> list = repairConsultServiceImpl.list(queryWrapper);
 		return ResponseHelper.buildResponse(list);
 	}

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

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.VoiceRecordFileDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.VoiceRecordFile;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.VoiceRecordFileServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * 通话记录附件
@@ -40,6 +45,9 @@ public class VoiceRecordFileController extends BaseController {
     @Autowired
     VoiceRecordFileServiceImpl voiceRecordFileServiceImpl;
 
+	@Autowired
+	AlertCalledServiceImpl iAlertCalledService;
+
     /**
      * 新增通话记录附件
      *
@@ -49,6 +57,24 @@ public class VoiceRecordFileController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增通话记录附件", notes = "新增通话记录附件")
 	public ResponseModel<VoiceRecordFileDto> save(@RequestBody VoiceRecordFileDto model) {
+		if (ValidationUtil.isEmpty(model.getAlertId())
+				|| ValidationUtil.isEmpty(model.getTel())){
+			throw new BadRequest("参数校验失败.");
+		}
+		Calendar startTime = Calendar.getInstance();
+		Calendar endTime = Calendar.getInstance();
+		endTime.add(Calendar.MINUTE, 6);
+		model.setTelStartTime(startTime.getTime());
+		model.setTelEndTime(endTime.getTime());
+		model.setFilePath(UUID.randomUUID().toString().replace("-",""));
+		model.setFileType("");
+		model.setSourceId(-1l);
+		AlertCalledFormDto alertDto = iAlertCalledService.selectAlertCalledByIdNoCache(model.getAlertId());
+		if(alertDto == null || alertDto.getAlertCalledDto() == null) {
+			throw new BadRequest("未找到相关警情");
+		}
+		model.setAlertStage(alertDto.getAlertCalledDto().getAlertStage());
+		model.setAlertStageCode(alertDto.getAlertCalledDto().getAlertStageCode());
 		model = voiceRecordFileServiceImpl.createWithModel(model);
 		return ResponseHelper.buildResponse(model);
 	}
@@ -61,10 +87,21 @@ public class VoiceRecordFileController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "根据警情id 查找通话记录信息",   notes = "根据警情id 查找通话记录信息")
 	@GetMapping(value = "/list/alert/{alertId}")
-	public ResponseModel<List<VoiceRecordFile>> selectForListByAlertId(@PathVariable Long alertId) {
-		QueryWrapper<VoiceRecordFile> queryWrapper = new QueryWrapper<VoiceRecordFile>();
-		queryWrapper.eq("alert_id", alertId).orderByDesc("rec_date");
+	public ResponseModel<List<VoiceRecordFileDto>> selectForListByAlertId(@PathVariable Long alertId) {
+		LambdaQueryWrapper<VoiceRecordFile> queryWrapper = new LambdaQueryWrapper<VoiceRecordFile>();
+		queryWrapper.eq(VoiceRecordFile::getAlertId, alertId).orderByDesc(VoiceRecordFile::getRecDate);
 		List<VoiceRecordFile> list = voiceRecordFileServiceImpl.list(queryWrapper);
-		return ResponseHelper.buildResponse(list);
+		List<VoiceRecordFileDto> dtoList = new ArrayList<VoiceRecordFileDto>(list.size());
+		list.stream().forEach(voiceRecord -> {
+			// 创建新的对象实例
+			VoiceRecordFileDto target = new VoiceRecordFileDto();
+			// 把原对象数据拷贝到新对象
+			BeanUtils.copyProperties(voiceRecord, target);
+			if(voiceRecord.getTelStartTime() != null && voiceRecord.getTelEndTime() != null) {
+				target.setTelTime(DateUtils.getTimestr( voiceRecord.getTelEndTime(),voiceRecord.getTelStartTime()));
+			}
+			dtoList.add(target);
+		});
+		return ResponseHelper.buildResponse(dtoList);
 	}
 }

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

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,8 +82,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         }else{
             // 警情基本信息
             AlertCalled alertCalled = this.getById(id);
-            QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("alert_called_id", id);
+            LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AlertFormValue::getAlertCalledId, id);
             // 警情动态表单数据
             List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
             List<FormValue> formValue = new ArrayList<FormValue>();
@@ -92,9 +94,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 }
             }
             AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
-            QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
-            elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
-            elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
+            LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
+            elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
+            elevatorQueryWrapper.eq(Elevator::getRegisterCode, alertCalled.getRegistrationCode());
             Elevator elevator =  iElevatorService.getOne(elevatorQueryWrapper);
             if(null !=  elevator) {
                 alertCalledDto.setAddress(elevator.getAddress());
@@ -117,8 +119,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     public AlertCalledFormDto selectAlertCalledByIdNoCache(Long id) {
         // 警情基本信息
         AlertCalled alertCalled = this.getById(id);
-        QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("alert_called_id", id);
+        LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlertFormValue::getAlertCalledId, id);
         // 警情动态表单数据
         List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
         List<FormValue> formValue = new ArrayList<FormValue>();
@@ -129,9 +131,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             }
         }
         AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
-        QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
-        elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
-        elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
+        LambdaQueryWrapper<Elevator> elevatorQueryWrapper = new LambdaQueryWrapper<>();
+        elevatorQueryWrapper.eq(Elevator::getRescueCode, alertCalled.getDeviceId());
+        elevatorQueryWrapper.eq(Elevator::getRegisterCode, alertCalled.getRegistrationCode());
         Elevator elevator =  iElevatorService.getOne(elevatorQueryWrapper);
         if(null !=  elevator) {
             alertCalledDto.setAddress(elevator.getAddress());
@@ -155,11 +157,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
     @Override
     public Boolean updateAlertStageByAlertId(Long alertId, String alertStage) {
-        UpdateWrapper<AlertCalled> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("sequence_nbr",alertId);
+        LambdaUpdateWrapper<AlertCalled> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(AlertCalled::getSequenceNbr,alertId);
         AlertStageEnums stage = AlertStageEnums.getEnumByCode(alertStage);
-        updateWrapper.set("alert_stage_code",stage.getId());
-        updateWrapper.set("alert_stage",stage.getValue());
+        updateWrapper.set(AlertCalled::getAlertStageCode,stage.getId());
+        updateWrapper.set(AlertCalled::getAlertStage,stage.getValue());
         return this.update(updateWrapper);
     }
 
@@ -232,7 +234,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 alertCalledObjsDto.setAlertCalledDto(BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class));
                 alertCalledObjsDto.setAlertFormValue(alertFormValuelist);
                 //保存处置记录-接警
-                repairConsultServiceImpl.saveRepairConsultByAlertIdType(alertCalled.getSequenceNbr(),"JJ",null, user); //保存接警日志
+                repairConsultServiceImpl.saveRepairConsultByAlertIdType(alertCalled.getSequenceNbr(),AlertStageEnums.JJ.getCode(),null, user); //保存接警日志
             }
 
             /**

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

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -17,6 +18,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
 import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
+import com.yeejoin.amos.boot.module.tzs.api.enums.TzsCommonParam;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchTaskMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchTaskService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
@@ -99,9 +101,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         dispatchTaskDto.setAlertId(alertId);
         dispatchTaskDto.setAlertCode(alertCalledDto.getAlarmTypeCode());
         // 获取模板 拼接json
-        QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Template> templateQueryWrapper = new LambdaQueryWrapper<>();
         String alertTypeCode =   AlertStageEnums.getEnumById(alertCalledDto.getAlarmTypeCode()).getCode()  ;
-        templateQueryWrapper.eq("type_code","TASK-" + alertTypeCode);
+        templateQueryWrapper.eq(Template::getTypeCode,"TASK-" + alertTypeCode);
         Template template = templateServiceImpl.getOne(templateQueryWrapper);
         String content = template.getContent();
         // 替换模板内容
@@ -127,8 +129,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             typeCode  = AlertStageEnums.TSZX.getId();
         }
         // 警情信息动态数据
-        QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("alert_called_id", alertId).eq("alert_type_code",typeCode);
+        LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AlertFormValue::getAlertCalledId, alertId).eq(AlertFormValue::getAlertTypeCode,typeCode);
         // 派遣单动态表单数据
         List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
         // map 存取数据
@@ -182,13 +184,13 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
         dispatchTaskDto.setDispatchTime(new Date());
         DispatchTask dispatchTask = BeanDtoVoUtils.convert(dispatchTaskDto, DispatchTask.class);
         dispatchTask.setPaperId(dispatchPaperDto.getDispatchPaper().getSequenceNbr());
-        if(dispatchPaper.getRepairOrgTaskId() != null && (dispatchTask.getOrgTypeCode().equals("levelOneUnit") || dispatchTask.getOrgTypeCode().equals("levelTwoUnit"))) {
+        if(dispatchPaper.getRepairOrgTaskId() != null && (dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.levelOneUnit.getCode()) || dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.levelTwoUnit.getCode()))) {
             throw new BadRequest("已经派遣过其他力量调派");
         }
-        if(dispatchPaper.getUseOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals("useUnit")) {
+        if(dispatchPaper.getUseOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.useUnit.getCode())) {
             throw new BadRequest("已经派遣过使用单位");
         }
-        if(dispatchPaper.getRepairOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals("repairUnit") ) {
+        if(dispatchPaper.getRepairOrgTaskId() != null && dispatchTask.getOrgTypeCode().equals(DispatchPaperEnums.repairUnit.getCode()) ) {
             throw new BadRequest("已经派遣过维修单位调派");
         }
 
@@ -201,11 +203,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     UseUnit useUnit = iUseUnitService.getById(dispatchTask.getResponseOrgId());
                     dispatchPaper.setUseOrgId(useUnit.getSequenceNbr());
                     dispatchPaper.setUseOrgTaskId(dispatchTask.getSequenceNbr());
-                    if(AlertStageEnums.getEnumById(dispatchPaper.getAlertCode()).getCode().equals("KRJY")) {
+                    if(AlertStageEnums.getEnumById(dispatchPaper.getAlertCode()).getCode().equals(AlertStageEnums.KRJY.getCode())) {
                         dynamicFormAlert.stream().forEach(alertFormValue -> {
                             if(alertFormValue.getFieldCode().equals("dispatch_status")) {
-                                alertFormValue.setFieldValue("已派遣");
-                                alertFormValue.setFieldValueCode("hasDispatched");
+                                alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
+                                alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
                             }
                         });
                     }
@@ -223,11 +225,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     // 修改动态字段
                     dynamicFormAlert.stream().forEach(alertFormValue -> {
                         if(alertFormValue.getFieldCode().equals("dispatch_status")) {
-                            alertFormValue.setFieldValue("已派遣");
-                            alertFormValue.setFieldValueCode("hasDispatched");
+                            alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
+                            alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
                         } else if(alertFormValue.getFieldCode().equals("response_level")) {
-                            alertFormValue.setFieldValue("一级响应");
-                            alertFormValue.setFieldValueCode("levelOneUnit");
+                            alertFormValue.setFieldValue(DispatchPaperEnums.levelOneUnit.getValue());
+                            alertFormValue.setFieldValueCode(DispatchPaperEnums.levelOneUnit.getId());
                         } else if(alertFormValue.getFieldCode().equals("save_credit_code")) {
                             alertFormValue.setFieldValue(socialCreditCode);
                         }
@@ -240,11 +242,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     // 修改动态字段
                     dynamicFormAlert.stream().forEach(alertFormValue -> {
                         if(alertFormValue.getFieldCode().equals("dispatch_status")) {
-                            alertFormValue.setFieldValue("已派遣");
-                            alertFormValue.setFieldValueCode("hasDispatched");
+                            alertFormValue.setFieldValue(DispatchPaperEnums.hasDispatched.getValue());
+                            alertFormValue.setFieldValueCode(DispatchPaperEnums.hasDispatched.getId());
                         } else if(alertFormValue.getFieldCode().equals("response_level")) {
-                            alertFormValue.setFieldValue("二级响应");
-                            alertFormValue.setFieldValueCode("levelTwoUnit");
+                            alertFormValue.setFieldValue(DispatchPaperEnums.levelTwoUnit.getValue());
+                            alertFormValue.setFieldValueCode(DispatchPaperEnums.levelTwoUnit.getId());
                         }
                     });
                     break;
@@ -254,9 +256,9 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             // 保存动态表单数据
             iAlertFormValueService.updateBatchById(dynamicFormAlert);
             // 记录日志
-            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(),"PQ", dispatchTask.getSequenceNbr(),sendUser);
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchTask.getAlertId(), TzsCommonParam.PQ, dispatchTask.getSequenceNbr(),sendUser);
             // 派遣后如果困人救援更新派遣过程表
-            if("960".equals(dispatchPaper.getAlertCode())) {
+            if(AlertStageEnums.KRJY.getId().equals(dispatchPaper.getAlertCode())) {
                 RescueProcessDto rescueProcessDto = rescueProcessServiceImpl.getProcessByAlertId(dispatchTaskDto.getAlertId());
                 if(rescueProcessDto.getDispatchStatus() == null && rescueProcessDto.getDispatchTime() == null) {
                     rescueProcessDto.setDispatchStatus(true);

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

@@ -172,7 +172,7 @@ public class ESAlertCalledService {
         currentTime = currentTime - 120*60*1000;
         BoolQueryBuilder qb1 = QueryBuilders.boolQuery()
         		.must(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
-        boolMust.should(qb1);
+        boolMust.must(qb1);
         //报警电话一致
         if (!ValidationUtil.isEmpty(alertCalled.getEmergencyCall()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone()))
 		{
@@ -191,13 +191,13 @@ public class ESAlertCalledService {
         //警情类型一致
         BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
         		.must(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
-        boolMust.should(qb4);
+        boolMust.must(qb4);
         //使用单位名称一致
         if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))
 		{
         	BoolQueryBuilder qb5 = QueryBuilders.boolQuery()
         			.must(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit()));
-        	boolMust.should(qb5);
+        	boolMust.must(qb5);
 		}
         //电梯识别码一致
         if(!ValidationUtil.isEmpty(alertCalled.getDeviceId())) {

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

@@ -102,8 +102,8 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
         String equipmentClassificationCode = alertCalledDto.getEquipmentClassificationCode();
         String deviceId = alertCalledDto.getDeviceId();
         // 目前只有电梯类型
-        QueryWrapper<Elevator> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("rescue_code", deviceId);
+        LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Elevator::getRescueCode, deviceId);
         Elevator elevator = this.getOne(queryWrapper);
         if (ValidationUtil.isEmpty(elevator))
             throw new BadRequest("设备未找到");

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

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
@@ -22,12 +21,10 @@ import com.yeejoin.amos.boot.module.tzs.api.service.IRepairConsultService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,12 +37,6 @@ import java.util.Map;
  */
 @Service
 public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,RepairConsult,RepairConsultMapper> implements IRepairConsultService {
-    /**
-     * 分页查询
-     */
-    public Page<RepairConsultDto> queryForRepairConsultPage(Page<RepairConsultDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
 
     @Autowired
     TemplateServiceImpl templateServiceImpl;
@@ -65,13 +56,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
     @Autowired
     RescueProcessServiceImpl rescueProcessServiceImpl;
 
-    /**
-     * 列表查询 示例
-     */
-    public List<RepairConsultDto> queryForRepairConsultList()   {
-        return this.queryForList("" , false);
-    }
-
+    @Transactional
     @Override
     public Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId,AgencyUserModel user) {
         Boolean flag = false;
@@ -83,17 +68,16 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
         }
         AlertCalledDto alertCalledVo  = alertCallFrom.getAlertCalledDto();
         // 获取模板 拼接json
-        QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Template> templateQueryWrapper = new LambdaQueryWrapper<>();
         if(TzsCommonParam.WXFK_TS.equals(type)) {
-            templateQueryWrapper.eq("type_code","RECORD-WXFK");
+            templateQueryWrapper.eq(Template::getTypeCode,"RECORD-" + TzsCommonParam.WXFK);
         } else {
-            templateQueryWrapper.eq("type_code","RECORD-" + type);
+            templateQueryWrapper.eq(Template::getTypeCode,"RECORD-" + type);
         }
         Template template = templateServiceImpl.getOne(templateQueryWrapper);
         String content = template.getContent();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String createTime = sdf.format(new Date());
-        if("JJ".equals(type)) {
+        String createTime = DateUtils.getDateNowString();
+        if(AlertStageEnums.JJ.getCode().equals(type)) {
             String createUser = user.getUserName();
             String emergency_call = alertCalledVo.getEmergencyCall();
             String area = alertCalledVo.getAddress();
@@ -121,11 +105,11 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
                 phone = "";
             }
             String taskType = "";
-            if("960".equals( alertCalledVo.getAlarmTypeCode())) {
+            if(AlertStageEnums.KRJY.getId().equals( alertCalledVo.getAlarmTypeCode())) {
                 taskType = "救援任务单";
-            } else if("961".equals( alertCalledVo.getAlarmTypeCode())) {
+            } else if(AlertStageEnums.GZWX.getId().equals( alertCalledVo.getAlarmTypeCode())) {
                 taskType = "故障维修单";
-            } else if("962".equals( alertCalledVo.getAlarmTypeCode())) {
+            } else if(AlertStageEnums.TSZX.getId().equals( alertCalledVo.getAlarmTypeCode())) {
                 taskType = "投诉处理单";
             }
             content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$unit",unit);

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchTaskDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.RescueProcessDto;
@@ -95,8 +96,7 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
         Date rescueTime = rescueProcessDto.getRescueTime();
         if(arriveTime != null && dispatchTime != null) {
                 Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
-                SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");//这里想要只保留分秒可以写成"mm:ss"
-                String hms = formatter.format(arriveTimes);
+                String hms = DateUtils.getTimestr(arriveTime,dispatchTime);
                 rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
                 rescueProcessDto.setArriveUseTime(hms);
         }

amos-boot-system-maintenance/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -1912,6 +1912,7 @@
                 pp.belong_system_id systemId,
                 pp.belong_system_name systemName,
                 pp.address address,
+                pp.original_id equipId,
                 CONCAT(pp.address, pp.building_name) buildingName
             FROM p_check pc
             LEFT JOIN p_point pp ON pp.id = pc.point_id
@@ -1942,6 +1943,7 @@
                 <include refid="mobile-check-time-last-month"></include>
             </if>
             <if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
+            <if test="equipId != null and equipId != '' "> and a.equipId = #{equipId}</if>
             <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''  ">
                 AND (
                 (