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/workflow/enums/WorkFlowUriEnum.java

-package com.yeejoin.amos.boot.biz.common.workflow.enums;
-
-public enum WorkFlowUriEnum {
-
-    启动流程("启动流程", "/workflow/task/startTask", ""),
-    流程详情("流程详情", "/workflow/task/{taskId}", "taskId"),
-    合并启动流程("合并启动流程", "/workflow/task/startProcess", ""),
-    所有已执行任务详情("所有已执行任务详情","/workflow/activitiHistory/task/detail/{taskId}","taskId"),
-    流程任务("流程任务", "/workflow/task?processInstanceId={processInstanceId}", "processInstanceId"),
-    我的代办("我的代办", "/workflow/task/all-list?processDefinitionKey={processDefinitionKey}", "processDefinitionKey"),
-    我的代办有ID("我的代办有ID", "/workflow/task/all-list?processDefinitionKey={processDefinitionKey}&userId={userId}", "processDefinitionKey,userId"),
-    已执行任务("已执行任务", "/workflow/activitiHistory/all-historytasks?processDefinitionKey={processDefinitionKey}", "processDefinitionKey"),
-    已执行任务有ID("已执行任务有ID", "/workflow/activitiHistory/all-historytasks?processDefinitionKey={processDefinitionKey}&userId={userId}", "processDefinitionKey,userId"),
-    启动免登录流程("启动免登录流程", "/processes/{appKey}", "appKey"),
-    当前节点("当前节点", "/wf/taskstodo?processInstanceId={processInstanceId}", "processInstanceId"),
-    执行流程("执行流程", "/workflow/task/pickupAndCompleteTask/{taskId}", "taskId"),
-    终止流程("终止流程", "/wf/processes/{processInstanceId}?deleteReason={deleteReason}", "processInstanceId,deleteReason"),
-    当前子节点("当前子节点", "/wf/processes/{processInstanceId}/tasks?taskDefinitionKey={taskDefinitionKey}", "processInstanceId,taskDefinitionKey"),
-    工作流流水("工作流流水","/wf/processes/{processInstanceId}/tasks", "processInstanceId"),
-    子节点信息("子节点信息","/workflow/task/list/all/{instanceId}", "instanceId"),
-	所有已执行任务集合("所有已执行任务集合","/workflow/activitiHistory/tasks/{processInstanceId}", "processInstanceId");
-
-    private String desc;
-
-    private String uri;
-
-    private String params;
-
-    WorkFlowUriEnum(String desc, String uri, String params) {
-        this.desc = desc;
-        this.uri = uri;
-        this.params = params;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public String getParams() {
-        return params;
-    }
-
-    public void setParams(String params) {
-        this.params = params;
-    }
-}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/enums/YesOrNoEnum.java

-package com.yeejoin.amos.boot.biz.common.workflow.enums;
-
-/**
- * 是否枚举
- * @author WJK
- *
- */
-public enum YesOrNoEnum {
-
-	NO("否","0"),
-	YES("是","1" );
-
-
-	/**
-	 * 名称，描述
-	 */
-	private String name;
-	/**
-	 * 编码
-	 */
-	private String code;
-
-	private YesOrNoEnum(String name, String code){
-		this.name = name;
-		this.code = code;
-	}
-
-	public static YesOrNoEnum getEnum(String code) {
-		YesOrNoEnum jPushTypeEnum = null;
-		for(YesOrNoEnum type: YesOrNoEnum.values()) {
-			if (type.getCode().equals(code)) {
-				jPushTypeEnum = type;
-				break;
-			}
-		}
-
-		return jPushTypeEnum;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-}

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

+package com.yeejoin.amos.boot.biz.common.workflow.feign;
+
+import feign.codec.Encoder;
+import feign.form.spring.SpringFormEncoder;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.SpringEncoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Author: xl
+ * @Description:
+ * @Date: 2020/3/30 16:26
+ */
+@Configuration
+public class CommonMultipartSupportConfig {
+
+    @Autowired
+    private ObjectFactory<HttpMessageConverters> messageConverters;
+
+    @Bean
+    public Encoder feignCommonFormEncoder() {
+        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+    }
+}

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

+package com.yeejoin.amos.boot.biz.common.workflow.feign;
+
+import java.util.HashMap;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.alibaba.fastjson.JSONObject;
+
+@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = { CommonMultipartSupportConfig.class })
+public interface WorkflowFeignService {
+	/**
+	 * 发起流程
+	 * 
+	 * @param params
+	 * @return
+	 */
+	@RequestMapping(value = "/task/startProcess", method = RequestMethod.POST)
+	JSONObject startByVariable(@RequestBody Object params);
+
+	/**
+	 * 完成任务
+	 * 
+	 * @param taskID
+	 * @param variable
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/task/pickupAndCompleteTask/{taskId}", method = RequestMethod.POST)
+	JSONObject pickupAndCompleteTask(@PathVariable("taskId") String taskID,
+			@RequestBody(required = false) HashMap<String, Object> variable) throws Exception;
+
+	/**
+	 * 查询当前流程下所有的可执行任务
+	 * 
+	 * @param processInstanceId
+	 * @return
+	 */
+	@RequestMapping(value = "/task/list/all/{processInstanceId}", method = RequestMethod.GET)
+	JSONObject getTaskList(@PathVariable("processInstanceId") String processInstanceId);
+
+	/**
+	 * 查询当前任务的执行用户组
+	 * 
+	 * @param processInstanceId
+	 * @return
+	 */
+	@RequestMapping(value = "/getTaskGroupName/{taskId}", method = RequestMethod.GET)
+	JSONObject getTaskGroupName(@PathVariable("taskId") String taskId);
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/AlarmStatisticsVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlarmStatisticsDto.java

-package com.yeejoin.amos.boot.module.tzs.api.vo;
+package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,8 +14,8 @@ import java.util.Map;
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value = "AlarmStatisticsVo", description = "AlarmStatisticsVo")
-public class AlarmStatisticsVo {
+@ApiModel(value = "AlarmStatisticsDto", description = "AlarmStatisticsDto")
+public class AlarmStatisticsDto {
 
     @ApiModelProperty(value = "我的待办数量")
     private Integer todoNum;

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

@@ -127,14 +127,15 @@ public class AlertCalledDto  extends BaseDto {
     @ApiModelProperty(value = "警情地址")
     private String alertAddress;
 
-    /**
-     * 工单编号
-     */
+    @ApiModelProperty(value = "响应级别")
+    private String responseLevel;
+
     @ApiModelProperty("工单编号")
     private String workOrderNumber;
 
     @ApiModelProperty(value = "接警时间str")
     private String callTimeStr;
-    @ApiModelProperty(value = "接警人")
-    protected String recUserName;
+
+//    @ApiModelProperty(value = "接警人")
+//    protected String recUserName;
 }

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

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
-import com.yeejoin.amos.boot.module.tzs.api.vo.AlertCalledVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,14 +20,14 @@ public class AlertCalledFormDto extends BaseDto{
 	private static final long serialVersionUID = 1L;
 
 	@ApiModelProperty(value = "警情基本信息")
-	    private AlertCalledVo alertCalledVo;
+	    private AlertCalledDto alertCalledDto;
 
 	    @ApiModelProperty(value = "动态表单值")
 	    private List<FormValue> dynamicFormAlert;
 
 
-	public AlertCalledFormDto(AlertCalledVo alertCalledVo, List<FormValue> formValue) {
-		this.alertCalledVo = alertCalledVo;
+	public AlertCalledFormDto(AlertCalledDto alertCalledDto, List<FormValue> formValue) {
+		this.alertCalledDto = alertCalledDto;
 		this.dynamicFormAlert = formValue;
 	}
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/DutyPersonVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/DutyPersonDto.java

-package com.yeejoin.amos.boot.module.tzs.api.vo;
+package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,8 +11,8 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value = "DutyPersonVo", description = "负责人VO")
-public class DutyPersonVo {
+@ApiModel(value = "DutyPersonDto", description = "负责人DTO")
+public class DutyPersonDto {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,6 +10,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author tb
@@ -203,14 +206,11 @@ public class ElevatorDto extends BaseDto {
     @ApiModelProperty(value = "功率")
     private String power;
 
-    @ApiModelProperty(value = "设备图片")
-    private String photos;
-
     @ApiModelProperty(value = "原始表id（来自历史数据库）")
     private String originalId;
 
-   // @ApiModelProperty(value = "附件")
-    //private Map<String, List<AttachmentDto>> attachments;
+    @ApiModelProperty(value = "附件")
+    private Map<String, List<AttachmentDto>> attachments;
 
     @ApiModelProperty(value = "经度")
     private String longitude;

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

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01
@@ -20,7 +22,6 @@ import lombok.experimental.Accessors;
 public class MaintenanceUnitDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "统一社会信用代码")
     private String socialCreditCode;
 
@@ -93,4 +94,6 @@ public class MaintenanceUnitDto extends BaseDto {
     @ApiModelProperty(value = "原始表id（来自历史数据库）")
     private String originalId;
 
+    @ApiModelProperty(value = "人员信息")
+    List<DutyPersonDto> dutyPersonList;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/MaintenanceUnitNameVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/MaintenanceUnitNameDto.java

-package com.yeejoin.amos.boot.module.tzs.api.vo;
+package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -16,10 +16,8 @@ import lombok.experimental.Accessors;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_maintenance_unit")
-@ApiModel(value = "MaintenanceUnitNameVo", description = "MaintenanceUnitNameVo")
-public class MaintenanceUnitNameVo extends BaseEntity {
+@ApiModel(value = "MaintenanceUnitNameDto", description = "MaintenanceUnitNameDto")
+public class MaintenanceUnitNameDto extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01
@@ -20,7 +22,6 @@ import lombok.experimental.Accessors;
 public class RescueStationDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "应急救援机构名称")
     private String name;
 
@@ -75,4 +76,6 @@ public class RescueStationDto extends BaseDto {
     @ApiModelProperty(value = "距离")
     private String distance;
 
+    @ApiModelProperty(value = "人员信息")
+    List<DutyPersonDto> dutyPersonList;
 }

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

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01
@@ -20,7 +22,6 @@ import lombok.experimental.Accessors;
 public class UseUnitDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "统一社会信用代码")
     private String socialCreditCode;
 
@@ -72,4 +73,6 @@ public class UseUnitDto extends BaseDto {
     @ApiModelProperty(value = "原始表id（来自历史数据库）")
     private String originalId;
 
+    @ApiModelProperty(value = "人员信息")
+    List<DutyPersonDto> dutyPersonList;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/ElevatorDto.java

+//package com.yeejoin.amos.boot.module.tzs.api.vo;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//import lombok.experimental.Accessors;
+//
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * @author tb
+// * @date 2021-06-01
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = true)
+//@Accessors(chain = true)
+//@TableName("tcb_elevator")
+//@ApiModel(value = "ElevatorDto", description = "ElevatorDto")
+//public class ElevatorDto extends BaseEntity {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//
+//    @ApiModelProperty(value = "电梯应急救援识别码")
+//    private Integer rescueCode;
+//
+//    @ApiModelProperty(value = "设备注册代码")
+//    private String registerCode;
+//
+//    @ApiModelProperty(value = "所属省")
+//    private String province;
+//
+//    @ApiModelProperty(value = "所属地市")
+//    private String city;
+//
+//    @ApiModelProperty(value = "所属区县")
+//    private String district;
+//
+//    @ApiModelProperty(value = "所属区域代码")
+//    private String regionCode;
+//
+//    @ApiModelProperty(value = "安装地址")
+//    private String address;
+//
+//    @ApiModelProperty(value = "内部编号")
+//    private String innerNum;
+//
+//    @ApiModelProperty(value = "电梯品牌")
+//    private String brand;
+//
+//    @ApiModelProperty(value = "出厂编号")
+//    private String factoryNum;
+//
+//    @ApiModelProperty(value = "电梯安装单位")
+//    private String installationUnit;
+//
+//    @ApiModelProperty(value = "制造日期（出厂时间）")
+//    private Date factoryDate;
+//
+//    @ApiModelProperty(value = "电梯大修/改造日期")
+//    private Date overhaulDate;
+//
+//    @ApiModelProperty(value = "开始使用日期")
+//    private Date startUseDate;
+//
+//    @ApiModelProperty(value = "设备类别")
+//    private String category;
+//
+//    @ApiModelProperty(value = "使用场所分类")
+//    private String useSiteCategory;
+//
+//    @ApiModelProperty(value = "电梯型号")
+//    private String model;
+//
+//    @ApiModelProperty(value = "电梯层数")
+//    private Integer floors;
+//
+//    @ApiModelProperty(value = "电梯站数")
+//    private Integer stations;
+//
+//    @ApiModelProperty(value = "电梯门数")
+//    private Integer doors;
+//
+//    @ApiModelProperty(value = "电梯额定速度(单位：m/s)")
+//    private Float ratedSpeed;
+//
+//    @ApiModelProperty(value = "电梯额定载重量(单位：kg)")
+//    private Float ratedLoad;
+//
+//    @ApiModelProperty(value = "最大荷载人数")
+//    private Integer maxPersonLoad;
+//
+//    @ApiModelProperty(value = "提升高度")
+//    private Float raiseHeight;
+//
+//    @ApiModelProperty(value = "拖动方式")
+//    private String dragMode;
+//
+//    @ApiModelProperty(value = "电梯使用状态")
+//    private Integer useStatus;
+//
+//    @ApiModelProperty(value = "使用单位")
+//    private String useUnit;
+//
+//    @ApiModelProperty(value = "使用单位id")
+//    private Long useUnitId;
+//
+//    @ApiModelProperty(value = "制造单位名称")
+//    private String manufacturerName;
+//
+//    @ApiModelProperty(value = "制造许可编号")
+//    private String manufacturingLicense;
+//
+//    @ApiModelProperty(value = "维保类型")
+//    private String maintainType;
+//
+//    @ApiModelProperty(value = "维护周期")
+//    private String maintainPeriod;
+//
+//    @ApiModelProperty(value = "维保单位")
+//    private String maintainUnit;
+//
+//    @ApiModelProperty(value = "维保单位id")
+//    private Long maintainUnitId;
+//
+//    @ApiModelProperty(value = "维保负责人")
+//    private String maintainLeader;
+//
+//    @ApiModelProperty(value = "维保负责人id")
+//    private Long maintainLeaderId;
+//
+//    @ApiModelProperty(value = "维保负责人手机")
+//    private String maintainLeaderPhone;
+//
+//    @ApiModelProperty(value = "主机模式")
+//    private String hostModel;
+//
+//    @ApiModelProperty(value = "主机编号")
+//    private String hostNum;
+//
+//    @ApiModelProperty(value = "动力类型")
+//    private String engineType;
+//
+//    @ApiModelProperty(value = "动力编号")
+//    private String engineNum;
+//
+//    @ApiModelProperty(value = "面板模型")
+//    private String panelModel;
+//
+//    @ApiModelProperty(value = "面板编号")
+//    private String panelNum;
+//
+//    @ApiModelProperty(value = "级联模型")
+//    private String cascadeModel;
+//
+//    @ApiModelProperty(value = "级联线路模型")
+//    private String cascadeLineModel;
+//
+//    @ApiModelProperty(value = "扶手带类型")
+//    private String handrailType;
+//
+//    @ApiModelProperty(value = "扶手面板模型")
+//    private String handrailPanelModel;
+//
+//    @ApiModelProperty(value = "扶手面板品牌")
+//    private String handrailPanelBrand;
+//
+//    @ApiModelProperty(value = "滚转机模式")
+//    private String rollerMode;
+//
+//    @ApiModelProperty(value = "倾斜的角度")
+//    private String tiltAngle;
+//
+//    @ApiModelProperty(value = "横向跨度")
+//    private String horizontalSpan;
+//
+//    @ApiModelProperty(value = "运行噪音")
+//    private String runningNoise;
+//
+//    @ApiModelProperty(value = "运行方式")
+//    private String runningMode;
+//
+//    @ApiModelProperty(value = "运行振动")
+//    private String runningVibration;
+//
+//    @ApiModelProperty(value = "功率")
+//    private String power;
+//
+//    @ApiModelProperty(value = "设备图片")
+//    private String photos;
+//
+//    @ApiModelProperty(value = "设备图片")
+//    private List<Img> img;
+//
+//    @ApiModelProperty(value = "原始表id（来自历史数据库）")
+//    private String originalId;
+//
+//    @Data
+//    @EqualsAndHashCode()
+//    @Accessors(chain = true)
+//    @ApiModel(value = "Img", description = "Img")
+//    public static class Img {
+//        private String url;
+//
+//        public Img(String url) {
+//            this.url = url;
+//        }
+//    }
+//
+//}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/ElevatorVo.java

-package com.yeejoin.amos.boot.module.tzs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author tb
- * @date 2021-06-01
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("tcb_elevator")
-@ApiModel(value = "ElevatorVo", description = "ElevatorVo")
-public class ElevatorVo extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "电梯应急救援识别码")
-    private Integer rescueCode;
-
-    @ApiModelProperty(value = "设备注册代码")
-    private String registerCode;
-
-    @ApiModelProperty(value = "所属省")
-    private String province;
-
-    @ApiModelProperty(value = "所属地市")
-    private String city;
-
-    @ApiModelProperty(value = "所属区县")
-    private String district;
-
-    @ApiModelProperty(value = "所属区域代码")
-    private String regionCode;
-
-    @ApiModelProperty(value = "安装地址")
-    private String address;
-
-    @ApiModelProperty(value = "内部编号")
-    private String innerNum;
-
-    @ApiModelProperty(value = "电梯品牌")
-    private String brand;
-
-    @ApiModelProperty(value = "出厂编号")
-    private String factoryNum;
-
-    @ApiModelProperty(value = "电梯安装单位")
-    private String installationUnit;
-
-    @ApiModelProperty(value = "制造日期（出厂时间）")
-    private Date factoryDate;
-
-    @ApiModelProperty(value = "电梯大修/改造日期")
-    private Date overhaulDate;
-
-    @ApiModelProperty(value = "开始使用日期")
-    private Date startUseDate;
-
-    @ApiModelProperty(value = "设备类别")
-    private String category;
-
-    @ApiModelProperty(value = "使用场所分类")
-    private String useSiteCategory;
-
-    @ApiModelProperty(value = "电梯型号")
-    private String model;
-
-    @ApiModelProperty(value = "电梯层数")
-    private Integer floors;
-
-    @ApiModelProperty(value = "电梯站数")
-    private Integer stations;
-
-    @ApiModelProperty(value = "电梯门数")
-    private Integer doors;
-
-    @ApiModelProperty(value = "电梯额定速度(单位：m/s)")
-    private Float ratedSpeed;
-
-    @ApiModelProperty(value = "电梯额定载重量(单位：kg)")
-    private Float ratedLoad;
-
-    @ApiModelProperty(value = "最大荷载人数")
-    private Integer maxPersonLoad;
-
-    @ApiModelProperty(value = "提升高度")
-    private Float raiseHeight;
-
-    @ApiModelProperty(value = "拖动方式")
-    private String dragMode;
-
-    @ApiModelProperty(value = "电梯使用状态")
-    private Integer useStatus;
-
-    @ApiModelProperty(value = "使用单位")
-    private String useUnit;
-
-    @ApiModelProperty(value = "使用单位id")
-    private Long useUnitId;
-
-    @ApiModelProperty(value = "制造单位名称")
-    private String manufacturerName;
-
-    @ApiModelProperty(value = "制造许可编号")
-    private String manufacturingLicense;
-
-    @ApiModelProperty(value = "维保类型")
-    private String maintainType;
-
-    @ApiModelProperty(value = "维护周期")
-    private String maintainPeriod;
-
-    @ApiModelProperty(value = "维保单位")
-    private String maintainUnit;
-
-    @ApiModelProperty(value = "维保单位id")
-    private Long maintainUnitId;
-
-    @ApiModelProperty(value = "维保负责人")
-    private String maintainLeader;
-
-    @ApiModelProperty(value = "维保负责人id")
-    private Long maintainLeaderId;
-
-    @ApiModelProperty(value = "维保负责人手机")
-    private String maintainLeaderPhone;
-
-    @ApiModelProperty(value = "主机模式")
-    private String hostModel;
-
-    @ApiModelProperty(value = "主机编号")
-    private String hostNum;
-
-    @ApiModelProperty(value = "动力类型")
-    private String engineType;
-
-    @ApiModelProperty(value = "动力编号")
-    private String engineNum;
-
-    @ApiModelProperty(value = "面板模型")
-    private String panelModel;
-
-    @ApiModelProperty(value = "面板编号")
-    private String panelNum;
-
-    @ApiModelProperty(value = "级联模型")
-    private String cascadeModel;
-
-    @ApiModelProperty(value = "级联线路模型")
-    private String cascadeLineModel;
-
-    @ApiModelProperty(value = "扶手带类型")
-    private String handrailType;
-
-    @ApiModelProperty(value = "扶手面板模型")
-    private String handrailPanelModel;
-
-    @ApiModelProperty(value = "扶手面板品牌")
-    private String handrailPanelBrand;
-
-    @ApiModelProperty(value = "滚转机模式")
-    private String rollerMode;
-
-    @ApiModelProperty(value = "倾斜的角度")
-    private String tiltAngle;
-
-    @ApiModelProperty(value = "横向跨度")
-    private String horizontalSpan;
-
-    @ApiModelProperty(value = "运行噪音")
-    private String runningNoise;
-
-    @ApiModelProperty(value = "运行方式")
-    private String runningMode;
-
-    @ApiModelProperty(value = "运行振动")
-    private String runningVibration;
-
-    @ApiModelProperty(value = "功率")
-    private String power;
-
-    @ApiModelProperty(value = "设备图片")
-    private String photos;
-
-    @ApiModelProperty(value = "设备图片")
-    private List<Img> img;
-
-    @ApiModelProperty(value = "原始表id（来自历史数据库）")
-    private String originalId;
-
-    @Data
-    @EqualsAndHashCode()
-    @Accessors(chain = true)
-    @ApiModel(value = "Img", description = "Img")
-    public static class Img {
-        private String url;
-
-        public Img(String url) {
-            this.url = url;
-        }
-    }
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/MaintenanceUnitVo.java

-package com.yeejoin.amos.boot.module.tzs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * @author tb
- * @date 2021-06-01
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("cb_maintenance_unit")
-@ApiModel(value = "MaintenanceUnitVo", description = "MaintenanceUnitVo")
-public class MaintenanceUnitVo extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "统一社会信用代码")
-    private String socialCreditCode;
-
-    @ApiModelProperty(value = "维护保养单位名称")
-    private String unitName;
-
-    @ApiModelProperty(value = "省份")
-    private String province;
-
-    @ApiModelProperty(value = "地市")
-    private String city;
-
-    @ApiModelProperty(value = "区县")
-    private String district;
-
-    @ApiModelProperty(value = "区域代码")
-    private String regionCode;
-
-    @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
-    private String address;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
-
-    @ApiModelProperty(value = "法人id")
-    private Long legalPersonId;
-
-    @ApiModelProperty(value = "法人")
-    private String legalPerson;
-
-    @ApiModelProperty(value = "法人电话/注册电话")
-    private String legalPersonPhone;
-
-    @ApiModelProperty(value = "企业资质等级")
-    private String qualificationLevel;
-
-    @ApiModelProperty(value = "信用级别")
-    private Integer creditLevel;
-
-    @ApiModelProperty(value = "许可证编号")
-    private String licenseNum;
-
-    @ApiModelProperty(value = "值班电话")
-    private String dutyPhone;
-
-    @ApiModelProperty(value = "紧急电话号码")
-    private String emergencyPhone;
-
-    @ApiModelProperty(value = "主要负责人1")
-    private String principalFirst;
-
-    @ApiModelProperty(value = "主要负责人1手机号码")
-    private String principalFirstPhone;
-
-    @ApiModelProperty(value = "主要负责人1id")
-    private Long principalFirstId;
-
-    @ApiModelProperty(value = "主要负责人2")
-    private String principalSecond;
-
-    @ApiModelProperty(value = "主要负责人2手机号码")
-    private String principalSecondPhone;
-
-    @ApiModelProperty(value = "主要负责人2id")
-    private Long principalSecondId;
-
-    @ApiModelProperty(value = "原始表id（来自历史数据库）")
-    private String originalId;
-
-    @ApiModelProperty(value = "人员信息")
-    List<DutyPersonVo> dutyPersonList;
-
-}
+//package com.yeejoin.amos.boot.module.tzs.api.vo;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//import lombok.experimental.Accessors;
+//
+///**
+// * @author tb
+// * @date 2021-06-01
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = true)
+//@Accessors(chain = true)
+//@TableName("cb_maintenance_unit")
+//@ApiModel(value = "MaintenanceUnitVo", description = "MaintenanceUnitVo")
+//public class MaintenanceUnitVo extends BaseEntity {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//
+//    @ApiModelProperty(value = "统一社会信用代码")
+//    private String socialCreditCode;
+//
+//    @ApiModelProperty(value = "维护保养单位名称")
+//    private String unitName;
+//
+//    @ApiModelProperty(value = "省份")
+//    private String province;
+//
+//    @ApiModelProperty(value = "地市")
+//    private String city;
+//
+//    @ApiModelProperty(value = "区县")
+//    private String district;
+//
+//    @ApiModelProperty(value = "区域代码")
+//    private String regionCode;
+//
+//    @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
+//    private String address;
+//
+//    @ApiModelProperty(value = "经度")
+//    private String longitude;
+//
+//    @ApiModelProperty(value = "纬度")
+//    private String latitude;
+//
+//    @ApiModelProperty(value = "法人id")
+//    private Long legalPersonId;
+//
+//    @ApiModelProperty(value = "法人")
+//    private String legalPerson;
+//
+//    @ApiModelProperty(value = "法人电话/注册电话")
+//    private String legalPersonPhone;
+//
+//    @ApiModelProperty(value = "企业资质等级")
+//    private String qualificationLevel;
+//
+//    @ApiModelProperty(value = "信用级别")
+//    private Integer creditLevel;
+//
+//    @ApiModelProperty(value = "许可证编号")
+//    private String licenseNum;
+//
+//    @ApiModelProperty(value = "值班电话")
+//    private String dutyPhone;
+//
+//    @ApiModelProperty(value = "紧急电话号码")
+//    private String emergencyPhone;
+//
+//    @ApiModelProperty(value = "主要负责人1")
+//    private String principalFirst;
+//
+//    @ApiModelProperty(value = "主要负责人1手机号码")
+//    private String principalFirstPhone;
+//
+//    @ApiModelProperty(value = "主要负责人1id")
+//    private Long principalFirstId;
+//
+//    @ApiModelProperty(value = "主要负责人2")
+//    private String principalSecond;
+//
+//    @ApiModelProperty(value = "主要负责人2手机号码")
+//    private String principalSecondPhone;
+//
+//    @ApiModelProperty(value = "主要负责人2id")
+//    private Long principalSecondId;
+//
+//    @ApiModelProperty(value = "原始表id（来自历史数据库）")
+//    private String originalId;
+//
+//}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/RescueStationVo.java

-package com.yeejoin.amos.boot.module.tzs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * @author tb
- * @date 2021-06-01
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("tcb_rescue_station")
-@ApiModel(value = "RescueStationVo", description = "RescueStationVo")
-public class RescueStationVo extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "应急救援机构名称")
-    private String name;
-
-    @ApiModelProperty(value = "省份")
-    private String province;
-
-    @ApiModelProperty(value = "地市")
-    private String city;
-
-    @ApiModelProperty(value = "区县")
-    private String district;
-
-    @ApiModelProperty(value = "区域代码")
-    private String regionCode;
-
-    @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
-    private String address;
-
-    @ApiModelProperty(value = "责任人id")
-    private Long principalId;
-
-    @ApiModelProperty(value = "主要负责人")
-    private String principal;
-
-    @ApiModelProperty(value = "负责人电话")
-    private String principalPhone;
-
-    @ApiModelProperty(value = "应急救援负责人")
-    private String rescueLeader;
-
-    @ApiModelProperty(value = "应急救援负责人手机号")
-    private String rescueLeaderPhone;
-
-    @ApiModelProperty(value = "应急救援负责人id")
-    private Long rescueLeaderId;
-
-    @ApiModelProperty(value = "所属单位（维保单位）")
-    private String affiliatedUnit;
-
-    @ApiModelProperty(value = "所属单位id")
-    private Long affiliatedUnitId;
-
-    @ApiModelProperty(value = "经纬度")
-    private String longitudeLatitude;
-
-    @ApiModelProperty(value = "人员信息")
-    List<DutyPersonVo> dutyPersonList;
-
-}
+//package com.yeejoin.amos.boot.module.tzs.api.vo;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//import lombok.experimental.Accessors;
+//
+///**
+// * @author tb
+// * @date 2021-06-01
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = true)
+//@Accessors(chain = true)
+//@TableName("tcb_rescue_station")
+//@ApiModel(value = "RescueStationVo", description = "RescueStationVo")
+//public class RescueStationVo extends BaseEntity {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//
+//    @ApiModelProperty(value = "应急救援机构名称")
+//    private String name;
+//
+//    @ApiModelProperty(value = "省份")
+//    private String province;
+//
+//    @ApiModelProperty(value = "地市")
+//    private String city;
+//
+//    @ApiModelProperty(value = "区县")
+//    private String district;
+//
+//    @ApiModelProperty(value = "区域代码")
+//    private String regionCode;
+//
+//    @ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
+//    private String address;
+//
+//    @ApiModelProperty(value = "责任人id")
+//    private Long principalId;
+//
+//    @ApiModelProperty(value = "主要负责人")
+//    private String principal;
+//
+//    @ApiModelProperty(value = "负责人电话")
+//    private String principalPhone;
+//
+//    @ApiModelProperty(value = "应急救援负责人")
+//    private String rescueLeader;
+//
+//    @ApiModelProperty(value = "应急救援负责人手机号")
+//    private String rescueLeaderPhone;
+//
+//    @ApiModelProperty(value = "应急救援负责人id")
+//    private Long rescueLeaderId;
+//
+//    @ApiModelProperty(value = "所属单位（维保单位）")
+//    private String affiliatedUnit;
+//
+//    @ApiModelProperty(value = "所属单位id")
+//    private Long affiliatedUnitId;
+//
+//    @ApiModelProperty(value = "经纬度")
+//    private String longitudeLatitude;
+//
+//}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/UseUnitVo.java

