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

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

@@ -5,6 +5,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.text.ParseException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -663,4 +664,27 @@ public class DateUtils {
         return date.after(begin) && date.before(end);
     }
 
+    /**
+     * 由出生日期获得年龄
+     *
+     * @param birthDay 出生日期
+     */
+    public static int getAge(Date birthDay) {
+        if (birthDay == null) {
+            return 0;
+        }
+        LocalDate now = LocalDate.now();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(birthDay);
+        int yearBirth = cal.get(Calendar.YEAR);
+        int monthBirth = cal.get(Calendar.MONTH) + 1;
+        int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
+
+        LocalDate birth = LocalDate.of(yearBirth, monthBirth, dayOfMonthBirth);
+        if (birth.isAfter(now)) {
+            return 0;
+        }
+        int age = birth.until(now).getYears();
+        return age;
+    }
 }

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 import java.util.List;
 
-import org.omg.CORBA.PRIVATE_MEMBER;
-
 /**
  * 联动单位
  *

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

 package com.yeejoin.amos.boot.module.common.api.entity;
 
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import java.util.Map;
 
 
 /**

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

@@ -19,7 +19,7 @@ import java.util.Map;
  *
  * @author Dell
  */
-@FeignClient(name = "AMOS-EQUIPMANAGE", path = "equip", configuration = {MultipartSupportConfig.class})
+@FeignClient(name = "${equip.fegin.name}", path = "equip", configuration = {MultipartSupportConfig.class})
 public interface EquipFeignClient {
 
     /**

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

@@ -15,7 +15,7 @@ import java.util.Map;
  *
  * @author Dell
  */
-@FeignClient(name = "AMOS-API-IOT", path = "iot", configuration = {MultipartSupportConfig.class})
+@FeignClient(name ="${iot.fegin.name}", path = "iot", configuration = {MultipartSupportConfig.class})
 public interface IotFeignClient {
 
       

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

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/pom.xml

@@ -16,6 +16,12 @@
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
       <dependency>
+          <groupId>org.springframework.data</groupId>
+          <artifactId>spring-data-elasticsearch</artifactId>
+          <version>4.0.9.RELEASE</version>
+          <scope>compile</scope>
+      </dependency>
+      <dependency>
           <groupId>com.amosframework.boot</groupId>
           <artifactId>amos-boot-module-common-api</artifactId>
           <version>${amos-biz-boot.version}</version>

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,7 +2,6 @@ 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;
@@ -10,8 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @author tb
@@ -212,8 +209,8 @@ public class ElevatorDto extends BaseDto {
     @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/ElevatorNewDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fengwang
+ * @date 2021-08-10.
+ */
+@Data
+@ApiModel(value="ElevatorNewDto", description="电梯对象集合")
+public class ElevatorNewDto {
+
+    @ApiModelProperty(value = "电梯基本信息")
+    ElevatorDto elevatorDto;
+
+}

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

@@ -8,33 +8,36 @@ package com.yeejoin.amos.boot.module.tzs.api.enums;
 public  enum  AlertStageEnums {
 
 	
-	//报警类型
-	JQCB("297","警情初报"),
-	JQGB("298","警情归并"),
+	//报警类型BJLX
+	JQCB("958","JQCB","警情初报"),
+	JQGB("959","JQGB","警情归并"),
 
-	//警情类型
+	//警情类型JQLX
 	
-	KRJY("247","困人救援"),
-	GZWX("248",	"故障维修"),
-	TSZX("249",	"投诉咨询"),
+	KRJY("960","KRJY","困人救援"),
+	GZWX("961","GZWX",	"故障维修"),
+	TSZX("962","TSZX",	"投诉咨询"),
 
-	// 来源类型
-	DHBJ("233","电话报警"),
+	// 来源类型JQLYLX
+	DHBJ("963","233","电话报警"),
 
-	// 警情阶段
-	JJ("JJQK-247","接警"),
-	PQ("241","派遣"),
-	DD("242","抵达"),
-	HF("243","回访"),
-	WX("244","维修"),
-	FK("245","反馈");
+	// 警情阶段 JQJD
+	JJ("964","JJ","接警"),
+	PQ("965","PQ","派遣"),
+	DD("966","DD","抵达"),
+	JC("967","JC","救出"),
+	JYHF("968","JYHF","救援回访"),
+	WXFK("969","WXFK","维修反馈"),
+	BXFK("970","BXFK","报修反馈"),
+	TSRFK("971","TSRFK","投诉人反馈");
 
 
 
-	
+	private String id;
 	private String code;
 	private String value;
-	AlertStageEnums(String code, String value) {
+	AlertStageEnums(String id, String code, String value) {
+		this.id = id;
 		this.code=code;
 		this.value=value;
 	}
@@ -51,5 +54,36 @@ public  enum  AlertStageEnums {
 		this.value = value;
 	}
 
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public static AlertStageEnums getEnumById(String id)
+	{
+		for (AlertStageEnums status : AlertStageEnums.values())
+		{
+			if (status.getId().equals(id))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
+
+	public static AlertStageEnums getEnumByCode(String code)
+	{
+		for (AlertStageEnums status : AlertStageEnums.values())
+		{
+			if (status.getCode().equals(code))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
 	
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IAlertCalledService.java

 package com.yeejoin.amos.boot.module.tzs.api.service;
 
 
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
+
 /**
  * 警情接警填报记录接口类
  *
@@ -15,4 +17,11 @@ public interface IAlertCalledService {
      *
      * **/
     Object selectAlertCalledById( Long id);
+
+    /**
+     *
+     * 根据警情返回信息，不读取缓存
+     *
+     * **/
+    AlertCalledFormDto selectAlertCalledByIdNoCache(Long id);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IRepairConsultService.java

@@ -9,4 +9,13 @@ package com.yeejoin.amos.boot.module.tzs.api.service;
  */
 public interface IRepairConsultService {
 
+    /**
+     * 根据警情id 和类型记录处置过程
+     * @param alertId
+     * @param type
+     * @param taskId
+     * @return
+     */
+    Boolean saveRepairConsultByAlertIdType(Long alertId, String type, Long taskId);
+
 }

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

@@ -212,7 +212,5 @@ public class AlertCalledVo extends BaseEntity {
 
     @ApiModelProperty(value = "接警时间str")
     private String callTimeStr;
-    @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/vo/DutyPersonVo.java

+package com.yeejoin.amos.boot.module.tzs.api.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author kfm
+ * @date 2021/8/10.
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "DutyPersonVo", description = "负责人VO")
+public class DutyPersonVo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "人员id")
+    private String userId;
+
+    @ApiModelProperty(value = "人员职务")
+    private String deptName;
+
+    @ApiModelProperty(value = "人员名称")
+    private String userName;
+
+    @ApiModelProperty(value = "人员电话")
+    private String phone;
+
+    @ApiModelProperty(value = "照片")
+    private String image;
+
+    @ApiModelProperty(value = "人员状态")
+    private String status;
+}

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

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01
@@ -94,4 +96,7 @@ public class MaintenanceUnitVo extends BaseEntity {
     @ApiModelProperty(value = "原始表id（来自历史数据库）")
     private String originalId;
 
+    @ApiModelProperty(value = "人员信息")
+    List<DutyPersonVo> dutyPersonList;
+
 }

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

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01
@@ -67,4 +69,7 @@ public class RescueStationVo extends BaseEntity {
     @ApiModelProperty(value = "经纬度")
     private String longitudeLatitude;
 
+    @ApiModelProperty(value = "人员信息")
+    List<DutyPersonVo> dutyPersonList;
+
 }

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

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @author tb
  * @date 2021-06-01
@@ -73,4 +75,7 @@ public class UseUnitVo extends BaseEntity {
     @ApiModelProperty(value = "原始表id（来自历史数据库）")
     private String originalId;
 
+    @ApiModelProperty(value = "人员信息")
+    List<DutyPersonVo> dutyPersonList;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/pom.xml

@@ -15,22 +15,5 @@
 			<artifactId>amos-boot-module-common-api</artifactId>
 			<version>${amos-biz-boot.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.amosframework.boot</groupId>
-			<artifactId>amos-boot-module-jcs-api</artifactId>
-			<version>${amos-biz-boot.version}</version>
-		</dependency>
-     <!--  <dependency>
-          <groupId>com.amosframework.boot</groupId>
-          <artifactId>amos-boot-module-maintenance-biz</artifactId>
-          <version>1.0.0</version>
-          <scope>compile</scope>
-      </dependency> -->
-      <!-- <dependency>
-           <groupId>com.amosframework.boot</groupId>
-           <artifactId>amos-boot-module-patrol-biz</artifactId>
-           <version>1.0.0</version>
-           <scope>compile</scope>
-       </dependency>-->
   </dependencies>
 </project>

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

@@ -6,22 +6,35 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.utils.BeanDtoVoUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 
@@ -100,7 +113,7 @@ public class FireExpertsController extends BaseController {
     public ResponseModel<FireExpertsDto> selectOne(@PathVariable Long sequenceNbr) {
         FireExpertsDto fireExpertsDto = fireExpertsServiceImpl.queryBySeq(sequenceNbr);
         Date birthdayTime = fireExpertsDto.getBirthdayTime();
-        int age = BeanDtoVoUtils.getAge(birthdayTime);
+        int age = DateUtils.getAge(birthdayTime);
         fireExpertsDto.setAge(age);
         return ResponseHelper.buildResponse(fireExpertsDto);
     }
@@ -125,7 +138,7 @@ public class FireExpertsController extends BaseController {
         Page<FireExpertsDto> fireExpertsDtoPage = fireExpertsServiceImpl.queryForFireExpertsPage(page, false,
                 fireExpertsDto.getName(), fireExpertsDto.getExpertCode());
         List<FireExpertsDto> fireExpertsDtoList = fireExpertsDtoPage.getRecords().stream().map(item -> {
-            item.setAge(BeanDtoVoUtils.getAge(item.getBirthdayTime()));
+            item.setAge(DateUtils.getAge(item.getBirthdayTime()));
             return item;
         }).collect(Collectors.toList());
         fireExpertsDtoPage.setRecords(fireExpertsDtoList);
@@ -143,7 +156,7 @@ public class FireExpertsController extends BaseController {
     public ResponseModel<List<FireExpertsDto>> selectForList() {
         List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false);
         fireExpertsDtoList.stream().map(item -> {
-            item.setAge(BeanDtoVoUtils.getAge(item.getBirthdayTime()));
+            item.setAge(DateUtils.getAge(item.getBirthdayTime()));
             return item;
         }).collect(Collectors.toList());
 

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
+import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,22 +29,10 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
-import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
-import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.KeySiteServiceImpl;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 重点部位

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

@@ -6,7 +6,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.velocity.runtime.directive.Foreach;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
-import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
@@ -40,6 +19,23 @@ import com.yeejoin.amos.boot.module.common.api.mapper.KeySiteMapper;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 重点部位服务实现类

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -38,6 +21,21 @@ import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
 import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
 import com.yeejoin.amos.boot.module.common.api.mapper.LinkageUnitMapper;
 import com.yeejoin.amos.boot.module.common.api.service.ILinkageUnitService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 联动单位服务实现类
@@ -260,6 +258,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 		return update;
 	}
 
+	@Override
 	public List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName) {
 		List<Map<String, Object>> map = linkageUnitMapper.getEmergencyLinkageUnitCodeGroupByAndCount();
 

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

-package com.yeejoin.amos.boot.module.common.biz.utils;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
-import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDate;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @title: 实体类 Dto，Vo，entity 转换工具类
- * @Author fpy
- * @Date: 2021/6/3 13:53
- */
-@Component
-public class BeanDtoVoUtils {
-
-    /**
-     * Dot ,Vo ,Entity 相互转换
-     *
-     * @param source      原数据
-     * @param targetClass 目标类
-     * @param <T>         泛型类
-     * @return 转换返回值
-     */
-    public static <T> T convert(Object source, Class<T> targetClass) {
-        // 判断source是否为空
-        if (source == null) {
-            return null;
-        }
-        // 判断targetClass是否为空
-        if (targetClass == null) {
-            return null;
-        }
-        try {
-            // 创建新的对象实例
-            T target = targetClass.newInstance();
-            // 把原对象数据拷贝到新对象
-            BeanUtils.copyProperties(source, target);
-            // 返回新对象
-            return target;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * Dot ,Vo ,Entity 相互转换
-     *
-     * @param source 原数据
-     * @return 转换返回值
-     */
-    public static FireExpertsDto convertFireExperts(FireExperts source) {
-        // 判断source是否为空
-        if (source == null) {
-            return null;
-        }
-        try {
-            // 创建新的对象实例
-            FireExpertsDto target = FireExpertsDto.class.newInstance();
-            // 把原对象数据拷贝到新对象
-            BeanUtils.copyProperties(source, target);
-            // 计算年龄
-            int age = getAge(source.getBirthdayTime());
-            target.setAge(age);
-            // 返回新对象
-            return target;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * IPage<Entity> 分页对象转 Page<Dto>
-     *
-     * @param page 原分页对象
-     * @param v    目标vo类
-     * @param <E>  泛型类
-     * @param <V>  泛型类
-     * @return 转换后的分页对象
-     */
-    public static <E, V> IPage<V> iPageDtoStream(IPage<E> page, Class<V> v) {
-        return page.convert(item -> {
-            try {
-                return convert(item, v);
-            } catch (Exception e) {
-                return null;
-            }
-        });
-    }
-
-    /**
-     * IPage<Entity> 分页对象转 Page<Dto>
-     *
-     * @param page 原分页对象
-     * @return 转换后的分页对象
-     */
-    public static IPage<FireExpertsDto> iPageDtoStreamFireExperts(IPage<FireExperts> page) {
-        return page.convert(item -> {
-            try {
-                return convertFireExperts(item);
-            } catch (Exception e) {
-                return null;
-            }
-        });
-    }
-
-    //由出生日期获得年龄
-    public static int getAge(Date birthDay) {
-        if (birthDay == null) {
-            return 0;
-        }
-        LocalDate now = LocalDate.now();
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(birthDay);
-        int yearBirth = cal.get(Calendar.YEAR);
-        int monthBirth = cal.get(Calendar.MONTH) + 1;
-        int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
-
-        LocalDate birth = LocalDate.of(yearBirth, monthBirth, dayOfMonthBirth);
-        if (birth.isAfter(now)) {
-            return 0;
-        }
-        int age = birth.until(now).getYears();
-        return age;
-    }
-
-}
+//package com.yeejoin.amos.boot.module.common.biz.utils;
+//
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
+//import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
+//import org.springframework.beans.BeanUtils;
+//import org.springframework.stereotype.Component;
+//
+//import java.time.LocalDate;
+//import java.util.Calendar;
+//import java.util.Date;
+//
+///**
+// * @title: 实体类 Dto，Vo，entity 转换工具类
+// * @Author fpy
+// * @Date: 2021/6/3 13:53
+// */
+//@Component
+//public class BeanDtoVoUtils {
+//
+//    /**
+//     * Dot ,Vo ,Entity 相互转换
+//     *
+//     * @param source      原数据
+//     * @param targetClass 目标类
+//     * @param <T>         泛型类
+//     * @return 转换返回值
+//     */
+//    public static <T> T convert(Object source, Class<T> targetClass) {
+//        // 判断source是否为空
+//        if (source == null) {
+//            return null;
+//        }
+//        // 判断targetClass是否为空
+//        if (targetClass == null) {
+//            return null;
+//        }
+//        try {
+//            // 创建新的对象实例
+//            T target = targetClass.newInstance();
+//            // 把原对象数据拷贝到新对象
+//            BeanUtils.copyProperties(source, target);
+//            // 返回新对象
+//            return target;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return null;
+//        }
+//    }
+//
+//    /**
+//     * Dot ,Vo ,Entity 相互转换
+//     *
+//     * @param source 原数据
+//     * @return 转换返回值
+//     */
+//    public static FireExpertsDto convertFireExperts(FireExperts source) {
+//        // 判断source是否为空
+//        if (source == null) {
+//            return null;
+//        }
+//        try {
+//            // 创建新的对象实例
+//            FireExpertsDto target = FireExpertsDto.class.newInstance();
+//            // 把原对象数据拷贝到新对象
+//            BeanUtils.copyProperties(source, target);
+//            // 计算年龄
+//            int age = getAge(source.getBirthdayTime());
+//            target.setAge(age);
+//            // 返回新对象
+//            return target;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return null;
+//        }
+//    }
+//
+//    /**
+//     * IPage<Entity> 分页对象转 Page<Dto>
+//     *
+//     * @param page 原分页对象
+//     * @param v    目标vo类
+//     * @param <E>  泛型类
+//     * @param <V>  泛型类
+//     * @return 转换后的分页对象
+//     */
+//    public static <E, V> IPage<V> iPageDtoStream(IPage<E> page, Class<V> v) {
+//        return page.convert(item -> {
+//            try {
+//                return convert(item, v);
+//            } catch (Exception e) {
+//                return null;
+//            }
+//        });
+//    }
+//
+//    /**
+//     * IPage<Entity> 分页对象转 Page<Dto>
+//     *
+//     * @param page 原分页对象
+//     * @return 转换后的分页对象
+//     */
+//    public static IPage<FireExpertsDto> iPageDtoStreamFireExperts(IPage<FireExperts> page) {
+//        return page.convert(item -> {
+//            try {
+//                return convertFireExperts(item);
+//            } catch (Exception e) {
+//                return null;
+//            }
+//        });
+//    }
+//
+//    //由出生日期获得年龄
+//    public static int getAge(Date birthDay) {
+//        if (birthDay == null) {
+//            return 0;
+//        }
+//        LocalDate now = LocalDate.now();
+//        Calendar cal = Calendar.getInstance();
+//        cal.setTime(birthDay);
+//        int yearBirth = cal.get(Calendar.YEAR);
+//        int monthBirth = cal.get(Calendar.MONTH) + 1;
+//        int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH);
+//
+//        LocalDate birth = LocalDate.of(yearBirth, monthBirth, dayOfMonthBirth);
+//        if (birth.isAfter(now)) {
+//            return 0;
+//        }
+//        int age = birth.until(now).getYears();
+//        return age;
+//    }
+//
+//}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/pom.xml

@@ -10,14 +10,14 @@
   <artifactId>amos-boot-module-tzs-biz</artifactId>
 
   <dependencies>
-    	<dependency>
-			<groupId>com.amosframework.boot</groupId>
-			<artifactId>amos-boot-module-tzs-api</artifactId>
-			<version>${amos-biz-boot.version}</version>
-		</dependency>
+      <dependency>
+		<groupId>com.amosframework.boot</groupId>
+		<artifactId>amos-boot-module-tzs-api</artifactId>
+		<version>${amos-biz-boot.version}</version>
+      </dependency>
       <dependency>
           <groupId>com.amosframework.boot</groupId>
-          <artifactId>amos-boot-biz-common</artifactId>
+          <artifactId>amos-boot-module-common-biz</artifactId>
           <version>${amos-biz-boot.version}</version>
       </dependency>
   </dependencies>

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

@@ -6,6 +6,7 @@ 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.ElevatorDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorNewDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
 import com.yeejoin.amos.boot.module.tzs.api.vo.ElevatorVo;
@@ -162,14 +163,14 @@ public class ElevatorController extends BaseController {
     /**
      * 相似电梯模糊查询
      *
-     * @param elevatorDto 查询参数
+     * @param elevatorNewDto 查询参数
      * @return 返回结果
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/page/similar", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "相似电梯模糊查询", notes = "相似电梯模糊查询")
-    public ResponseModel<List<ElevatorVo>> similar(ElevatorDto elevatorDto) {
-        Elevator elevator = BeanDtoVoUtils.convert(elevatorDto, Elevator.class);
+    @RequestMapping(value = "/page/similar", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "相似电梯模糊查询", notes = "相似电梯模糊查询")
+    public ResponseModel<List<ElevatorVo>> similar(@RequestBody ElevatorNewDto elevatorNewDto) {
+        Elevator elevator = BeanDtoVoUtils.convert(elevatorNewDto.getElevatorDto(), Elevator.class);
         QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
         Class<? extends Elevator> aClass = elevator.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {

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

@@ -10,6 +10,7 @@ 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;
@@ -17,6 +18,7 @@ import com.yeejoin.amos.boot.module.tzs.biz.service.impl.AlertCalledServiceImpl;
 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;
@@ -30,7 +32,9 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 
 /**
@@ -251,6 +255,21 @@ public class MaintenanceUnitController extends BaseController {
         if (ValidationUtil.isEmpty(maintenanceUnit))
             throw new BadRequest("维保单位未找到");
         MaintenanceUnitVo maintenanceUnitVo = BeanDtoVoUtils.convert(maintenanceUnit, MaintenanceUnitVo.class);
+        List<DutyPersonVo> dutyPersonList = new ArrayList<DutyPersonVo>();
+        DutyPersonVo principal = new DutyPersonVo();
+        principal.setDeptName("主要负责人1");
+        principal.setPhone(maintenanceUnitVo.getPrincipalFirstPhone());
+        principal.setUserId(maintenanceUnitVo.getPrincipalFirstId()+"");
+        principal.setUserName(maintenanceUnitVo.getPrincipalFirst());
+        dutyPersonList.add(principal);
+        DutyPersonVo manager = new DutyPersonVo();
+        manager.setDeptName("主要负责人2");
+        manager.setPhone(maintenanceUnitVo.getPrincipalSecondPhone());
+        manager.setUserId(maintenanceUnitVo.getPrincipalSecondId()+"");
+        manager.setUserName(maintenanceUnitVo.getPrincipalSecond());
+        dutyPersonList.add(manager);
+        maintenanceUnitVo.setDutyPersonList(dutyPersonList);
+
         return ResponseHelper.buildResponse(maintenanceUnitVo);
     }
 

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

@@ -33,7 +33,7 @@ import java.util.List;
  * @date 2021-08-03
  */
 @RestController
-@Api(tags = "警情填报业务数据项Api")
+@Api(tags = "处置过程Api")
 @RequestMapping(value = "/tzs/repair-consult")
 public class RepairConsultController extends BaseController {
 
@@ -54,64 +54,6 @@ public class RepairConsultController extends BaseController {
 	}
 
 	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新警情填报业务数据项", notes = "根据sequenceNbr更新警情填报业务数据项")
-	public ResponseModel<RepairConsultDto> updateBySequenceNbrRepairConsult(@RequestBody RepairConsultDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(repairConsultServiceImpl.updateWithModel(model));
-	}
-
-	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除警情填报业务数据项", notes = "根据sequenceNbr删除警情填报业务数据项")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(repairConsultServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个警情填报业务数据项",  notes = "根据sequenceNbr查询单个警情填报业务数据项")
-	public ResponseModel<RepairConsultDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(repairConsultServiceImpl.queryBySeq(sequenceNbr));
-	}
-
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "警情填报业务数据项分页查询",  notes = "警情填报业务数据项分页查询")
-	public ResponseModel<Page<RepairConsultDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<RepairConsultDto> page = new Page<RepairConsultDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(repairConsultServiceImpl.queryForRepairConsultPage(page));
-	}
-
-	/**
 	 * 根据警情id 查找处置过程日志
 	 *
 	 * @return

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

@@ -10,10 +10,12 @@ import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 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.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;
@@ -31,7 +33,9 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 //import com.yeejoin.amos.boot.module.tzs.api.service.EquipFeignService;
 
@@ -215,6 +219,20 @@ public class UseUnitController extends BaseController {
         if (ValidationUtil.isEmpty(useUnit))
             throw new BadRequest("使用单位未找到");
         UseUnitVo useUnitVo = BeanDtoVoUtils.convert(useUnit, UseUnitVo.class);
+        List<DutyPersonVo> dutyPersonList = new ArrayList<DutyPersonVo>();
+        DutyPersonVo principal = new DutyPersonVo();
+        principal.setDeptName("主要负责人");
+        principal.setPhone(useUnitVo.getPrincipalPhone());
+        principal.setUserId(useUnitVo.getPrincipalId()+"");
+        principal.setUserName(useUnitVo.getPrincipal());
+        dutyPersonList.add(principal);
+        DutyPersonVo manager = new DutyPersonVo();
+        manager.setDeptName("电梯安全管理员");
+        manager.setPhone(useUnitVo.getManagerPhone());
+        manager.setUserId(useUnitVo.getManagerId()+"");
+        manager.setUserName(useUnitVo.getManager());
+        dutyPersonList.add(manager);
+        useUnitVo.setDutyPersonList(dutyPersonList);
         return ResponseHelper.buildResponse(useUnitVo);
     }
 }

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

@@ -54,64 +54,6 @@ public class VoiceRecordFileController extends BaseController {
 	}
 
 	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新通话记录附件", notes = "根据sequenceNbr更新通话记录附件")
-	public ResponseModel<VoiceRecordFileDto> updateBySequenceNbrVoiceRecordFile(@RequestBody VoiceRecordFileDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(voiceRecordFileServiceImpl.updateWithModel(model));
-	}
-
-	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除通话记录附件", notes = "根据sequenceNbr删除通话记录附件")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(voiceRecordFileServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个通话记录附件",  notes = "根据sequenceNbr查询单个通话记录附件")
-	public ResponseModel<VoiceRecordFileDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(voiceRecordFileServiceImpl.queryBySeq(sequenceNbr));
-	}
-
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "通话记录附件分页查询",  notes = "通话记录附件分页查询")
-	public ResponseModel<Page<VoiceRecordFileDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<VoiceRecordFileDto> page = new Page<VoiceRecordFileDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(voiceRecordFileServiceImpl.queryForVoiceRecordFilePage(page));
-	}
-
-	/**
 	 * 根据警情id 查找通话记录信息
 	 *
 	 * @return

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

@@ -116,6 +116,41 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         }
     }
 
+    @Override
+    public AlertCalledFormDto selectAlertCalledByIdNoCache(Long id) {
+        // 警情基本信息
+        AlertCalled alertCalled = this.getById(id);
+        QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("alert_called_id", id);
+        // 警情动态表单数据
+        List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
+        List<FormValue> formValue = new ArrayList<FormValue>();
+        if(list!=null&&list.size()>0) {
+            for (AlertFormValue alertFormValue : list) {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.getBlock());
+                formValue.add(value);
+            }
+        }
+        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());
+        }
+        AlertCalledFormDto alertCalledFormVo = new AlertCalledFormDto(alertCalledVo, 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

@@ -204,7 +204,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
     public DispatchSaveFeedbackDto getDispatchSaveFeedbackDtoByAlertId(Long alertId) {
         DispatchSaveFeedbackDto dispatchSaveFeedbackDto = new DispatchSaveFeedbackDto();
         dispatchSaveFeedbackDto.setAlertId(alertId);
-        AlertCalledFormDto alertCalledFormVo = (AlertCalledFormDto) alertCalledServiceImpl.selectAlertCalledById(alertId);
+        AlertCalledFormDto alertCalledFormVo = alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
         // 警情信息
         AlertCalledVo alertCalledVo = alertCalledFormVo.getAlertCalledVo();
         dispatchSaveFeedbackDto.setEmergency(alertCalledVo.getEmergencyPerson());
@@ -353,9 +353,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setRemark(dispatchSaveFeedbackDto.getRemark());
         dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackTime());
         // 保存动态表单数据
-        iAlertFormValueService.saveBatch(dynamicFormAlert);
+        iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
-        flag = this.save(dispatchPaper);
+        flag = this.updateById(dispatchPaper);
         return flag;
     }
 
@@ -363,7 +363,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
     public DispatchRepairFeedbackDto getDispatchRepairFeedbackDtoByAlertId(Long alertId) {
         DispatchRepairFeedbackDto dispatchRepairFeedbackDto = new DispatchRepairFeedbackDto();
         dispatchRepairFeedbackDto.setAlertId(alertId);
-        AlertCalledFormDto alertCalledFormVo = (AlertCalledFormDto) alertCalledServiceImpl.selectAlertCalledById(alertId);
+        AlertCalledFormDto alertCalledFormVo = alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
         // 警情信息
         AlertCalledVo alertCalledVo = alertCalledFormVo.getAlertCalledVo();
         dispatchRepairFeedbackDto.setEmergency(alertCalledVo.getEmergencyPerson());
@@ -543,9 +543,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setRemark(dispatchRepairFeedbackDto.getRemark());
         dispatchPaper.setFeedbackTime(dispatchRepairFeedbackDto.getFeedbackTime());
         // 保存动态表单数据
-        iAlertFormValueService.saveBatch(dynamicFormAlert);
+        iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
-        flag = this.save(dispatchPaper);
+        flag = this.updateById(dispatchPaper);
         return flag;
     }
 
@@ -553,7 +553,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
     public DispatchConsultFeedbackDto getDispatchConsultFeedbackDtoByAlertId(Long alertId) {
         DispatchConsultFeedbackDto dispatchConsultFeedbackDto = new DispatchConsultFeedbackDto();
         dispatchConsultFeedbackDto.setAlertId(alertId);
-        AlertCalledFormDto alertCalledFormVo = (AlertCalledFormDto) alertCalledServiceImpl.selectAlertCalledById(alertId);
+        AlertCalledFormDto alertCalledFormVo =  alertCalledServiceImpl.selectAlertCalledByIdNoCache(alertId);
         // 警情信息
         AlertCalledVo alertCalledVo = alertCalledFormVo.getAlertCalledVo();
         dispatchConsultFeedbackDto.setEmergency(alertCalledVo.getEmergencyPerson());
@@ -720,9 +720,9 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
         dispatchPaper.setFeedbackUname(dispatchConsultFeedbackDto.getFeedbackUname());
         dispatchPaper.setRemark(dispatchConsultFeedbackDto.getRemark());
         // 保存动态表单数据
-        iAlertFormValueService.saveBatch(dynamicFormAlert);
+        iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
-        flag = this.save(dispatchPaper);
+        flag = this.updateById(dispatchPaper);
         return flag;
     }
 

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

@@ -190,7 +190,7 @@ public class ESAlertCalledService {
 		}
         //警情类型一致
         BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
-        		.must(QueryBuilders.termQuery("alertTypeCode.keyword", alertCalled.getAlarmTypeCode()));
+        		.must(QueryBuilders.termQuery("alarmTypeCode.keyword", alertCalled.getAlarmTypeCode()));
         boolMust.should(qb4);
         //使用单位名称一致
         if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))

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.QueryWrapper;
-//import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
-import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
+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;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
@@ -23,8 +22,8 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 @Service
 public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, ElevatorMapper> implements IElevatorService {
 
-//    @Autowired
-//    ISourceFileService sourceFileService;
+    @Autowired
+    SourceFileServiceImpl sourceFileService;
 
     @Autowired
     AlertCalledServiceImpl alertCalledServiceImpl;

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

@@ -60,4 +60,6 @@ mqtt.topic.command.power.deployment=power
 
 security.systemctl.name=AMOS-API-SYSTEMCTL
 
+iot.fegin.name=AMOS-API-IOT
 
+equip.fegin.name=AMOS-EQUIPMANAGE
\ No newline at end of file

amos-boot-system-tzs/pom.xml

@@ -10,12 +10,20 @@
         <version>1.0.0</version>
     </parent>
 
-  <dependencies>
-      <dependency>
-          <groupId>com.amosframework.boot</groupId>
-          <artifactId>amos-boot-module-tzs-biz</artifactId>
-          <version>${amos-biz-boot.version}</version>
-      </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>com.amosframework.boot</groupId>
+            <artifactId>amos-boot-module-tzs-biz</artifactId>
+            <version>${amos-biz-boot.version}</version>
+        </dependency>
+    </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

amos-boot-system-tzs/src/main/java/com/yeejoin/amos/AmosTzsApplication.java

@@ -40,7 +40,7 @@ import java.net.UnknownHostException;
         "org.typroject.tyboot.face.*.orm.dao*",
         "org.typroject.tyboot.core.auth.face.orm.dao*",
         "org.typroject.tyboot.component.*.face.orm.dao*",
-        "com.yeejoin.amos.boot.module.tzs.api.mapper",
+        "com.yeejoin.amos.boot.module.*.api.mapper",
         "com.yeejoin.amos.boot.biz.common.dao.mapper"})
 @ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" })
 public class AmosTzsApplication {

amos-boot-system-tzs/src/main/resources/application.properties

@@ -16,4 +16,8 @@ spring.datasource.hikari.idle-timeout=30000
 spring.datasource.hikari.pool-name=DatebookHikariCP
 spring.datasource.hikari.max-lifetime=120000
 spring.datasource.hikari.connection-timeout=30000
-spring.datasource.hikari.connection-test-query=SELECT 1
+spring.datasource.hikari.connection-test-query=SELECT 1
\ No newline at end of file
+
+iot.fegin.name=AMOS-API-IOT
+
+equip.fegin.name=AMOS-EQUIPMANAGE
\ No newline at end of file