Merge remote-tracking branch 'origin/developer' into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -76,5 +76,20 @@ public interface WorkflowFeignService {
 	 */
 	@RequestMapping(value = "/activitiHistory/historyTask/{processInstanceId}", method = RequestMethod.GET)
 	JSONObject queryHistoryTasksByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId);
+	/**
+	 * 拾取任务
+	 * @param taskID
+	 * @return
+	 */
+	@RequestMapping(value = "/task/pickuptask/{taskID}", method = RequestMethod.GET)
+	JSONObject pickuptask(@PathVariable("taskID") String taskID) ;
+	/**
+	 * 直接完成任务
+	 * @param taskId
+	 * @param variable
+	 * @return
+	 */
+	@RequestMapping(value = "/task/complete/{taskId}", method = RequestMethod.POST)
+	JSONObject completeByVariable(@PathVariable("taskId") String taskId, @RequestBody HashMap<String, Object> variable);
 
 }

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

@@ -32,7 +32,7 @@ public class FailureMaintainDto extends BaseDto {
     private Long maintainPhone;
 
     @ApiModelProperty(value = "所属部门ID")
-    private String bizId;
+    private Long bizId;
 
     @ApiModelProperty(value = "所属部门")
     private String department;
@@ -52,7 +52,7 @@ public class FailureMaintainDto extends BaseDto {
     @ApiModelProperty(value = "附件")
     private List<SourceFile> attachment;
     
-    @ApiModelProperty(value = "审核结果条件判断，0同意，1拒绝，2驳回")
+    @ApiModelProperty(value = "审核结果条件判断，0完成，1保存")
     private String condition;
 
 }

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

@@ -44,4 +44,7 @@ public class FailureRepairlogDto extends BaseDto {
     @ApiModelProperty(value = "设备故障报修主表ID")
     private Long faultId;
 
+    @ApiModelProperty(value = "操作人中文名称")
+    private String processAuditorCid;
+
 }

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

@@ -45,7 +45,7 @@ public class FailureMaintain extends BaseEntity {
      * 所属部门ID
      */
 	@TableField("biz_id")
-    private String bizId;
+    private Long bizId;
 
     /**
      * 所属部门

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

@@ -32,6 +32,11 @@ public class FailureRepairlog extends BaseEntity {
      */
 	@TableField("process_auditor")
     private String processAuditor;
+	 /**
+     * 流程处理人
+     */
+	@TableField("process_auditor_name")
+    private String processAuditorName;
 
     /**
      * 处理人所属部门
@@ -61,4 +66,10 @@ public class FailureRepairlog extends BaseEntity {
 	@TableField("fault_id")
     private Long faultId;
 
+    /**
+     * 操作人中文名称
+     */
+    @TableField("process_auditor_name")
+    private  String processAuditorCid;
+
 }

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

@@ -150,6 +150,14 @@ public interface EquipFeignClient {
      */
     @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);
+    /**
+     *
+     *获取视频列表
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/video/getByid", method = RequestMethod.GET)
+    ResponseModel<Map<String, Object>> getByid( @RequestParam Long id);
 
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFailureRepairlogService.java

@@ -9,7 +9,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
  * @date 2021-08-12
  */
 public interface IFailureRepairlogService {
-	  public FailureRepairlog findByprocessAuditorId(Long userId);
+	  public FailureRepairlog findByprocessAuditor(String userId);
 	  
 	  public FailureRepairlog findByFaultId(Long faultId) ;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/src/main/java/com/yeejoin/amos/maintenance/core/common/response/CalendarStatusCountRespone.java

@@ -6,7 +6,7 @@ public class CalendarStatusCountRespone {
 	/**
 	 * 个数
 	 */
-	private Double count;
+	private Long count;
 	/**
 	 * 状态
 	 */
@@ -16,7 +16,7 @@ public class CalendarStatusCountRespone {
 	public double getCount() {
 		return count;
 	}
-	public void setCount(double count) {
+	public void setCount(Long count) {
 		this.count = count;
 	}
 	public String getStatus() {

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -5,7 +5,7 @@
     <select id="queryAlertStatusCount" resultType="java.util.Map">
         SELECT
         count( 1 ) calledCount,
-        sum( CASE WHEN father_alert = null THEN 1 ELSE 0 END ) majorAlertCount,
+        sum( CASE WHEN father_alert is null THEN 1 ELSE 0 END ) majorAlertCount,
         sum( CASE WHEN alarm_type_code = 'KRJY' THEN 1 ELSE 0 END ) sleepyIncidentCount,
         sum( CASE WHEN alarm_type_code = 'GZWX'  THEN 1 ELSE 0 END ) faultRescueCount,
         sum( CASE WHEN alarm_type_code = 'TSZX'  THEN 1 ELSE 0 END ) suggestionsCount

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

@@ -256,7 +256,18 @@ public class CommandController extends BaseController {
     }
 
 
-
+    /**
+     * 水源列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation( needAuth = true, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "video/{id}")
+    @ApiOperation(httpMethod = "GET", value = " 视频详情88", notes = "视频详情88")
+    public ResponseModel<Object> getVideoByid(@PathVariable Long id) {
+        ResponseModel<Map<String, Object>> data=  equipFeignClient.getByid(id);
+        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/constats/Constants.java

@@ -14,5 +14,6 @@ public class Constants {
         currentStatusNameMap.put(3,"待验收");
         currentStatusNameMap.put(4,"已拒绝");
         currentStatusNameMap.put(5,"已完结");
+        currentStatusNameMap.put(6,"维修中");
     }
 }

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

@@ -194,4 +194,11 @@ public class FailureDetailsController extends BaseController {
 		return ResponseHelper.buildResponse(failureDetailsServiceImpl.getExcuteTaskAuthButton(sequenceNbr, getSelectedOrgInfo()));
 		
 	}
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "查询当前任务详情",   notes = "查询当前任务详情")
+	@GetMapping(value = "/getCurrentTask{sequenceNbr}")
+	public ResponseModel<Object> getCurrentTask(@PathVariable Long sequenceNbr) {
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.getCurrentTask(sequenceNbr));
+		
+	}
 }

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

@@ -39,8 +39,7 @@ public class FailureMaintainController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
 	public ResponseModel<Object> save(@RequestBody FailureMaintainDto model) {
-	    failureMaintainServiceImpl.savemodel(model,getSelectedOrgInfo());
-	    return ResponseHelper.buildResponse(model);
+	    return ResponseHelper.buildResponse(failureMaintainServiceImpl.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/service/impl/FailureAuditServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
@@ -25,6 +26,9 @@ import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureAuditMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureAuditService;
 
+import static com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl.EMERGENCY_COMMAND;
+import static com.yeejoin.amos.boot.module.common.biz.service.impl.FailureDetailsServiceImpl.PROCESS_NAME;
+
 /**
  * 服务实现类
  *
@@ -60,22 +64,25 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 发起审核
      */
     @Transactional
-    public Object savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
+    public Object savemodel(FailureAuditDto model, ReginParams userInfo) {
 
         int condition = Integer.parseInt(model.getCondition());
         model.setAuditTime(new Date());
         model.setAuditDepartmentId(userInfo.getDepartment().getSequenceNbr());
-        model.setAuditor(userInfo.getRole().getRoleName());
+        model.setAuditor(userInfo.getUserModel().getUserName());
         model.setAuditDepartment(userInfo.getDepartment().getDepartmentName());
 
+        FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         try {
             //根据审核的结果进行业务操作
-            if (condition == AuditResultEnum.AGREE.getCode()) {
-                updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo,condition);
+            if (condition == AuditResultEnum.AGREE.getCode()  && userInfo.getDepartment().getSequenceNbr().equals(failureDetailsDto.getBizCode())) {
+                updateStatus(model, FailureStatuEnum.WAITING_AUDIT, userInfo,condition);
             } else if (condition == (AuditResultEnum.REFUSE.getCode())) {
                 updateStatus(model, FailureStatuEnum.REFUSE, userInfo,condition);
             } else if (condition == (AuditResultEnum.SEND_BACK.getCode())) {
                 updateStatus(model, FailureStatuEnum.WAITING_SUBMIT, userInfo,condition);
+            } else if  (condition == AuditResultEnum.AGREE.getCode() ) {
+                updateStatus(model, FailureStatuEnum.WAITING_MAINTAIN, userInfo,condition);
             }
 
             FailureAuditDto withModel = this.createWithModel(model);
@@ -99,15 +106,16 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(model.getFaultId());
         //当前角色部门id为应急指挥科的时候 并且同意时 不修改主表状态 依然为待审核
         //当前角色部门id为维修部门的时候 修改状态
-        if (userInfo.getDepartment().getSequenceNbr() == failureDetailsDto.getBizCode()
-                && condition == AuditResultEnum.AGREE.getCode()){
+
+        /*Map<String, Object> stringObjectMap = failureDetailsService.checkExcuteTaskAuthMap(failureDetailsDto.getSequenceNbr(), userInfo);
+        String  name = stringObjectMap.get("name").toString();
+        if (name.contains(EMERGENCY_COMMAND)) {
             failureDetailsDto.setCurrentStatus(failureDetailsDto.getCurrentStatus());
-        }else if (userInfo.getDepartment().getSequenceNbr() != failureDetailsDto.getBizCode()
-                ) {
+        }*/
         failureDetailsDto.setCurrentStatus(status.getCode());
-        }
         failureDetailsDto.setSequenceNbr(model.getFaultId());
-        failureDetailsService.updateWithModel(failureDetailsDto);
+        FailureDetailsDto failureDetailsDtos = failureDetailsService.updateWithModel(failureDetailsDto);
+        System.out.println(failureDetailsDtos);
 
         String conditionText;
         boolean result = failureDetailsService.checkExcuteTaskAuth(failureDetailsDto.getSequenceNbr(), userInfo);
@@ -118,18 +126,17 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
             String processDepartment = model.getAuditDepartment();
             String processAuditor = model.getAuditor();
             Integer processAuditorId =Integer.parseInt(userInfo.getUserModel().getUserId()) ;
+            String processAuditorCid = userInfo.getUserModel().getUserName();
             Long auditDepartmentId = (userInfo.getDepartment().getSequenceNbr());
             if (condition == AuditResultEnum.AGREE.getCode()  ) {
                 conditionText = AuditResultEnum.AGREE.getName();
-                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
-            }
-            if (condition == AuditResultEnum.SEND_BACK.getCode()) {
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText,processAuditorCid);
+            } else if (condition == AuditResultEnum.SEND_BACK.getCode()) {
                 conditionText = AuditResultEnum.SEND_BACK.getName();
-                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
-            }
-            if (condition == AuditResultEnum.REFUSE.getCode()){
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText,processAuditorCid);
+            } else if (condition == AuditResultEnum.REFUSE.getCode()){
                 conditionText = AuditResultEnum.REFUSE.getName();
-                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText);
+                repairlog(faultId,processAuditor,processAuditorId,auditDepartmentId,processTime,processDepartment,conditionText,processAuditorCid);
             }
             failureDetailsService.excuteTask(failureDetailsDto.getProcessId(), userInfo,condition+"");
             return true;
@@ -141,7 +148,8 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      * 添加报修日志
      */
     @Transactional
-    public void repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId,Date processTime, String processDepartment, String processResult) {
+    public Boolean repairlog(Long faultId, String processAuditor,Integer processAuditorId,Long departmentId,Date processTime,
+                          String processDepartment, String processResult,String processAuditorCid) {
         FailureRepairlogDto failureRepairlogDto = new FailureRepairlogDto();
         failureRepairlogDto.setFaultId(faultId);
         failureRepairlogDto.setProcessAuditor(processAuditor);
@@ -150,7 +158,12 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
         failureRepairlogDto.setProcessTime(processTime);
         failureRepairlogDto.setProcessDepartment(processDepartment);
         failureRepairlogDto.setProcessResult(processResult);
+        failureRepairlogDto.setProcessAuditorCid(processAuditorCid);
         failureRepairlogService.createWithModel(failureRepairlogDto);
+        if (ObjectUtils.isNotEmpty(failureRepairlogDto)){
+            return true;
+        }
+        return false;
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -21,6 +22,7 @@ import com.yeejoin.amos.boot.module.common.api.service.IFailureRepairlogService;
  * @date 2021-08-12
  */
 @Service
+@Transactional
 public class FailureRepairlogServiceImpl extends BaseService<FailureRepairlogDto,FailureRepairlog,FailureRepairlogMapper> implements IFailureRepairlogService {
     /**
      * 分页查询
@@ -47,9 +49,9 @@ public class FailureRepairlogServiceImpl extends BaseService<FailureRepairlogDto
     }
     
     
-    public FailureRepairlog findByprocessAuditorId(Long userId) {
-         QueryWrapper<FailureRepairlog> queryWrapper = new QueryWrapper<FailureRepairlog>();
-         queryWrapper.eq("process_auditor_id", userId);
+    public FailureRepairlog findByprocessAuditor(String userId) {
+         LambdaQueryWrapper<FailureRepairlog> queryWrapper = new LambdaQueryWrapper<FailureRepairlog>();
+         queryWrapper.eq(FailureRepairlog::getProcessAuditor, userId);
          queryWrapper.last("LIMIT 1");
          return  baseMapper.selectOne(queryWrapper);
     }

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

+package com.yeejoin.amos.maintenance.business.controller;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.maintenance.business.service.intfc.IStatisticsService;
+import com.yeejoin.amos.maintenance.business.util.CommonResponse;
+import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
+import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+@RestController
+@RequestMapping(value = "/api/statistics")
+@Api(tags = "统计api")
+public class StatisticsController extends AbstractBaseController {
+
+    @Autowired
+    IStatisticsService iStatisticsService;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PersonIdentify
+    @GetMapping(value = "/task")
+    @ApiOperation(value = "app首页任务统计")
+    public CommonResponse taskStatusStatistics(){
+        ReginParams reginParams = getSelectedOrgInfo();
+        String loginOrgCode = getOrgCode(reginParams);
+        Map<String,Object> result = iStatisticsService.taskStatusStatistics(opIdentifyInfo(),loginOrgCode);
+        return CommonResponseUtil.success(result);
+    }
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/dao/mapper/PlanTaskMapper.java

@@ -179,4 +179,5 @@ public interface PlanTaskMapper extends BaseMapper {
 	List<Map<String, Object>> queryTimeAxis(HashMap<String, Object> params);
 
 
+    List<Map<String, Object>> statisticsTaskWithAuth(Map<String, Object> param);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/EquipFeign.java

 package com.yeejoin.amos.maintenance.business.feign;
 
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -37,5 +34,14 @@ public interface EquipFeign {
      */
     @RequestMapping(value = "${equip.fegin.prefix}"+"/area/tree", method = RequestMethod.GET ,consumes="application/json")
     LinkedHashMap<String,Object> getRegionTress();
+
+    /**
+     * 查询维保到期设备
+     * @param type
+     * @param companyId
+     * @return
+     */
+    @GetMapping(value = "${equip.fegin.prefix}+/facility")
+    List<Map<String,Object>> overTimeMaintenanceFacility(@RequestParam String type,String companyId);
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/Remote3D.java

-package com.yeejoin.amos.maintenance.business.feign;
-
-//@RequestLine
-//@FeignClient(name = "${Remote3D.fegin.name}",configuration=FeignConfiguration.class)
-//public interface Remote3D {
-//	@RequestMapping(value = "/patrol/check", method = RequestMethod.POST)
-//	@ResponseBody
-//	CommonResponse checkStatusPush( @RequestBody List<PointCheckInfoRespone> pointCheckInfo);
-//
-//    
-//   @RequestMapping(value = "/patrol/task", method = RequestMethod.POST)
-//    CommonResponse errorTaskPushTo3D( @RequestBody List<TaskInfoRespone> taskInfoRespone);
-//    
-//    
-//    @RequestMapping(value = "/view3d/synchronous/points", method = RequestMethod.POST)
-//    CommonResponse pointInfoPush( @RequestBody List<PointInfoSyn3DRespone> pointInfoResponseList);
-//    
-//    
-//    @RequestMapping(value = "/view3d/synchronous/routes", method = RequestMethod.POST)
-//    CommonResponse routeInfoPush( @RequestBody List<RouteResponse> routeResponseList);
-//    
-//    
-//    
-//   
-//    
-//    
-//    
-//}
-
-
-		    
-	
-	  
-	    
-	    
-	    
-

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/feign/Remote3DServer.java

-//package com.yeejoin.amos.maintenance.business.feign;
-//
-//import java.util.List;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.http.HttpEntity;
-//import org.springframework.http.HttpHeaders;
-//import org.springframework.http.MediaType;
-//import org.springframework.stereotype.Service;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.client.RestTemplate;
-//
-//import com.yeejoin.amos.maintenance.business.util.CommonResponse;
-//import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
-//import com.yeejoin.amos.maintenance.core.common.response.PointCheckInfoRespone;
-//import com.yeejoin.amos.maintenance.core.common.response.PointInfoSyn3DRespone;
-//import com.yeejoin.amos.maintenance.core.common.response.RouteResponse;
-//import com.yeejoin.amos.maintenance.core.common.response.TaskInfoRespone;
-//
-//
-//
-////三维远程访问
-//@Service("remote3DServer")
-//public class Remote3DServer {
-//	    @Autowired
-//	    private RestTemplate restTemplate;
-//	
-//	    @Value("${Remote3D.fegin.name}")
-//	    private String Remote3DFeginName;
-//
-//
-//	    private static String checkStatusPush = "/patrol/check";
-//
-//	    private static String errorTaskPushTo3D = "/patrol/task";
-//
-//	    private static String pointInfoPush = "/view3d/synchronous/points";
-//
-//	    private static String routeInfoPush = "/view3d/synchronous/routes";
-//	    
-//	   
-//	    
-//	    public  String geturls(String url){
-//	    	return "http://"+Remote3DFeginName+url;
-//	    }
-//	    public  HttpHeaders getHeader(String toke,String product,String appKey){
-//	    	HttpHeaders headers = new HttpHeaders();
-//		    headers.setContentType(MediaType.APPLICATION_JSON);
-//		    headers.set("Content-Type", "application/json");  
-//		    headers.set("token", toke);
-//		    headers.set("product",product);
-//		    headers.set("appKey", appKey);
-//		    return headers;
-//	    } 
-//	    
-//	    
-//		public CommonResponse checkStatusPush( String toke,String product,String appKey, List<PointCheckInfoRespone> pointCheckInfo){
-//			  try {
-//			    HttpEntity httpEntity = new HttpEntity<>(pointCheckInfo, getHeader( toke, product, appKey));
-//			    CommonResponse commonResponse1 =  restTemplate.postForObject(geturls(checkStatusPush),httpEntity, CommonResponse.class);
-//				return commonResponse1;
-//				} catch (Exception e) {
-//				e.printStackTrace();	 
-//				 return CommonResponseUtil.failure("发送失败");	
-//				 
-//				}
-//		}
-//
-//	    
-//	 
-//		public CommonResponse errorTaskPushTo3D( String toke,String product,String appKey, List<TaskInfoRespone> taskInfoRespone){
-//			 try {
-//				    HttpEntity httpEntity = new HttpEntity<>(taskInfoRespone, getHeader( toke, product, appKey));
-//				    CommonResponse commonResponse1 =  restTemplate.postForObject(geturls(errorTaskPushTo3D),httpEntity, CommonResponse.class);
-//					return commonResponse1;
-//					} catch (Exception e) {
-//					e.printStackTrace();	 
-//					 return CommonResponseUtil.failure("发送失败");	
-//					 
-//					}
-//		}
-//	    
-//	    
-//	    public CommonResponse pointInfoPush(String toke,String product,String appKey,List<PointInfoSyn3DRespone> pointInfoResponseList){
-//	    	 try {
-//				    HttpEntity httpEntity = new HttpEntity<>(pointInfoResponseList, getHeader( toke, product, appKey));
-//				    CommonResponse commonResponse1 =  restTemplate.postForObject(geturls(pointInfoPush),httpEntity, CommonResponse.class);
-//					return commonResponse1;
-//					} catch (Exception e) {
-//					e.printStackTrace();	 
-//					 return CommonResponseUtil.failure("发送失败");	
-//					 
-//					}
-//	    }
-//	    
-//	    
-//	    public CommonResponse routeInfoPush( String toke,String product,String appKey, List<RouteResponse> routeResponseList){
-//	    	 try {
-//				    HttpEntity httpEntity = new HttpEntity<>(routeResponseList, getHeader( toke, product, appKey));
-//				    CommonResponse commonResponse1 =  restTemplate.postForObject(geturls(routeInfoPush),httpEntity, CommonResponse.class);
-//					return commonResponse1;
-//					} catch (Exception e) {
-//					e.printStackTrace();	 
-//					 return CommonResponseUtil.failure("发送失败");	
-//					 
-//					}
-//	    }
-//	    
-//	    
-//	    
-//	     
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	    
-//	
-//}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/StatisticsServiceImpl.java

+package com.yeejoin.amos.maintenance.business.service.impl;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.maintenance.business.dao.mapper.PlanTaskMapper;
+import com.yeejoin.amos.maintenance.business.feign.EquipFeign;
+import com.yeejoin.amos.maintenance.business.service.intfc.IStatisticsService;
+import com.yeejoin.amos.maintenance.common.enums.PlanTaskDetailIsFinishEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author DELL
+ */
+@Service
+public class StatisticsServiceImpl implements IStatisticsService {
+
+    @Autowired
+    PlanTaskMapper planTaskMapper;
+    @Autowired
+    EquipFeign equipFeign;
+
+    @Override
+    public Map<String, Object> taskStatusStatistics(ReginParams.PersonIdentity opIdentifyInfo, String orgCode) {
+        Map<String, Object> param = Bean.BeantoMap(opIdentifyInfo);
+        param.put("orgCode", orgCode);
+        List<Map<String, Object>> list = planTaskMapper.statisticsTaskWithAuth(param);
+        Map<Integer, Long> statusNumberMap = list.stream().collect(Collectors.toMap(map -> Integer.parseInt(map.get("is_finish").toString()), v -> Long.parseLong(v.get("total").toString())));
+        Map<String, Object> resultMap = new HashMap<>();
+        // 待执行任务数量
+        resultMap.put("waitExecuteTask", statusNumberMap.get(PlanTaskDetailIsFinishEnum.UNFINISHED.getValue()) == null ? 0L : statusNumberMap.get(PlanTaskDetailIsFinishEnum.UNFINISHED.getValue()));
+        // 超时任务数量
+        resultMap.put("overTimeTask", statusNumberMap.get(PlanTaskDetailIsFinishEnum.OVERTIME.getValue()) == null ? 0L : statusNumberMap.get(PlanTaskDetailIsFinishEnum.OVERTIME.getValue()));
+        List<Map<String, Object>> overTimeFacility = new ArrayList<>();
+        //overTimeFacility = equipFeign.overTimeMaintenanceFacility(opIdentifyInfo.getIdentityType(),opIdentifyInfo.getCompanyId());
+        // 到期维保设备
+        resultMap.put("overTimeFacility", overTimeFacility.size());
+        return resultMap;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/IStatisticsService.java

+package com.yeejoin.amos.maintenance.business.service.intfc;
+
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+public interface IStatisticsService {
+    /**
+     * 维保任务统计
+     * @return Map<String, Object>
+     */
+    Map<String, Object> taskStatusStatistics(ReginParams.PersonIdentity opIdentifyInfo, String loginOrgCode);
+}

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

@@ -3,7 +3,6 @@ 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;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -218,21 +217,21 @@ public class AlertCalledController extends BaseController {
             // 当天接警
             alarmStatisticsDto.setTodayAlarmNum(map.get("calledCount") == null  ? 0 : Integer.valueOf(map.get("calledCount").toString()))   ;
             //当天提交
-            alarmStatisticsDto.setTodayAlarmNum(map.get("majorAlertCount") == null  ? 0 : Integer.valueOf(map.get("majorAlertCount").toString()))   ;
+            alarmStatisticsDto.setSubmitNum(map.get("majorAlertCount") == null  ? 0 : Integer.valueOf(map.get("majorAlertCount").toString()))   ;
             //投诉咨询数量
             alarmStatisticsDto.setSuggestions(map.get("suggestionsCount") == null  ? 0 : Integer.valueOf(map.get("suggestionsCount").toString()))   ;
             //故障维修数量
-            alarmStatisticsDto.setSuggestions(map.get("faultRescueCount") == null  ? 0 : Integer.valueOf(map.get("faultRescueCount").toString()))   ;
+            alarmStatisticsDto.setFaultRescue(map.get("faultRescueCount") == null  ? 0 : Integer.valueOf(map.get("faultRescueCount").toString()))   ;
             //困人救援数量
-            alarmStatisticsDto.setSuggestions(map.get("sleepyIncidentCount") == null  ? 0 : Integer.valueOf(map.get("sleepyIncidentCount").toString()))   ;
+            alarmStatisticsDto.setSleepyIncident(map.get("sleepyIncidentCount") == null  ? 0 : Integer.valueOf(map.get("sleepyIncidentCount").toString()))   ;
 
             Map<String,Integer> recordMap = Maps.newHashMap();
             // 近七天办理数量
             for(int i = 1 ; i < 8; i++) {
-				Map<String, Object> nearlySevenDaysMap =    iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 00:00:00",
-						DateUtils.stampToDate(System.currentTimeMillis(),"yyyy-MM-dd")+" 23:59:59",null,
+				Map<String, Object> nearlySevenDaysMap =    iAlertCalledService.getAlertInfoList(DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), -i).getTime(),"yyyy-MM-dd")+" 00:00:00",
+						DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), -i).getTime(),"yyyy-MM-dd")+" 23:59:59",null,
 						getUserInfo().getUserId());
-                recordMap.put(DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),""),nearlySevenDaysMap.get("calledCount") == null  ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString()));
+                recordMap.put(DateUtils.stampToDate(DateUtils.dateAddDays(new Date(), -i).getTime(),"yyyy-MM-dd"),nearlySevenDaysMap.get("calledCount") == null  ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString()));
             }
             alarmStatisticsDto.setNearlySevenDaysNum(recordMap);
 		}

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

@@ -833,4 +833,24 @@
 		ORDER BY
 		ppk.begin_time DESC  LIMIT 60
 	</select>
+    <select id="statisticsTaskWithAuth" resultType="java.util.Map">
+		SELECT
+			count(1) as total,
+			td.is_finish
+		from p_plan_task_detail td ,
+			 p_plan_task t,
+			 p_route r
+		where
+		      td.task_no = t.id
+		  and t.route_id = r.id
+		<choose>
+			<when test="identityType==1">
+				and (t.org_code LIKE CONCAT( #{orgCode}, '-%' ) or t.org_code= #{orgCode} )
+			</when>
+			<when test="identityType==2">
+				And r.owner_id = #{companyId}
+			</when>
+		</choose>
+		GROUP BY td.is_finish
+	</select>
 </mapper>
\ No newline at end of file