-package com.yeejoin.amos.boot.module.tzs.api.vo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * @author tb
- * @date 2021-06-01
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("tcb_use_unit")
-@ApiModel(value = "UseUnitVo", description = "UseUnitVo")
-public class UseUnitVo extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-
-    @ApiModelProperty(value = "统一社会信用代码")
-    private String socialCreditCode;
-
-    @ApiModelProperty(value = "使用单位（小区）名称")
-    private String useUnitName;
-
-    @ApiModelProperty(value = "小区所属地产品牌")
-    private String realEstateBrand;
-
-    @ApiModelProperty(value = "物业公司所属品牌")
-    private String propertyCompanyBrand;
-
-    @ApiModelProperty(value = "省份")
-    private String province;
-
-    @ApiModelProperty(value = "地市")
-    private String city;
-
-    @ApiModelProperty(value = "区县")
-    private String district;
-
-    @ApiModelProperty(value = "区域代码")
-    private String regionCode;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "责任人id")
-    private Long principalId;
-
-    @ApiModelProperty(value = "主要负责人")
-    private String principal;
-
-    @ApiModelProperty(value = "负责人电话")
-    private String principalPhone;
-
-    @ApiModelProperty(value = "管理部门")
-    private String management;
-
-    @ApiModelProperty(value = "管理员id")
-    private Long managerId;
-
-    @ApiModelProperty(value = "电梯安全管理员")
-    private String manager;
-
-    @ApiModelProperty(value = "电梯管理员手机")
-    private String managerPhone;
-
-    @ApiModelProperty(value = "原始表id（来自历史数据库）")
-    private String originalId;
-
-    @ApiModelProperty(value = "人员信息")
-    List<DutyPersonVo> dutyPersonList;
-
-}
+//package com.yeejoin.amos.boot.module.tzs.api.vo;
+//
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//import lombok.experimental.Accessors;
+//
+///**
+// * @author tb
+// * @date 2021-06-01
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = true)
+//@Accessors(chain = true)
+//@TableName("tcb_use_unit")
+//@ApiModel(value = "UseUnitVo", description = "UseUnitVo")
+//public class UseUnitVo extends BaseEntity {
+//
+//    private static final long serialVersionUID = 1L;
+//
+//
+//    @ApiModelProperty(value = "统一社会信用代码")
+//    private String socialCreditCode;
+//
+//    @ApiModelProperty(value = "使用单位（小区）名称")
+//    private String useUnitName;
+//
+//    @ApiModelProperty(value = "小区所属地产品牌")
+//    private String realEstateBrand;
+//
+//    @ApiModelProperty(value = "物业公司所属品牌")
+//    private String propertyCompanyBrand;
+//
+//    @ApiModelProperty(value = "省份")
+//    private String province;
+//
+//    @ApiModelProperty(value = "地市")
+//    private String city;
+//
+//    @ApiModelProperty(value = "区县")
+//    private String district;
+//
+//    @ApiModelProperty(value = "区域代码")
+//    private String regionCode;
+//
+//    @ApiModelProperty(value = "地址")
+//    private String address;
+//
+//    @ApiModelProperty(value = "责任人id")
+//    private Long principalId;
+//
+//    @ApiModelProperty(value = "主要负责人")
+//    private String principal;
+//
+//    @ApiModelProperty(value = "负责人电话")
+//    private String principalPhone;
+//
+//    @ApiModelProperty(value = "管理部门")
+//    private String management;
+//
+//    @ApiModelProperty(value = "管理员id")
+//    private Long managerId;
+//
+//    @ApiModelProperty(value = "电梯安全管理员")
+//    private String manager;
+//
+//    @ApiModelProperty(value = "电梯管理员手机")
+//    private String managerPhone;
+//
+//    @ApiModelProperty(value = "原始表id（来自历史数据库）")
+//    private String originalId;
+//
+//}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 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.FailureAuditDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureAuditServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -86,6 +87,18 @@ public class FailureAuditController extends BaseController {
 	public ResponseModel<List<FailureAuditDto>> selectForList() {
 	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryForFailureAuditList());
 	}
+
+	/**
+	 * 审核列表记录查询
+	 *根据关联主表faultId查询
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "审核列表记录查询",   notes = "审核列表记录查询")
+	@GetMapping(value = "/list/{faultId}")
+	public ResponseModel<List<FailureAudit>> findByFaultIDFotList(@RequestParam long faultId) {
+		return ResponseHelper.buildResponse(failureAuditServiceImpl.findByfaultId(faultId));
+	}
 	
    
 	

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,28 +53,21 @@ public class FailureDetailsController extends BaseController {
      * 新增
      *
      * @return
+     * @throws Exception 
      */
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<Object> save(@RequestBody FailureDetailsDto model) {
-	  
-	  	Object result =  failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo());
-	    return ResponseHelper.buildResponse(result);
-
-
-//		CommonResponse commonResponse = new CommonResponse();
-//		try {
-//			AgencyUserModel user = getUserInfo();
-//			if (ObjectUtils.isEmpty(user)) {
-//				return CommonResponseUtil.failure("用户session过期");
-//			}
-//			return failureDetailsServiceImpl.savemodel(model);
-//		} catch (Exception e) {
-//			logger.error("", e.getMessage());
-//			return CommonResponseUtil.failure("系统繁忙，请稍后再试");
-//		}
+	public ResponseModel<Object> save(@RequestBody FailureDetailsDto model)  {
+	  	Object result;
+		try {
+			result = failureDetailsServiceImpl.savemodel(model,getSelectedOrgInfo());
+			 return ResponseHelper.buildResponse(result);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			 return ResponseHelper.buildResponse("erro");
+		}
 	}
 
 
@@ -128,11 +122,12 @@ public class FailureDetailsController extends BaseController {
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
 	public ResponseModel<Page<FailureDetailsDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
+                    (value = "size") int size,@RequestParam Long currentStatus) {
 	    Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page));
+		final AgencyUserModel userInfo = getUserInfo();
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page,currentStatus,userInfo));
 	}
 
 	/**
@@ -160,5 +155,33 @@ public class FailureDetailsController extends BaseController {
 		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsList(currentStatus));
 	}
 
+	/**
+	 * 查询当前状态任务数量
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "查询当前状态任务数量",   notes = "查询当前状态任务数量")
+	@GetMapping(value = "/list/count/{currentStatus}")
+	public ResponseModel<Integer> selectStatusCount(@RequestParam Long currentStatus) {
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(currentStatus));
+	}
+
+	/**
+	 * 查询我提交状态任务数量
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "查询我提交状态任务数量",   notes = "查询我提交状态任务数量")
+	@GetMapping(value = "/list/userID")
+	public ResponseModel<Page<FailureDetailsDto>> selectISubmit(@RequestParam(value = "current") int current,@RequestParam
+			(value = "size") int size) {
+		Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
+		page.setCurrent(current);
+		page.setSize(size);
+		String userId = getUserInfo().getUserId();
+		return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForPage(page,userId));
+	}
 
 }

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,8 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -73,8 +75,18 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
 		failureDetailsDto.setCurrentStatus(status);
 		failureDetailsDto.setSequenceNbr(model.getFaultId());
 		return failureDetailsService.updateWithModel(failureDetailsDto);
+	}
 
+	/**
+	 * 根据FaultId查询
+	 */
+	public List<FailureAudit> findByfaultId(Long faultId) {
+		Page<FailureAudit> page = new Page<>();
+		QueryWrapper<FailureAudit> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("fault_id", faultId).orderByDesc("submission_time");
+		return baseMapper.selectList(queryWrapper);
 	}
+
 	 public FailureAudit findByFaultId(Long faultId) {
 		 LambdaQueryWrapper<FailureAudit> wrapper = new LambdaQueryWrapper<FailureAudit>();
 		 wrapper.eq(FailureAudit::getIsDelete, 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/FailureMaintainServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
 import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
@@ -57,6 +59,16 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     }
 
     /**
+     * 根据FaultId查询
+     */
+    public List<FailureMaintain> findByfaultId(Long faultId) {
+        Page<FailureMaintain> page = new Page<>();
+        QueryWrapper<FailureMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("fault_id", faultId).orderByDesc("submission_time");
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
      *根据审核结果更新维修表
      */
     public FailureMaintainDto updateModel(FailureMaintainDto failureMaintainDto,Integer status)   {

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

@@ -498,8 +498,8 @@ public class PlanTaskController extends AbstractBaseController {
             @ApiParam(value = "维保状态") @RequestParam(value = "finishStatus", required = false) Integer finishStatus,
             @ApiParam(value = "排序条件") @RequestParam(value = "orderBy") String orderBy,
             @ApiParam(value = "业主单位") @RequestParam(value = "companyId", required = false) String companyId,
-            @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int current,
-            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int size) throws Exception {
+            @ApiParam(value = "当前页") @RequestParam(value = "pageNumber") int pageNumber,
+            @ApiParam(value = "页大小") @RequestParam(value = "pageSize") int pageSize) throws Exception {
         HashMap<String, Object> params = new HashMap<String, Object>();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
@@ -512,7 +512,7 @@ public class PlanTaskController extends AbstractBaseController {
         params.put("endTime", endTime);
         params.put("finishStatus", finishStatus);
         params.put("orderBy", OrderByEnum.getEumByCode(orderBy).getOderBy());
-        CommonPageable pageable = new CommonPageable(current, size);
+        CommonPageable pageable = new CommonPageable(pageNumber, pageSize);
         try {
             return CommonResponseUtil.success(planTaskService.getPlanTasks(params, pageable));
         } catch (Exception e) {

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

@@ -19,8 +19,7 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledRequestDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
-import com.yeejoin.amos.boot.module.tzs.api.vo.AlarmStatisticsVo;
-import com.yeejoin.amos.boot.module.tzs.api.vo.AlertCalledVo;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlarmStatisticsDto;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.DispatchPaperServiceImpl;
@@ -191,14 +190,15 @@ public class AlertCalledController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/alertStatistics")
 	@ApiOperation(httpMethod = "GET",value = "警情统计",  notes = "警情统计")
-	public ResponseModel<AlarmStatisticsVo> alertStatistics() throws ParseException {
+	public ResponseModel<AlarmStatisticsDto> alertStatistics() throws ParseException {
 		ReginParams reginParams =getSelectedOrgInfo();
+
 		//我的待办数量
 		QueryWrapper<AlertCalled> todoNumQueryWrapper = new QueryWrapper<>();
 		//全部待办数量
 		QueryWrapper<AlertCalled> allNumQueryWrapper = new QueryWrapper<>();
 
-		AlarmStatisticsVo alarmStatisticsVo = new AlarmStatisticsVo();
+		AlarmStatisticsDto alarmStatisticsDto = new AlarmStatisticsDto();
 		todoNumQueryWrapper.eq("alert_status",false);
         allNumQueryWrapper.eq("alert_status",false);
 		if(null != reginParams) {
@@ -206,22 +206,22 @@ public class AlertCalledController extends BaseController {
 			todoNumQueryWrapper.or(true);
 			todoNumQueryWrapper.eq("org_code",reginParams.getCompany().getOrgCode());
 
-            alarmStatisticsVo.setTodoNum(iAlertCalledService.list(todoNumQueryWrapper).size());
-            alarmStatisticsVo.setAllNum(iAlertCalledService.list(allNumQueryWrapper).size());
+            alarmStatisticsDto.setTodoNum(iAlertCalledService.list(todoNumQueryWrapper).size());
+            alarmStatisticsDto.setAllNum(iAlertCalledService.list(allNumQueryWrapper).size());
 
             Map<String, Object> map =    iAlertCalledService.getAlertInfoList(DateUtils.dateFormat(new Date(),"")+" 00:00:00",
                     DateUtils.dateFormat(new Date(),"")+" 23:59:59",reginParams.getCompany().getOrgCode(),
                     reginParams.getUserModel().getUserId());
             // 当天接警
-            alarmStatisticsVo.setTodayAlarmNum(map.get("calledCount") == null  ? 0 : Integer.valueOf(map.get("calledCount").toString()))   ;
+            alarmStatisticsDto.setTodayAlarmNum(map.get("calledCount") == null  ? 0 : Integer.valueOf(map.get("calledCount").toString()))   ;
             //当天提交
-            alarmStatisticsVo.setTodayAlarmNum(map.get("majorAlertCount") == null  ? 0 : Integer.valueOf(map.get("majorAlertCount").toString()))   ;
+            alarmStatisticsDto.setTodayAlarmNum(map.get("majorAlertCount") == null  ? 0 : Integer.valueOf(map.get("majorAlertCount").toString()))   ;
             //投诉咨询数量
-            alarmStatisticsVo.setSuggestions(map.get("suggestionsCount") == null  ? 0 : Integer.valueOf(map.get("suggestionsCount").toString()))   ;
+            alarmStatisticsDto.setSuggestions(map.get("suggestionsCount") == null  ? 0 : Integer.valueOf(map.get("suggestionsCount").toString()))   ;
             //故障维修数量
-            alarmStatisticsVo.setSuggestions(map.get("faultRescueCount") == null  ? 0 : Integer.valueOf(map.get("faultRescueCount").toString()))   ;
+            alarmStatisticsDto.setSuggestions(map.get("faultRescueCount") == null  ? 0 : Integer.valueOf(map.get("faultRescueCount").toString()))   ;
             //困人救援数量
-            alarmStatisticsVo.setSuggestions(map.get("sleepyIncidentCount") == null  ? 0 : Integer.valueOf(map.get("sleepyIncidentCount").toString()))   ;
+            alarmStatisticsDto.setSuggestions(map.get("sleepyIncidentCount") == null  ? 0 : Integer.valueOf(map.get("sleepyIncidentCount").toString()))   ;
 
             Map<String,Integer> recordMap = Maps.newHashMap();
             // 近七天办理数量
@@ -232,9 +232,9 @@ public class AlertCalledController extends BaseController {
                         reginParams.getUserModel().getUserId());
                 recordMap.put(DateUtils.dateFormat(DateUtils.dateAddDays(new Date(), -i),""),nearlySevenDaysMap.get("calledCount") == null  ? 0 : Integer.valueOf(nearlySevenDaysMap.get("calledCount").toString()));
             }
-            alarmStatisticsVo.setNearlySevenDaysNum(recordMap);
+            alarmStatisticsDto.setNearlySevenDaysNum(recordMap);
 		}
-		return ResponseHelper.buildResponse(alarmStatisticsVo);
+		return ResponseHelper.buildResponse(alarmStatisticsDto);
 	}
 
 	/**
@@ -247,7 +247,7 @@ public class AlertCalledController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/list")
 	@ApiOperation(httpMethod = "GET",value = "警情接警填报记录分页查询",  notes = "警情接警填报记录分页查询")
-	public ResponseModel<IPage<AlertCalledVo>> queryForPage(String pageNum, String pageSize,String sort, AlertCalledDto alertCalledDto)  {
+	public ResponseModel<IPage<AlertCalledDto>> queryForPage(String pageNum, String pageSize,String sort, AlertCalledDto alertCalledDto)  {
 		AlertCalled alertCalled = BeanDtoVoUtils.convert(alertCalledDto,AlertCalled.class);
 		Page<AlertCalled> pageBean;
 		IPage<AlertCalled> page;
@@ -261,10 +261,10 @@ public class AlertCalledController extends BaseController {
 			pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
 		}
 		page = iAlertCalledService.page(pageBean, alertCalledQueryWrapper);
-	    IPage<AlertCalledVo>  calledVoIPage =	AlertBeanDtoVoUtils.alertCalledIPageVo(page);
+	    IPage<AlertCalledDto> calledVoIPage = AlertBeanDtoVoUtils.alertCalledIPageDto(page);
 	    calledVoIPage.getRecords().stream().forEach(e->e.setAlertAddress(e.getCity()+e.getDistrict()));
 		calledVoIPage.getRecords().stream().forEach(e->{
-			getResponseLevel(alertCalled.getSequenceNbr(),e,null);
+			getResponseLevel(alertCalled.getSequenceNbr(), e,null);
 		});
 		return ResponseHelper.buildResponse(calledVoIPage);
 	}
@@ -324,7 +324,7 @@ public class AlertCalledController extends BaseController {
 		return queryWrapper;
 	}
 
-	void getResponseLevel(Long alertId,AlertCalledVo alertCalledVo,ESAlertCalledDto esAlertCalledDto) {
+	void getResponseLevel(Long alertId, AlertCalledDto alertCalledDto, ESAlertCalledDto esAlertCalledDto) {
 		QueryWrapper<DispatchPaper> dispatchPaperQueryWrapper = new QueryWrapper<>();
 		dispatchPaperQueryWrapper.eq("alert_id",alertId);
 		DispatchPaper dispatchPaper = dispatchPaperServiceImpl.getOne(dispatchPaperQueryWrapper);
@@ -339,8 +339,8 @@ public class AlertCalledController extends BaseController {
 				dynamicParms.put("field_code","field_value");
 			});
 			String responseLevel = dynamicParms.get("response_level");
-			if(null != alertCalledVo) {
-				alertCalledVo.setResponseLevel(responseLevel);
+			if(null != alertCalledDto) {
+				alertCalledDto.setResponseLevel(responseLevel);
 			} else {
 				esAlertCalledDto.setResponseLevel(responseLevel);
 			}

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

@@ -5,20 +5,15 @@ 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.utils.NameUtils;
-import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.MaintenanceUnitDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
-import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
-import com.yeejoin.amos.boot.module.tzs.api.vo.DutyPersonVo;
-import com.yeejoin.amos.boot.module.tzs.api.vo.MaintenanceUnitNameVo;
-import com.yeejoin.amos.boot.module.tzs.api.vo.MaintenanceUnitVo;
-import com.yeejoin.amos.boot.module.tzs.api.vo.UseUnitVo;
-import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
+import com.yeejoin.amos.boot.module.tzs.api.dto.MaintenanceUnitNameDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.DutyPersonDto;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -108,10 +103,10 @@ public class MaintenanceUnitController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public ResponseModel<MaintenanceUnitVo> selectById(@PathVariable Long id) {
+    public ResponseModel<MaintenanceUnitDto> selectById(@PathVariable Long id) {
         MaintenanceUnit maintenanceUnit = iMaintenanceUnitService.getById(id);
-        MaintenanceUnitVo maintenanceUnitVo = BeanDtoVoUtils.convertMaintenanceUnitToVo(maintenanceUnit, false);
-        return ResponseHelper.buildResponse(maintenanceUnitVo);
+        MaintenanceUnitDto maintenanceUnitDto = BeanDtoVoUtils.convertMaintenanceUnitToVo(maintenanceUnit, false);
+        return ResponseHelper.buildResponse(maintenanceUnitDto);
     }
 
     /**
@@ -125,7 +120,7 @@ public class MaintenanceUnitController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public ResponseModel<IPage<MaintenanceUnitVo>> listPage(String pageNum, String pageSize,
+    public ResponseModel<IPage<MaintenanceUnitDto>> listPage(String pageNum, String pageSize,
                                                             MaintenanceUnit maintenanceUnitDto) {
         MaintenanceUnit maintenanceUnit = BeanDtoVoUtils.convert(maintenanceUnitDto, MaintenanceUnit.class);
         Page<MaintenanceUnit> pageBean;
@@ -163,8 +158,8 @@ public class MaintenanceUnitController extends BaseController {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iMaintenanceUnitService.page(pageBean, maintenanceUnitQueryWrapper);
-        IPage<MaintenanceUnitVo> maintenanceUnitVoIPage = BeanDtoVoUtils.maintenanceUnitIPageVo(page);
-        return ResponseHelper.buildResponse(maintenanceUnitVoIPage);
+        IPage<MaintenanceUnitDto> maintenanceUnitDtoIPage = BeanDtoVoUtils.maintenanceUnitIPageDto(page);
+        return ResponseHelper.buildResponse(maintenanceUnitDtoIPage);
     }
 
     /**
@@ -178,7 +173,7 @@ public class MaintenanceUnitController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/query_maintenance_unit_list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "分页查询维保单位信息", notes = "分页查询维保单位信息")
-    public ResponseModel<IPage<MaintenanceUnitVo>> queryMaintenanceUnitList(String pageNum, String pageSize,
+    public ResponseModel<IPage<MaintenanceUnitDto>> queryMaintenanceUnitList(String pageNum, String pageSize,
                                                                             MaintenanceUnit maintenanceUnitDto) {
         MaintenanceUnit maintenanceUnit = BeanDtoVoUtils.convert(maintenanceUnitDto, MaintenanceUnit.class);
         Page<MaintenanceUnit> pageBean;
@@ -212,8 +207,8 @@ public class MaintenanceUnitController extends BaseController {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iMaintenanceUnitService.page(pageBean, maintenanceUnitQueryWrapper);
-        IPage<MaintenanceUnitVo> maintenanceUnitVoIPage = BeanDtoVoUtils.maintenanceUnitIPageVo(page);
-        return ResponseHelper.buildResponse(maintenanceUnitVoIPage);
+        IPage<MaintenanceUnitDto> maintenanceUnitDtoIPage = BeanDtoVoUtils.maintenanceUnitIPageDto(page);
+        return ResponseHelper.buildResponse(maintenanceUnitDtoIPage);
     }
 
     /**
@@ -225,15 +220,15 @@ public class MaintenanceUnitController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/query_maintenance_unit_name_list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据名称查询维保单位列表", notes = "根据名称查询维保单位列表")
-    public ResponseModel<IPage<MaintenanceUnitNameVo>> queryMaintenanceUnitListWithName(@PathVariable(required =
+    public ResponseModel<IPage<MaintenanceUnitNameDto>> queryMaintenanceUnitListWithName(@PathVariable(required =
             false) String unitName) {
         QueryWrapper<MaintenanceUnit> maintenanceUnitQueryWrapper = new QueryWrapper<>();
         maintenanceUnitQueryWrapper.select("distinct sequence_nbr,unit_name").like(StringUtils.isNotEmpty(unitName),
                 "unit_name", unitName);
         Page<MaintenanceUnit> pageBean = new Page<>(0, Long.MAX_VALUE);
         IPage<MaintenanceUnit> page = iMaintenanceUnitService.page(pageBean, maintenanceUnitQueryWrapper);
-        IPage<MaintenanceUnitNameVo> maintenanceUnitVoIPage = BeanDtoVoUtils.iPageVoStream(page,
-                MaintenanceUnitNameVo.class);
+        IPage<MaintenanceUnitNameDto> maintenanceUnitVoIPage = BeanDtoVoUtils.iPageVoStream(page,
+                MaintenanceUnitNameDto.class);
         return ResponseHelper.buildResponse(maintenanceUnitVoIPage);
     }
 
@@ -245,24 +240,26 @@ public class MaintenanceUnitController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/alert/{alertId}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据警情id 查找设备维保单位信息", notes = "根据警情id 查找设备维保单位信息")
-    public ResponseModel<MaintenanceUnitVo> selectByAlertId(@PathVariable Long alertId) {
+    public ResponseModel<MaintenanceUnitDto> selectByAlertId(@PathVariable Long alertId) {
         // 获取根据警情获取电梯信息
         Elevator elevator  = elevatorServiceImpl.selectByAlertId(alertId);
-        if (ValidationUtil.isEmpty(elevator))
+        if (ValidationUtil.isEmpty(elevator)) {
             throw new BadRequest("设备未找到");
+        }
         // 根据设备使用单位id 获取使用单位信息
         MaintenanceUnit maintenanceUnit = iMaintenanceUnitService.getById(elevator.getMaintainUnitId());
-        if (ValidationUtil.isEmpty(maintenanceUnit))
+        if (ValidationUtil.isEmpty(maintenanceUnit)) {
             throw new BadRequest("维保单位未找到");
-        MaintenanceUnitVo maintenanceUnitVo = BeanDtoVoUtils.convert(maintenanceUnit, MaintenanceUnitVo.class);
-        List<DutyPersonVo> dutyPersonList = new ArrayList<DutyPersonVo>();
-        DutyPersonVo principal = new DutyPersonVo();
+        }
+        MaintenanceUnitDto maintenanceUnitVo = BeanDtoVoUtils.convert(maintenanceUnit, MaintenanceUnitDto.class);
+        List<DutyPersonDto> dutyPersonList = new ArrayList<DutyPersonDto>();
+        DutyPersonDto principal = new DutyPersonDto();
         principal.setDeptName("主要负责人1");
         principal.setPhone(maintenanceUnitVo.getPrincipalFirstPhone());
         principal.setUserId(maintenanceUnitVo.getPrincipalFirstId()+"");
         principal.setUserName(maintenanceUnitVo.getPrincipalFirst());
         dutyPersonList.add(principal);
-        DutyPersonVo manager = new DutyPersonVo();
+        DutyPersonDto manager = new DutyPersonDto();
         manager.setDeptName("主要负责人2");
         manager.setPhone(maintenanceUnitVo.getPrincipalSecondPhone());
         manager.setUserId(maintenanceUnitVo.getPrincipalSecondId()+"");

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

@@ -9,7 +9,6 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.RescueStationDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.RescueStation;
 import com.yeejoin.amos.boot.module.tzs.api.service.IRescueStationService;
-import com.yeejoin.amos.boot.module.tzs.api.vo.RescueStationVo;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import io.swagger.annotations.Api;
@@ -18,7 +17,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RestController;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -110,10 +113,10 @@ public class RescueStationController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public ResponseModel<RescueStationVo> selectById(@PathVariable Long id) {
+    public ResponseModel<RescueStationDto> selectById(@PathVariable Long id) {
         RescueStation rescueStation = iRescueStationService.getById(id);
-        RescueStationVo rescueStationVo = BeanDtoVoUtils.convert(rescueStation, RescueStationVo.class);
-        return ResponseHelper.buildResponse(rescueStationVo);
+        RescueStationDto rescueStationDto = BeanDtoVoUtils.convert(rescueStation, RescueStationDto.class);
+        return ResponseHelper.buildResponse(rescueStationDto);
     }
 
     /**
@@ -127,8 +130,8 @@ public class RescueStationController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
-    public ResponseModel<IPage<RescueStationVo>> listPage(String pageNum, String pageSize,
-                                                          RescueStationDto rescueStationDto) {
+    public ResponseModel<IPage<RescueStationDto>> listPage(String pageNum, String pageSize,
+                                                           RescueStationDto rescueStationDto) {
         RescueStation rescueStation = BeanDtoVoUtils.convert(rescueStationDto, RescueStation.class);
         Page<RescueStation> pageBean;
         QueryWrapper<RescueStation> rescueStationQueryWrapper = new QueryWrapper<>();
@@ -165,8 +168,8 @@ public class RescueStationController extends BaseController {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iRescueStationService.page(pageBean, rescueStationQueryWrapper);
-        IPage<RescueStationVo> rescueStationVoIPage = BeanDtoVoUtils.iPageVoStream(page, RescueStationVo.class);
-        return ResponseHelper.buildResponse(rescueStationVoIPage);
+        IPage<RescueStationDto> rescueStationDtoIPage = BeanDtoVoUtils.iPageVoStream(page, RescueStationDto.class);
+        return ResponseHelper.buildResponse(rescueStationDtoIPage);
     }
 
     /**
@@ -180,7 +183,7 @@ public class RescueStationController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/query_rescue_station_list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "分页查询救援站信息", notes = "分页查询救援站信息")
-    public ResponseModel<IPage<RescueStationVo>> queryRescueStationList(String pageNum, String pageSize,
+    public ResponseModel<IPage<RescueStationDto>> queryRescueStationList(String pageNum, String pageSize,
                                                                         RescueStationDto rescueStationDto) {
         RescueStation rescueStation = BeanDtoVoUtils.convert(rescueStationDto, RescueStation.class);
         Page<RescueStation> pageBean;
@@ -215,8 +218,8 @@ public class RescueStationController extends BaseController {
             pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
         }
         page = iRescueStationService.page(pageBean, rescueStationQueryWrapper);
-        IPage<RescueStationVo> rescueStationVoIPage = BeanDtoVoUtils.iPageVoStream(page, RescueStationVo.class);
-        return ResponseHelper.buildResponse(rescueStationVoIPage);
+        IPage<RescueStationDto> rescueStationDtoIPage = BeanDtoVoUtils.iPageVoStream(page, RescueStationDto.class);
+        return ResponseHelper.buildResponse(rescueStationDtoIPage);
     }
 
 

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

@@ -7,15 +7,14 @@ 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.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.tzs.api.dto.UseUnitDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.UseUnit;
 import com.yeejoin.amos.boot.module.tzs.api.service.IUseUnitService;
-import com.yeejoin.amos.boot.module.tzs.api.vo.DutyPersonVo;
-import com.yeejoin.amos.boot.module.tzs.api.vo.UseUnitVo;
+import com.yeejoin.amos.boot.module.tzs.api.dto.DutyPersonDto;
 import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -127,10 +126,10 @@ public class UseUnitController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-    public ResponseModel<UseUnitVo> selectById(@PathVariable Long id) {
+    public ResponseModel<UseUnitDto> selectById(@PathVariable Long id) {
         UseUnit useUnit = iUseUnitService.getById(id);
-        UseUnitVo useUnitVo = BeanDtoVoUtils.convert(useUnit, UseUnitVo.class);
-        return ResponseHelper.buildResponse(useUnitVo);
+        UseUnitDto useUnitDto = BeanDtoVoUtils.convert(useUnit, UseUnitDto.class);
+        return ResponseHelper.buildResponse(useUnitDto);
     }
 
     /**
@@ -211,22 +210,23 @@ public class UseUnitController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/alert/{alertId}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据警情id 查找设备使用单位信息", notes = "根据警情id 查找设备使用单位信息")
-    public ResponseModel<UseUnitVo> selectByAlertId(@PathVariable Long alertId) {
+    public ResponseModel<UseUnitDto> selectByAlertId(@PathVariable Long alertId) {
         // 获取根据警情获取电梯信息
         Elevator elevator  = elevatorServiceImpl.selectByAlertId(alertId);
         // 根据设备使用单位id 获取使用单位信息
         UseUnit useUnit = iUseUnitService.getById(elevator.getUseUnitId());
-        if (ValidationUtil.isEmpty(useUnit))
+        if (ValidationUtil.isEmpty(useUnit)) {
             throw new BadRequest("使用单位未找到");
-        UseUnitVo useUnitVo = BeanDtoVoUtils.convert(useUnit, UseUnitVo.class);
-        List<DutyPersonVo> dutyPersonList = new ArrayList<DutyPersonVo>();
-        DutyPersonVo principal = new DutyPersonVo();
+        }
+        UseUnitDto useUnitVo = BeanDtoVoUtils.convert(useUnit, UseUnitDto.class);
+        List<DutyPersonDto> dutyPersonList = new ArrayList<DutyPersonDto>();
+        DutyPersonDto principal = new DutyPersonDto();
         principal.setDeptName("主要负责人");
         principal.setPhone(useUnitVo.getPrincipalPhone());
         principal.setUserId(useUnitVo.getPrincipalId()+"");
         principal.setUserName(useUnitVo.getPrincipal());
         dutyPersonList.add(principal);
-        DutyPersonVo manager = new DutyPersonVo();
+        DutyPersonDto manager = new DutyPersonDto();
         manager.setDeptName("电梯安全管理员");
         manager.setPhone(useUnitVo.getManagerPhone());
         manager.setUserId(useUnitVo.getManagerId()+"");

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

@@ -18,7 +18,6 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
 import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService;
-import com.yeejoin.amos.boot.module.tzs.api.vo.AlertCalledVo;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.AlertBeanDtoVoUtils;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
 import org.apache.logging.log4j.LogManager;
@@ -94,22 +93,21 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 }
             }
             AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
-            AlertCalledVo alertCalledVo = AlertBeanDtoVoUtils.convertAlertCalledDtoToVo(alertCalledDto);
             QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
             elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
             elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
             Elevator elevator =  iElevatorService.getOne(elevatorQueryWrapper);
             if(null !=  elevator) {
-                alertCalledVo.setAddress(elevator.getAddress());
-                alertCalledVo.setProvince(elevator.getProvince());
-                alertCalledVo.setCity(elevator.getCity());
-                alertCalledVo.setDistrict(elevator.getDistrict());
-                alertCalledVo.setUseStatus(elevator.getUseStatus());
-                alertCalledVo.setUseSiteCategory(elevator.getUseSiteCategory());
-                alertCalledVo.setUseUnit(elevator.getUseUnit());
-                alertCalledVo.setRegionCode(elevator.getRegionCode());
+                alertCalledDto.setAddress(elevator.getAddress());
+                alertCalledDto.setProvince(elevator.getProvince());
+                alertCalledDto.setCity(elevator.getCity());
+                alertCalledDto.setDistrict(elevator.getDistrict());
+                alertCalledDto.setUseStatus(elevator.getUseStatus());
+                alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory());
+                alertCalledDto.setUseUnit(elevator.getUseUnit());
+                alertCalledDto.setRegionCode(elevator.getRegionCode());
             }
-            AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalledVo, formValue);
+            AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalledDto, formValue);
 
             redisUtils.set(RedisKey.TZS_ALERTCALLED_ID+id, JSON.toJSON(alertCalledFormVo),time);
             return alertCalledFormVo;
@@ -132,22 +130,21 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
             }
         }
         AlertCalledDto alertCalledDto = BeanDtoVoUtils.convert(alertCalled,AlertCalledDto.class);
-        AlertCalledVo alertCalledVo = AlertBeanDtoVoUtils.convertAlertCalledDtoToVo(alertCalledDto);
         QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
         elevatorQueryWrapper.eq("rescue_code", alertCalled.getDeviceId());
         elevatorQueryWrapper.eq("register_code", alertCalled.getRegistrationCode());
         Elevator elevator =  iElevatorService.getOne(elevatorQueryWrapper);
         if(null !=  elevator) {
-            alertCalledVo.setAddress(elevator.getAddress());
-            alertCalledVo.setProvince(elevator.getProvince());
-            alertCalledVo.setCity(elevator.getCity());
-            alertCalledVo.setDistrict(elevator.getDistrict());
-            alertCalledVo.setUseStatus(elevator.getUseStatus());
-            alertCalledVo.setUseSiteCategory(elevator.getUseSiteCategory());
-            alertCalledVo.setUseUnit(elevator.getUseUnit());
-            alertCalledVo.setRegionCode(elevator.getRegionCode());
+            alertCalledDto.setAddress(elevator.getAddress());
+            alertCalledDto.setProvince(elevator.getProvince());
+            alertCalledDto.setCity(elevator.getCity());
+            alertCalledDto.setDistrict(elevator.getDistrict());
+            alertCalledDto.setUseStatus(elevator.getUseStatus());
+            alertCalledDto.setUseSiteCategory(elevator.getUseSiteCategory());
+            alertCalledDto.setUseUnit(elevator.getUseUnit());
+            alertCalledDto.setRegionCode(elevator.getRegionCode());
         }
-        AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalledVo, formValue);
+        AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalledDto, formValue);
         return alertCalledFormVo;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchPaperServiceImpl.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.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertFormInitDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchConsultFeedbackDto;
@@ -21,7 +22,6 @@ import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.DispatchPaperMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IDispatchPaperService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService;
-import com.yeejoin.amos.boot.module.tzs.api.vo.AlertCalledVo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -206,9 +206,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchSaveFeedbackDto.setAlertId(alertId);
         AlertCalledFormDto alertCalledFormVo = alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
         // 警情信息
-        AlertCalledVo alertCalledVo = alertCalledFormVo.getAlertCalledVo();
-        dispatchSaveFeedbackDto.setEmergency(alertCalledVo.getEmergencyPerson());
-        dispatchSaveFeedbackDto.setEmergencyCall(alertCalledVo.getEmergencyCall());
+        AlertCalledDto alertCalledDto = alertCalledFormVo.getAlertCalledDto();
+        dispatchSaveFeedbackDto.setEmergency(alertCalledDto.getEmergencyPerson());
+        dispatchSaveFeedbackDto.setEmergencyCall(alertCalledDto.getEmergencyCall());
         // 派遣单信息
         DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(alertId);
         if(dispatchPaperFormDto == null || dispatchPaperFormDto.getDispatchPaper() == null) {
@@ -365,9 +365,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchRepairFeedbackDto.setAlertId(alertId);
         AlertCalledFormDto alertCalledFormVo = alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
         // 警情信息
-        AlertCalledVo alertCalledVo = alertCalledFormVo.getAlertCalledVo();
-        dispatchRepairFeedbackDto.setEmergency(alertCalledVo.getEmergencyPerson());
-        dispatchRepairFeedbackDto.setEmergencyCall(alertCalledVo.getEmergencyCall());
+        AlertCalledDto alertCalledDto = alertCalledFormVo.getAlertCalledDto();
+        dispatchRepairFeedbackDto.setEmergency(alertCalledDto.getEmergencyPerson());
+        dispatchRepairFeedbackDto.setEmergencyCall(alertCalledDto.getEmergencyCall());
 
         // 派遣单信息
         DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(alertId);
@@ -555,9 +555,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchConsultFeedbackDto.setAlertId(alertId);
         AlertCalledFormDto alertCalledFormVo =  alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
         // 警情信息
-        AlertCalledVo alertCalledVo = alertCalledFormVo.getAlertCalledVo();
-        dispatchConsultFeedbackDto.setEmergency(alertCalledVo.getEmergencyPerson());
-        dispatchConsultFeedbackDto.setEmergencyCall(alertCalledVo.getEmergencyCall());
+        AlertCalledDto alertCalledDto = alertCalledFormVo.getAlertCalledDto();
+        dispatchConsultFeedbackDto.setEmergency(alertCalledDto.getEmergencyPerson());
+        dispatchConsultFeedbackDto.setEmergencyCall(alertCalledDto.getEmergencyCall());
 
         // 派遣单信息
         DispatchPaperFormDto dispatchPaperFormDto = this.selectDispatchPaperDtoByAlertId(alertId);

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

 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.core.conditions.update.LambdaUpdateWrapper;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
@@ -13,6 +16,8 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
+import java.util.List;
+
 /**
 *  服务实现类
 *
@@ -37,12 +42,29 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
     public ElevatorDto saveElevator(ElevatorDto elevatorDto) {
         elevatorDto = createWithModel(elevatorDto);
 
-        // TODO 保存附件
-//        sourceFileService.saveAttachments(elevatorDto.getSequenceNbr(), elevatorDto.getAttachments());
+        // 保存附件
+        sourceFileService.saveAttachments(elevatorDto.getSequenceNbr(), elevatorDto.getAttachments());
         return elevatorDto;
     }
 
     /**
+     * 批量删除电梯信息
+     *
+     * @param seqStr 电梯主键（逗号分割）
+     * @return
+     */
+    public boolean deleteBatchBySeq(String seqStr) {
+        if (!ValidationUtil.isEmpty(seqStr)) {
+            List<String> seqList = Lists.newArrayList(seqStr.split(","));
+            LambdaUpdateWrapper<Elevator> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+            lambdaUpdateWrapper.in(Elevator::getSequenceNbr, seqList).set(Elevator::getIsDelete, true);
+            this.update(lambdaUpdateWrapper);
+            return true;
+        }
+        return false;
+    }
+
+    /**
      * 更新电梯信息
      *
      * @param elevatorDto
@@ -51,11 +73,24 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
     public ElevatorDto updateElevator(ElevatorDto elevatorDto) {
         elevatorDto = updateWithModel(elevatorDto);
 
-        // TODO 保存附件
-//        sourceFileService.saveAttachments(elevatorDto.getSequenceNbr(), elevatorDto.getAttachments());
+        // 保存附件
+        sourceFileService.saveAttachments(elevatorDto.getSequenceNbr(), elevatorDto.getAttachments());
         return elevatorDto;
     }
 
+    /**
+     * 根据id查询电梯信息
+     *
+     * @param sequenceNbr
+     * @return
+     */
+    public ElevatorDto selectBySeq(Long sequenceNbr) {
+        ElevatorDto elevatorDto = this.queryBySeq(sequenceNbr);
+
+        // 获取附件
+        elevatorDto.setAttachments(sourceFileService.getAttachments(sequenceNbr));
+        return elevatorDto;
+    }
 
     @Override
     public Elevator selectByAlertId(Long alertId) {

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.RedisUtils;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.DispatchPaperFormDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.RepairConsultDto;
@@ -15,7 +16,6 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Template;
 import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.RepairConsultMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IRepairConsultService;
-import com.yeejoin.amos.boot.module.tzs.api.vo.AlertCalledVo;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -72,10 +72,10 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
         RepairConsult repairConsult = new RepairConsult();
         repairConsult.setParentId(alertId);
         AlertCalledFormDto alertCallFrom = alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
-        if(alertCallFrom == null || alertCallFrom.getAlertCalledVo() == null) {
+        if(alertCallFrom == null || alertCallFrom.getAlertCalledDto() == null) {
             throw new BadRequest("未找到警情信息");
         }
-        AlertCalledVo alertCalledVo  = alertCallFrom.getAlertCalledVo();
+        AlertCalledDto alertCalledVo  = alertCallFrom.getAlertCalledDto();
         // 获取模板 拼接json
         QueryWrapper<Template> templateQueryWrapper = new QueryWrapper<>();
         templateQueryWrapper.eq("type_code","RECORD-" + type);

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/AlertBeanDtoVoUtils.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.tzs.biz.utils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
-import com.yeejoin.amos.boot.module.tzs.api.vo.AlertCalledVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
@@ -21,38 +20,14 @@ public class AlertBeanDtoVoUtils {
      * @param source  实体类
      * @return Vo类
      */
-    public static AlertCalledVo convertAlertCalledDtoToVo( AlertCalledDto source) {
+    public static AlertCalledDto convertAlertCalledToDto(AlertCalled source) {
         // 判断source是否为空
         if (source == null) {
             return null;
         }
         try {
             // 创建新的对象实例
-            AlertCalledVo target = new AlertCalledVo();
-            // 把原对象数据拷贝到新对象
-            BeanUtils.copyProperties(source, target);
-            // 返回新对象
-            return target;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * 将警情记录实体类转换为Vo
-     *
-     * @param source  实体类
-     * @return Vo类
-     */
-    public static AlertCalledVo convertAlertCalledToVo( AlertCalled source) {
-        // 判断source是否为空
-        if (source == null) {
-            return null;
-        }
-        try {
-            // 创建新的对象实例
-            AlertCalledVo target = new AlertCalledVo();
+            AlertCalledDto target = new AlertCalledDto();
             // 把原对象数据拷贝到新对象
             BeanUtils.copyProperties(source, target);
             // 返回新对象
@@ -71,10 +46,10 @@ public class AlertBeanDtoVoUtils {
      * @param page 原分页对象
      * @return 转换后的Vo
      */
-    public static IPage<AlertCalledVo> alertCalledIPageVo(IPage<AlertCalled> page) {
+    public static IPage<AlertCalledDto> alertCalledIPageDto(IPage<AlertCalled> page) {
         return page.convert(item -> {
             try {
-                return convertAlertCalledToVo(item);
+                return convertAlertCalledToDto(item);
             } catch (Exception e) {
                 return null;
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/BeanDtoVoUtils.java

@@ -2,17 +2,16 @@ package com.yeejoin.amos.boot.module.tzs.biz.utils;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.MaintenanceUnitDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
-import com.yeejoin.amos.boot.module.tzs.api.vo.ElevatorVo;
-import com.yeejoin.amos.boot.module.tzs.api.vo.MaintenanceUnitVo;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -118,28 +117,22 @@ public class BeanDtoVoUtils {
     }
 
     /**
-     * 将电梯实体类转换为Vo
+     * 将电梯实体类转换为Dto
      *
      * @param source  实体类
      * @param isBatch 是否批量
      * @return Vo类
      */
-    public static ElevatorVo convertElevatorToVo(Elevator source, boolean isBatch) {
+    public static ElevatorDto convertElevatorToDto(Elevator source, boolean isBatch) {
         // 判断source是否为空
         if (source == null) {
             return null;
         }
         try {
             // 创建新的对象实例
-            ElevatorVo target = new ElevatorVo();
+            ElevatorDto target = new ElevatorDto();
             // 把原对象数据拷贝到新对象
             BeanUtils.copyProperties(source, target);
-            // 将设备图片转换为集合
-            String photos = source.getPhotos();
-            if (photos != null) {
-                String[] photoList = photos.split(",");
-                target.setImg(Arrays.stream(photoList).map(ElevatorVo.Img::new).collect(Collectors.toList()));
-            }
             if (!isBatch) {
                 getElevatorDictionaryByDictCode();
             }
@@ -169,12 +162,12 @@ public class BeanDtoVoUtils {
     }
 
     /**
-     * 将Elevator转换为IPage<ElevatorVo>
+     * 将Elevator转换为IPage<ElevatorDto>
      *
      * @param page 原分页对象
      * @return 转换后的Vo
      */
-    public static IPage<ElevatorVo> elevatorIPageVo(IPage<Elevator> page) {
+    public static IPage<ElevatorDto> elevatorIPageDto(IPage<Elevator> page) {
         try {
             getElevatorDictionaryByDictCode();
         } catch (Exception e) {
@@ -182,7 +175,7 @@ public class BeanDtoVoUtils {
         }
         return page.convert(item -> {
             try {
-                return convertElevatorToVo(item, true);
+                return convertElevatorToDto(item, true);
             } catch (Exception e) {
                 return null;
             }
@@ -198,14 +191,14 @@ public class BeanDtoVoUtils {
      * @param isBatch 是否批量
      * @return 转换后的Vo
      */
-    public static MaintenanceUnitVo convertMaintenanceUnitToVo(MaintenanceUnit source, boolean isBatch) {
+    public static MaintenanceUnitDto convertMaintenanceUnitToVo(MaintenanceUnit source, boolean isBatch) {
         // 判断source是否为空
         if (source == null) {
             return null;
         }
         try {
             // 创建新的对象实例
-            MaintenanceUnitVo target = new MaintenanceUnitVo();
+            MaintenanceUnitDto target = new MaintenanceUnitDto();
             // 把原对象数据拷贝到新对象
             BeanUtils.copyProperties(source, target);
             // 返回新对象
@@ -229,7 +222,7 @@ public class BeanDtoVoUtils {
      * @param page 原分页对象
      * @return 转换后的分页对象
      */
-    public static IPage<MaintenanceUnitVo> maintenanceUnitIPageVo(IPage<MaintenanceUnit> page) {
+    public static IPage<MaintenanceUnitDto> maintenanceUnitIPageDto(IPage<MaintenanceUnit> page) {
         try {
             getMaintenanceUnitDictionaryByDictCode();
         } catch (Exception e) {

amos-boot-system-jcs/src/main/resources/application-dev.properties

@@ -39,9 +39,4 @@ file.url=http://39.98.45.134:9000/
 
 video.url=https://11.11.16.4:443/
 
-params.work.flow.normalProcessDefinitionKey=normalHazardManagement
-params.work.flow.processDefinitionKey=hazardManagement
-params.work.flow.address=http://172.16.3.4:30040
-#params.work.flow.address=http://172.16.10.80:30040
-params.spc.address=http://172.16.3.89:9001
 failure.work.flow.processDefinitionKey=malfunction_repair
\ No newline at end of file

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

@@ -171,28 +171,14 @@
 	</select>
 
 	<select id="getPlanTasks" resultType="Map">
-			SELECT
-			a.planTaskId,
-			a.OrgCode,
-			a.taskName,
-			a.userId,
-			a.beginTime,
-			a.endTime,
-			a.checkDate,
-			a.finishNum,
-			a.taskPlanNum,
-			a.finishStatus,
-			a.batchNo,
-			a.userId  executiveName,
-			a.userName,
-			a.userDept
-		FROM
-			(
-				SELECT
+           SELECT
+                  *
+           FROM
+			(SELECT
 					pt.id planTaskId,
-					pt.org_code OrgCode,
-					p. NAME taskName,
-					pt. STATUS,
+					pt.org_code orgCode,
+					p.name taskName,
+					pt.status,
 					pt.user_id userId,
 					date_format(
 						pt.begin_time,
@@ -202,93 +188,83 @@
 						pt.end_time,
 						'%Y-%m-%d %H:%i:%s'
 					) endTime,
-
 					date_format(
 						pt.check_date,
 						'%Y-%m-%d %H:%i:%s'
-					)checkDate,
+					) checkDate,
+		            pt.point_num as taskPlanNum,
 					pt.finish_num finishNum,
+		            (pt.point_num - pt.finish_num) as waitNum,
 					pt.finish_status finishStatus,
 					pt.id batchNo,
 					pt.route_id,
-					pt.point_num taskPlanNum,
 					pt.user_name userName,
-					pt.user_dept userDept
+					r.owner_id,
+			        R.owner_name as ownerName
 				FROM
-				p_plan_task pt
-				INNER JOIN  p_plan p ON pt.plan_id = p.id
+					p_plan_task pt
+					INNER JOIN  p_plan p ON pt.plan_id = p.id
+					INNER JOIN p_route r on r.id = pt.route_id
 			) a
+		<include refid="mobile-plan-task-where" />
+		limit #{offset},#{pageSize}
+	</select>
+	<sql id="mobile-plan-task-where">
 		<where>
-		<if test="userId != null and userId > 0 "> and find_in_set(#{userId},a.userId)>0</if>
-		<if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
-		<if test="orgCode != null and orgCode !=''" >
-			and (a.OrgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.OrgCode= #{orgCode} )
-		</if>
-
-		<if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
-			AND (
-					(
-						a.beginTime <![CDATA[>=]]>  #{startTime}
-						AND a.endTime <![CDATA[<=]]> #{endTime}
-					)
-					OR (
-						a.beginTime <![CDATA[<=]]> #{endTime}
-						AND a.endTime <![CDATA[>=]]> #{endTime}
-					)
-					OR (
-						a.beginTime <![CDATA[<=]]> #{startTime}
-						AND a.endTime <![CDATA[>]]> #{startTime}
-					)
-					OR (
-						a.beginTime <![CDATA[<=]]> #{startTime}
-						AND a.endTime <![CDATA[>=]]> #{endTime}
-					)
+			<if test="userId != null and userId > 0 "> and find_in_set(#{userId},a.userId)>0</if>
+			<if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
+			<if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
+				AND (
+				(
+				a.beginTime <![CDATA[>=]]>  #{startTime}
+				AND a.endTime <![CDATA[<=]]> #{endTime}
 				)
-		</if>
+				OR (
+				a.beginTime <![CDATA[<=]]> #{endTime}
+				AND a.endTime <![CDATA[>=]]> #{endTime}
+				)
+				OR (
+				a.beginTime <![CDATA[<=]]> #{startTime}
+				AND a.endTime <![CDATA[>]]> #{startTime}
+				)
+				OR (
+				a.beginTime <![CDATA[<=]]> #{startTime}
+				AND a.endTime <![CDATA[>=]]> #{endTime}
+				)
+				)
+			</if>
+			<choose>
+				<when test="identityType==1">
+					And (a.orgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.orgCode= #{orgCode} )
+					<if test="companyId != null"> and a.owner_id = #{companyId}</if>
+				</when>
+				<when test="identityType==2">
+					And a.owner_id = #{companyId}
+				</when>
+			</choose>
 		</where>
-		<if test="orderBy != null and orderBy != ''  "> order by ${orderBy} </if>
-		limit #{offset},#{pageSize}
-	</select>
-
+		<if test="orderBy != null and orderBy != ''"> order by ${orderBy} </if>
+	</sql>
 
 	<select id="getPlanTasksCount" resultType="long">
 		SELECT
 			count(1) tasksCount
 		FROM
 			(
-				SELECT
-					pt.id
-				FROM
+			SELECT
+				pt.id,
+				pt.user_id as userId,
+				pt.finish_status as finishStatus,
+				pt.org_code as orgCode,
+				pt.begin_time as beginTime,
+				pt.end_time as endTime,
+				r.owner_id
+			FROM
 				p_plan_task pt
-				INNER JOIN  p_plan p ON pt.plan_id = p.id
+			INNER JOIN  p_plan p ON pt.plan_id = p.id
+			INNER JOIN p_route r on r.id = pt.route_id
 			) a
-		<where>
-		<if test="userId != null and userId > 0 "> and find_in_set(#{userId},a.userId)>0 </if>
-		<if test="finishStatus != null"> and a.finishStatus = #{finishStatus}</if>
-		<if test="orgCode != null and orgCode !=''" >
-			and (a.OrgCode LIKE CONCAT( #{orgCode}, '-%' ) or a.OrgCode= #{orgCode} )
-		</if>
-		<if test="startTime != null and startTime != '' and endTime != null and endTime != ''  ">
-			AND (
-					(
-						a.beginTime <![CDATA[>=]]>  #{startTime}
-						AND a.endTime <![CDATA[<=]]> #{endTime}
-					)
-					OR (
-						a.beginTime <![CDATA[<=]]> #{endTime}
-						AND a.endTime <![CDATA[>=]]> #{endTime}
-					)
-					OR (
-						a.beginTime <![CDATA[<=]]> #{startTime}
-						AND a.endTime <![CDATA[>]]> #{startTime}
-					)
-					OR (
-						a.beginTime <![CDATA[<=]]> #{startTime}
-						AND a.endTime <![CDATA[>=]]> #{endTime}
-					)
-				)
-		</if>
-		</where>
+		<include refid="mobile-plan-task-where" />
 	</select>
 	<select id="queryPlanTaskById" resultType="Map">
 	  SELECT