Merge branch 'developer' into developer-latentDanger

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -63,6 +63,14 @@ public class ControllerAop {
     public void doBefore(JoinPoint joinPoint) {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
+        // 不需要添加请求头的接口
+        String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText", "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/wechat-relation/save","/tzs/alert-called/saveMobile","/tzs/elevator/getElevatorInfo"};
+        // 获取请求路径
+        for(String uri : url) {
+            if(request.getRequestURI().indexOf(uri) != -1) {
+                return;
+            }
+        }
         //TODO tyboot 框架拦截器已缓存数据
         String token = RequestContext.getToken();
         // 平台studio配置的下载接口token从url里取
@@ -70,12 +78,6 @@ public class ControllerAop {
             fillRequestContext(request);
             token = RequestContext.getToken();
         }
-        // 不需要添加请求头的接口
-        String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText"};
-        // 获取请求路径
-        if (Arrays.asList(url).contains(request.getRequestURI())) {
-            return;
-        }
         if (token != null) {
             String pattern = RedisKey.buildPatternKey(token);
             //验证token有效性，防止token失效

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/IWorkflowExcuteService.java

+package com.yeejoin.amos.boot.biz.common.service;
+
+import java.util.Map;
+
+public interface IWorkflowExcuteService{
+
+	/**
+	 * 启动流程，并执行完成任务
+	 * @param key 流程定义的key
+	 * @param condition 执行控制条件
+	 */
+	String startAndComplete(String key,String condition)throws Exception;	
+	
+	/**
+	 * 检查当前登录人有没有流程操作权限
+	 * @param processInstanceId 流程定义的ID
+	 * @return true 可以执行，false 无执行权限
+	 */
+	boolean checkTaskAuth(String processInstanceId);
+	
+	/**
+	 * 检查当前登录人有没有流程操作权限
+	 * @param processInstanceId 流程定义的ID
+	 * @return 包含是否执行的角色权限flag，以及当前任务的id
+	 */
+	Map<String, Object> checkTaskAuthMap(String processInstanceId);
+	/**
+	 * 设置当前任务的执行人，只支持当前节点流程拥有单个可执行任务的情况，不支持并行网关产生的多条任务设置人的任务情况
+	 * @param processInstanceId
+	 * @return
+	 */
+	Object setTaskAssign(String processInstanceId,String userId);
+	/**
+	 * 完成task节点任务
+	 * @param processInstanceId
+	 * @param condition
+	 * @param userInfo
+	 * @return
+	 */
+	boolean CompleteTask(String processInstanceId,String condition);
+	
+	
+}

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

+package com.yeejoin.amos.boot.biz.common.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.service.IWorkflowExcuteService;
+import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
+
+@Service
+public class WorkflowExcuteServiceImpl implements IWorkflowExcuteService {
+
+	@Autowired
+	WorkflowFeignService workflowFeignService;
+
+	@Transactional
+	@Override
+	public String startAndComplete(String key, String condition) throws Exception {
+		JSONObject body = new JSONObject();
+		String businessKey = buildOrderNo();
+		body.put("businessKey", businessKey);
+		body.put("processDefinitionKey", key);
+		JSONObject jsonObject = workflowFeignService.startByVariable(body);
+		if (jsonObject == null || jsonObject.getJSONObject("data") == null) {
+			throw new RuntimeException("启动流程失败");
+		}
+		if (jsonObject != null) {
+			JSONObject instance = jsonObject.getJSONObject("data");
+			if (!excuteTask(instance.getString("id"), condition)) {
+				throw new RuntimeException("初始执行任务失败");
+			}
+		}
+		return jsonObject.getJSONObject("data").getString("id");
+	}
+
+	@Override
+	public boolean checkTaskAuth(String processInstanceId) {
+		Map<String, Object> map = checkTaskAuthMap(processInstanceId);
+		return Boolean.parseBoolean(map.get("checkFlag").toString());
+	}
+
+	@Override
+	public Map<String, Object> checkTaskAuthMap(String processInstanceId) {
+		// 获取当前登录用户的角色
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("checkFlag", false);
+		JSONObject teskObject = workflowFeignService.getTask(processInstanceId);
+		if (ObjectUtils.isNotEmpty(teskObject.getJSONObject("data"))) {
+			map.put("taskId", teskObject.getJSONObject("data").getString("id"));
+			map.put("checkFlag", true);
+			map.put("name", teskObject.getJSONObject("data").getString("name"));
+
+		}
+		/*
+		 * JSONObject teskObject = workflowFeignService.getTaskList(processInstanceId);
+		 * if (ObjectUtils.isNotEmpty(teskObject)) { JSONArray taskDetailArray =
+		 * teskObject.getJSONArray("data"); for (Object obj : taskDetailArray) {
+		 * JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
+		 * JSONObject taskGroupNameObject =
+		 * workflowFeignService.getTaskGroupName(detail.getString("id")); //
+		 * 获取流程中原本设置的当前节点的执行权限 JSONArray taskGroupNameDetail =
+		 * taskGroupNameObject.getJSONArray("data"); //
+		 * 如果拿不到当前任务的执行角色，再去获取当前任务有没有默认的执行人，如果都没有则返回校验失败 if
+		 * (ObjectUtils.isEmpty(taskGroupNameDetail)) { JSONObject taskAssignObject =
+		 * workflowFeignService.getTaskAssign(detail.getString("id")); String assignUser
+		 * = taskAssignObject.getJSONObject("data").getString("assignee"); if
+		 * (StringUtils.isNotBlank(assignUser)) { // 如果当前登录人与当前任务的设定人不一定，则直接返回权限校验失败 if
+		 * (!currentLoginUserId.equals(assignUser)) { return map; } else {
+		 * map.put("taskId", detail.getString("id")); map.put("checkFlag", true);
+		 * map.put("name", detail.getString("name")); map.put("assign", assignUser);
+		 * return map; } } continue; } String defaultExecutionRoleProcess =
+		 * taskGroupNameDetail.getJSONObject(0).getString("groupId"); //
+		 * 判断当前登录人的角色是不是与流程中设置的当前任务节点权限一致，一致则执行，不一致则退出 if
+		 * (!defaultExecutionRoleProcess.equals(currentLoginUserRole)) { continue; }
+		 * map.put("taskId", detail.getString("id")); map.put("checkFlag", true);
+		 * map.put("name", detail.getString("name"));
+		 * map.put("groupName",currentLoginUserRole); } }
+		 */
+
+		return map;
+	}
+
+	public boolean excuteTask(String procressId, String condition) throws Exception {
+		HashMap<String, Object> conditionMap = new HashMap<String, Object>();
+		conditionMap.put("condition", condition);
+		JSONObject teskObject = workflowFeignService.getTaskList(procressId);
+		if (ObjectUtils.isNotEmpty(teskObject)) {
+			JSONArray taskDetailArray = teskObject.getJSONArray("data");
+			for (Object obj : taskDetailArray) {
+				JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
+				workflowFeignService.pickupAndCompleteTask(detail.getString("id"), conditionMap);
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public Object setTaskAssign(String processInstanceId, String userId) {
+		JSONObject teskObject = workflowFeignService.getTaskList(processInstanceId);
+		if (ObjectUtils.isEmpty(teskObject)) {
+			throw new RuntimeException("设置任务执行人失败, 任务不存在，请检查processInstanceId" + processInstanceId + "是否正确");
+		}
+		JSONArray taskDetailArray = teskObject.getJSONArray("data");
+		for (Object obj : taskDetailArray) {
+			JSONObject detail = JSONObject.parseObject(JSONObject.toJSONString(obj));
+			JSONObject taskGroupNameObject = workflowFeignService.getTaskGroupName(detail.getString("id"));
+			try {
+				if (taskGroupNameObject.getJSONArray("data") == null
+						&& taskGroupNameObject.getJSONArray("data").size() < 1) {
+					workflowFeignService.setTaskUser(detail.getString("id"), userId);
+				}
+			} catch (Exception e) {
+				throw new RuntimeException("设置任务执行人失败");
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public boolean CompleteTask(String processInstanceId, String condition) {
+		Map<String, Object> map = checkTaskAuthMap(processInstanceId);
+		if (Boolean.parseBoolean(map.get("checkFlag").toString())) {
+			HashMap<String, Object> conditionMap = new HashMap<String, Object>();
+			conditionMap.put("condition", condition);
+			try {
+				workflowFeignService.pickupAndCompleteTask(map.get("taskId").toString(), conditionMap);
+			} catch (Exception e) {
+				throw new RuntimeException("完成任务失败");
+			}
+		} else {
+			throw new RuntimeException("没有执行权限");
+		}
+		return true;
+	}
+
+	public static String buildOrderNo() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String newDate = sdf.format(new Date());
+		String result = "";
+		Random random = new Random();
+		for (int i = 0; i < 3; i++) {
+			result += random.nextInt(10);
+		}
+		return newDate + result;
+	}
+}

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

@@ -30,6 +30,8 @@ public class RedisKey {
     public static final String TZS_ALERTCALLED_ID="tzs_alertcalled_id_";
     /**联通CTI token */
     public static final String CTI_TOKEN = "cti_token";
+    /**微信公众平台 token */
+    public static final String WECHAT_TOKEN = "wechat_token";
     
     /** 驼峰转下划线(简单写法，效率低于 ) */
 	public static String humpToLine(String str) {

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

@@ -25,7 +25,7 @@ public interface WorkflowFeignService {
 	JSONObject startByVariable(@RequestBody Object params);
 
 	/**
-	 * 完成任务
+	 * 以当前登录人作为任务完成人的完成任务操作
 	 *
 	 * @param taskID
 	 * @param variable
@@ -55,65 +55,115 @@ public interface WorkflowFeignService {
 	JSONObject getTaskGroupName(@PathVariable("taskId") String taskId);
 
 	/**
-	 * 我的待办
+	 * 查询当前登录人可执行的任务集合，-------我的待办
+	 * 
 	 * @param processDefinitionKey
 	 * @param userId
 	 * @return
 	 */
 	@RequestMapping(value = "/task/all-list", method = RequestMethod.GET)
-	 JSONObject getTasksNoAuth(@RequestParam(value="processDefinitionKey", required=false)  String processDefinitionKey,
-	    		@RequestParam(value="userId", required=false)  String userId) ;
+	JSONObject getTasksNoAuth(
+			@RequestParam(value = "processDefinitionKey", required = false) String processDefinitionKey,
+			@RequestParam(value = "userId", required = false) String userId);
+
 	/**
-	 * 流程信息
+	 * 查询历史流程信息
+	 * 
 	 * @param processDefinitionKey
 	 * @param userId
 	 * @return
 	 */
 	@RequestMapping(value = "/activitiHistory/processes/historytasks/list/{processInstanceId}", method = RequestMethod.GET)
-	 JSONObject queryHistoryTaskListByProcessId(@PathVariable("processInstanceId") String processInstanceId);
+	JSONObject queryHistoryTaskListByProcessId(@PathVariable("processInstanceId") String processInstanceId);
+
 	/**
 	 * 查询当前流程已经执行的任务
+	 * 
 	 * @param processInstanceId
 	 * @return
 	 */
 	@RequestMapping(value = "/activitiHistory/historyTask/{processInstanceId}", method = RequestMethod.GET)
 	JSONObject queryHistoryTasksByProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId);
+
 	/**
 	 * 拾取任务
+	 * 
 	 * @param taskID
 	 * @return
 	 */
 	@RequestMapping(value = "/task/pickuptask/{taskID}", method = RequestMethod.PUT)
-	JSONObject pickuptask(@PathVariable("taskID") String taskID) ;
+	JSONObject pickuptask(@PathVariable("taskID") String taskID);
+
 	/**
 	 * 直接完成任务
+	 * 
 	 * @param taskId
 	 * @param variable
 	 * @return
 	 */
 	@RequestMapping(value = "/task/complete/{taskId}", method = RequestMethod.POST)
 	JSONObject completeByVariable(@PathVariable("taskId") String taskId, @RequestBody HashMap<String, Object> variable);
-	
+
+	/**
+	 * 获取当前任务的设定执行人
+	 * 
+	 * @param taskId
+	 * @return
+	 */
 	@RequestMapping(value = "/task/getTaskAssign/{taskId}", method = RequestMethod.GET)
-	JSONObject getTaskAssign(@PathVariable("taskId") String taskId) ;
+	JSONObject getTaskAssign(@PathVariable("taskId") String taskId);
+
 	/**
 	 * 不操作FormInstance直接完成任务
+	 * 
 	 * @param taskID
 	 * @param variable
 	 * @return
 	 * @throws Exception
 	 */
 	@RequestMapping(value = "/task/completeTask/noFromInstanceAdd/{taskID}", method = RequestMethod.POST)
-	JSONObject completeNoExecuteFromInstanceAdd(@PathVariable("taskID") String taskID, @RequestBody(required = false) HashMap<String, Object> variable) throws Exception;
+	JSONObject completeNoExecuteFromInstanceAdd(@PathVariable("taskID") String taskID,
+			@RequestBody(required = false) HashMap<String, Object> variable) throws Exception;
 
-/**
- * 流程图高亮
- * */
+	/**
+	 * 流程图高亮
+	 */
 	@RequestMapping(value = "/activitiHistory/gethighLineImg/{processInstanceId}", method = RequestMethod.GET)
-	Response thighLineImg(@PathVariable("processInstanceId") String processInstanceId) ;
-/**
- * 流程图高亮图片
- * */
-	@RequestMapping(value = "/activitiHistory/gethighLine",method = RequestMethod.GET)
+	Response thighLineImg(@PathVariable("processInstanceId") String processInstanceId);
+
+	/**
+	 * 流程图高亮图片
+	 */
+	@RequestMapping(value = "/activitiHistory/gethighLine", method = RequestMethod.GET)
 	Response thighLine(@RequestParam("instanceId") String instanceId);
+
+	/**
+	 * 设置当前任务的执行组
+	 * 
+	 * @param taskId
+	 * @param groupName
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/task/setTaskGroupName/{taskId}/{groupName}", method = RequestMethod.GET)
+	JSONObject setTaskGroupName(@PathVariable("taskId") String taskId, @PathVariable("groupName") String groupName)
+			throws Exception;
+
+	/**
+	 * 设置当前任务的执行人
+	 * 
+	 * @param taskId
+	 * @param userId
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/task/setTaskAssignUser/{taskId}/{userId}", method = RequestMethod.GET)
+	JSONObject setTaskUser(@PathVariable("taskId") String taskId, @PathVariable("userId") String userId) throws Exception;
+	/**
+	 * 查询当前登录人所属角色或者id 所能执行的单个任务
+	 * @param processInstanceId
+	 * @return
+	 */
+	@RequestMapping(value = "/task/")
+	JSONObject getTask(@RequestParam(value="processInstanceId")  String processInstanceId);
 }

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

@@ -46,4 +46,17 @@ public class DutyCarDto implements Serializable {
 
     @ApiModelProperty(value = "值班信息")
     private List<DutyPersonShiftDto> dutyShift = new ArrayList<>();
+    // BUG 2807 更新人员车辆排版值班的保存逻辑 如果没有填写数据则保存空数据 。 同步修改 查询 导出相关逻辑 by kongfm 2021-09-14
+    @ApiModelProperty(value = "值班开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "值班结束时间")
+    private String endTime;
+
+    // 需求 958 新增值班区域 值班区域id 字段 前台保存字段 by kongfm 2021-09-15
+    @ApiModelProperty(value = "值班区域")
+    private String dutyArea;
+
+    @ApiModelProperty(value = "值班区域Id")
+    private String dutyAreaId;
 }

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

@@ -62,4 +62,9 @@ public class DutyCarExcelDto implements Serializable {
     @ExcelProperty(value = "车辆名称（车牌）", index = 4)
     @ApiModelProperty(value = "车辆名称")
     private String carName;
+    // 需求 958 新增值班区域 值班区域id 字段 导出字段 by kongfm 2021-09-15
+    @ExplicitConstraint(indexNum = 5, sourceClass = RoleNameExplicitConstraint.class, method = "getDutyArea") //固定下拉内容
+    @ExcelProperty(value = "值班区域", index = 5)
+    @ApiModelProperty(value = "值班区域")
+    private String dutyArea;
     }

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

@@ -39,4 +39,17 @@ public class DutyPersonDto implements Serializable {
 
     @ApiModelProperty(value = "值班信息")
     private List<DutyPersonShiftDto> dutyShift;
+    // BUG 2807 更新人员车辆排版值班的保存逻辑 如果没有填写数据则保存空数据 。 同步修改 查询 导出相关逻辑 by kongfm 2021-09-14
+    @ApiModelProperty(value = "值班开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "值班结束时间")
+    private String endTime;
+
+    // 需求 958 新增值班区域 值班区域id 字段 前台保存字段 by kongfm 2021-09-15
+    @ApiModelProperty(value = "值班区域")
+    private String dutyArea;
+
+    @ApiModelProperty(value = "值班区域Id")
+    private String dutyAreaId;
 }

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

@@ -52,4 +52,9 @@ public class DutyPersonExcelDto implements Serializable {
     @ExcelProperty(value = "岗位", index = 4)
     @ApiModelProperty(value = "岗位名称")
     private String postTypeName;
+    // 需求 958 新增值班区域 值班区域id 字段 导出字段 by kongfm 2021-09-15
+    @ExplicitConstraint(indexNum = 5, sourceClass = RoleNameExplicitConstraint.class, method = "getDutyArea") //固定下拉内容
+    @ExcelProperty(value = "值班区域", index = 5)
+    @ApiModelProperty(value = "值班区域")
+    private String dutyArea;
 }

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ZeHua Li
+ * @date 2020/9/8 13:46
+ * @since v2.0
+ */
+@Data
+public class EquipmentDetailDownloadTemplateDto implements Serializable {
+
+    @ExcelProperty(value = "器材名称", index = 0)
+   // @Excel(name = "器材名称", width = 30, orderNum = "1")
+    private String name;
+
+    @ExcelProperty(value = "器材编码（从装备定义中获取）", index = 1)
+    //@Excel(name = "器材编码（从装备定义中获取）", width = 30, orderNum = "2")
+    private String code;
+
+    @ExcelProperty(value = "规格型号", index = 2)
+    //@Excel(name = "规格型号", width = 30, orderNum = "3")
+    private String standard;
+
+    @ExcelProperty(value = "品牌", index = 3)
+    //@Excel(name = "品牌", width = 30, orderNum = "4")
+    private String brand;
+
+    @ExcelProperty(value = "生产厂家名称", index = 4)
+    //@Excel(name = "生产厂家名称", width = 30, orderNum = "5")
+    private String manufacturerName;
+
+    @ExcelProperty(value = "设备编码", index = 5)
+    //@Excel(name = "设备编码", width = 30, orderNum = "6")
+    private String systemCode;
+
+    @ExcelProperty(value = "物联编码", index = 6)
+    //@Excel(name = "物联编码", width = 30, orderNum = "7")
+    private String iotCode;
+
+    @ExcelProperty(value = "存放位置（货位编码）", index = 7)
+    //@Excel(name = "存放位置（货位编码）", width = 30, orderNum = "8")
+    private String warehouseStructCode;
+
+    @ExcelProperty(value = "位置信息", index = 8)
+    //@Excel(name = "位置信息", width = 30, orderNum = "9")
+    private String description;
+
+    @ExcelProperty(value = "消防系统编码", index = 9)
+    //@Excel(name = "消防系统编码", width = 30, orderNum = "10")
+    private String fightingSysCodes;
+
+    @ExplicitConstraint(indexNum = 10, sourceClass = RoleNameExplicitConstraint.class,method="getFireTeam") //动态下拉内容
+    @ExcelProperty(value = "所属队伍", index = 10)
+    //@Excel(name = "所属队伍",width = 30,orderNum = "11")
+    private String fireTeam;
+
+    //动态下拉内容
+    @ExplicitConstraint(indexNum = 11, sourceClass = RoleNameExplicitConstraint.class,method="getCompany") //动态下拉内容
+    @ExcelProperty(value = "所属单位", index = 11)
+    //@Excel(name = "所属单位",width = 30,orderNum = "12")
+    private String companyName;
+}

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author system_generator
  * @date 2021-08-04
@@ -36,8 +40,9 @@ public class FailureDetailsDto extends BaseDto {
     @ApiModelProperty(value = "故障设备")
     private String failureEquipment;
 
+    //@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "YYYY-MM-dd")
     @ApiModelProperty(value = "故障时间")
-    private Date faultTime;
+    private String faultTime;
 
     @ApiModelProperty(value = "故障现象")
     private String faultPhenomenon;

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

@@ -26,6 +26,10 @@ public class FireBrigadeResourceDto extends BaseDto {
     @ApiModelProperty(value = "资源图片")
     private List<String> image;
 
+
+    /*2403 队伍未显示图片 陈召 2021-09-23*/
+    private String pic;
+
     @ApiModelProperty(value = "资源类型")
     private String type;
 

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

@@ -52,46 +52,46 @@ public class FireChemicalDto extends BaseDto {
     private String formula;
 
     @ApiModelProperty(value = "主要成分")
-    @ExcelProperty(value = "主要成分", index = 7)
+    @ExcelIgnore
     private String ingredient;
 
     @ApiModelProperty(value = "泄漏处理")
-    @ExcelProperty(value = "泄漏处理", index = 8)
+    @ExcelProperty(value = "泄漏处理", index = 7)
     private String leakWay;
     @ExcelProperty(value = "中文名", index = 0)
     @ApiModelProperty(value = "中文名")
     private String name;
 
     @ApiModelProperty(value = "性状")
-    @ExcelProperty(value = "性状", index = 9)
+    @ExcelProperty(value = "性状", index = 8)
     private String property;
 
     @ApiModelProperty(value = "贮藏方法")
-    @ExcelProperty(value = "贮藏方法", index = 10)
+    @ExcelProperty(value = "贮藏方法", index = 9)
     private String store;
 
     @ApiModelProperty(value = "症状")
-    @ExcelProperty(value = "症状", index = 11)
+    @ExcelProperty(value = "症状", index = 10)
     private String symptom;
 
     @ApiModelProperty(value = "禁忌物/禁忌")
-    @ExcelProperty(value = "禁忌物/禁忌", index = 12)
+    @ExcelProperty(value = "禁忌物/禁忌", index = 11)
     private String tabu;
     @ExcelIgnore
     @ApiModelProperty(value = "类型code")
     private String typeCode;
 
-    @ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 13, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExplicitConstraint(type = "CHEMICALTYPE", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
     @ApiModelProperty(value = "类型名称")
-    @ExcelProperty(value = "类型名称", index = 13)
+    @ExcelProperty(value = "类型名称", index = 12)
     private String type;
     //    @ExplicitConstraint(indexNum=14,source = {"男","女"}) //固定下拉内容
-    @ExcelProperty(value = "国标号", index = 14)
+    @ExcelProperty(value = "国标号", index = 13)
     @ApiModelProperty(value = "国标号")
     private String un;
-
+    
+    @ExcelIgnore
     @ApiModelProperty(value = "化学品图片")
-    @ExcelProperty(value = "化学品图片", index = 15)
     private String image;
     @ExcelIgnore
     @ApiModelProperty(value = "更新时间")

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

@@ -107,11 +107,13 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "消防专家领域code")
     private String expertCode;
 
-    @ExcelProperty(value = "人员照片", index = 16)
+   // @ExcelProperty(value = "人员照片", index = 16)
+    @ExcelIgnore
     @ApiModelProperty(value = "人员照片")
     private String personnelPhotos;
 
-    @ExcelProperty(value = "资质证书", index = 17)
+  //  @ExcelProperty(value = "资质证书", index = 17)
+    @ExcelIgnore
     @ApiModelProperty(value = "资质证书")
     private String qualificationCertificate;
 
@@ -131,7 +133,7 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "消防机构name")
     private Long fireTeamName;
 
-    @ExcelProperty(value = "备注", index = 18)
+    @ExcelProperty(value = "备注", index = 16)
     @ApiModelProperty(value = "备注")
     private String note;
 

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

@@ -81,8 +81,8 @@ public class FireStationDto extends BaseDto {
     @ExcelProperty(value = "装备简要情况", index = 9)
     @ApiModelProperty(value = "装备简要情况")
     private String equipmentBrief;
-
-    @ExcelProperty(value = "微型消防站照片", index = 10)
+    /*bug 2963 微型消防站,导入模板里面不应该有照片字段  2021-09-24 CEHNZHAO*/
+    @ExcelIgnore
     @ApiModelProperty(value = "图片信息")
     private String img;
 

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

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
 import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
 * 消防队员
 *
@@ -171,13 +175,88 @@ public class FirefightersExcelDto extends BaseDto {
     @ExcelIgnore
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
-
+    
     @ExcelIgnore
-    @ApiModelProperty(value = "岗位资质")	
+    @ApiModelProperty(value = "人员id")
+    private Long firefightersId;
+	/*************************岗位职级***********************/
+    @ApiModelProperty(value = "员工层级")
+    @ExcelProperty(value = "员工层级", index = 22)
+    @ExplicitConstraint(type = "YGCJ", indexNum = 22, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    private String employeeHierarchy;
+
+    @ApiModelProperty(value = "行政职务")
+    @ExplicitConstraint(type = "XZZW", indexNum = 23, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "行政职务", index = 23)
+    private String administrativePosition;
+
+    @ApiModelProperty(value = "岗位资质")
+    @ExplicitConstraint(type = "GWZZ", indexNum = 24, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "岗位资质", index = 24)
     private String postQualification;
 
-    @ExcelIgnore
-    @ApiModelProperty(value = "专家领域")
+    @ApiModelProperty(value = "消防救援人员类别")
+    @ExplicitConstraint(type = "XFRYLB", indexNum = 25, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防救援人员类别", index = 25)
+    private String category;
+
+//    @ApiModelProperty(value = "消防救援人员状态")
+//    private String state;
+
+    @ApiModelProperty(value = "消防救援衔级别代码")
+    @ExplicitConstraint(type = "XFJYJB", indexNum = 26, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防救援衔级别代码", index = 26)
+    private String level;
+
+    @ApiModelProperty(value = "消防专家领域")
+    @ExplicitConstraint(type = "ZJLY", indexNum = 27, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防专家领域", index = 27)
     private String areasExpertise;
+    
+    /*************************学历教育***********************/
+    @ApiModelProperty(value = "第一学历")
+    @ExplicitConstraint(type = "XLLX", indexNum = 28, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "第一学历", index = 28)
+    private String firstDegree;
+
+    @ApiModelProperty(value = "最高学历")
+    @ExplicitConstraint(type = "XLLX", indexNum = 29, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "最高学历", index = 29)
+    private String highestEducation;
+
+    @ApiModelProperty(value = "学位")
+    @ExplicitConstraint(type = "XWLX", indexNum = 30, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "学位", index = 30)
+    private String academicDegree;
+
+    @ApiModelProperty(value = "毕业院校")
+    @ExcelProperty(value = "毕业院校", index = 31)
+    private String school;
+
+    @ApiModelProperty(value = "毕业专业名称")
+    @ExcelProperty(value = "毕业专业名称", index = 32)
+    private String professionalName;
+
+    
+    /*************************工作履历岗***********************/
+    @ApiModelProperty(value = "参加工作时间")
+    @ExcelProperty(value = "参加工作时间", index = 33)
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date workingHours;
+
+	@ApiModelProperty(value = "参加消防部门工作时间")
+	 @ExcelProperty(value = "参加消防部门工作时间", index = 34)
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date fireWorkingHours;
+	
+	
+	
+
+ 
+    
+    
+	
 
 }

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+* 消防人员配装记录
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="FirefightersJacketDto", description="消防人员配装记录")
+public class FirestationJacketDto extends BaseDto {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "消防队员")
+    private Long firefightersId;
+
+    @ApiModelProperty(value = "装备id")
+    private Long equipmentDetailId;
+
+    @ApiModelProperty(value = "装备数量")
+    private Double amount;
+
+    @ApiModelProperty(value = "装备计量单位")
+    private String unit;
+
+    @ApiModelProperty(value = "装备名称")
+    private String equipmentDetailName;
+
+    @ApiModelProperty(value = "装备分类名称")
+    private String equipmentTypeName;
+
+    @ApiModelProperty(value = "配发日期")
+    private Date allotmentTime;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "操作人名称")
+    private String recUserName;
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/9/17
+ */
+public class KeySiteDateDto {
+
+
+    @ApiModelProperty(value = "id")
+    private String key;
+    @ApiModelProperty(value = "id")
+    private String value;
+
+    @ApiModelProperty(value = "重点部位名称")
+    private String label;
+
+    @ApiModelProperty(value = "位置")
+    private String fireLocation;
+    @ApiModelProperty(value = "經度")
+    private String floorLongitude;
+    @ApiModelProperty(value = "緯度")
+    private String floorLatitude;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getFireLocation() {
+        return fireLocation;
+    }
+
+    public void setFireLocation(String fireLocation) {
+        this.fireLocation = fireLocation;
+    }
+
+    public String getFloorLongitude() {
+        return floorLongitude;
+    }
+
+    public void setFloorLongitude(String floorLongitude) {
+        this.floorLongitude = floorLongitude;
+    }
+
+    public String getFloorLatitude() {
+        return floorLatitude;
+    }
+
+    public void setFloorLatitude(String floorLatitude) {
+        this.floorLatitude = floorLatitude;
+    }
+}

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

@@ -85,6 +85,12 @@ public class KeySiteDto  extends BaseDto implements Serializable{
     @ApiModelProperty(value = "使用性质名称")
     private String useNatureName;
     
+    @ApiModelProperty(value = "经度")
+    private Double longitude;
+    
+    @ApiModelProperty(value = "纬度")
+    private Double latitude;
+    
     @ApiModelProperty(value = "备注")
     private String remark;
     

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

@@ -53,53 +53,52 @@ public class KeySiteExcleDto implements Serializable {
 	private String buildingArea;
 	
 	@ExcelIgnore
-	@ExcelProperty(value = "建筑高度(m)", index = 5)
 	@ApiModelProperty(value = "建筑高度(m)")
 	private String buildingHeight;
-	@ExplicitConstraint(type = "NHDJ", indexNum =6, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-	@ExcelProperty(value = "耐火等级", index = 6)
+	@ExplicitConstraint(type = "NHDJ", indexNum =5, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "耐火等级", index = 5)
 	@ApiModelProperty(value = "耐火等级")
 	private String fireEnduranceRate;
 	
-	@ExplicitConstraint(type = "JZWSYXZ", indexNum =7, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-	@ExcelProperty(value = "使用性质", index = 7)
+	@ExplicitConstraint(type = "JZWSYXZ", indexNum =6, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+	@ExcelProperty(value = "使用性质", index = 6)
 	@ApiModelProperty(value = "使用性质")
 	private String useNature;
  
-	@ExcelProperty(value = "责任人", index = 8)
+	@ExcelProperty(value = "责任人", index = 7)
 	@ApiModelProperty(value = "责任人")
 	private String chargePerson;
    
-	@ExcelProperty(value = "责任人身份证", index = 9)
+	@ExcelProperty(value = "责任人身份证", index = 8)
 	@ApiModelProperty(value = "责任人身份证")
 	private String chargePersonId;
 
-	@ExcelProperty(value = "确定重点防火部位的原因", index = 10)
+	@ExcelProperty(value = "确定重点防火部位的原因", index = 9)
 	@ApiModelProperty(value = "确定重点防火部位的原因")
 	private String keyPreventionReason;
    
-	@ExcelProperty(value = "消防设施情况", index = 11)
+	@ExcelProperty(value = "消防设施情况", index = 10)
 	@ExplicitConstraint(indexNum=11,source = {"有","无"})
 	@ApiModelProperty(value = "消防设施情况")
 	private String fireFacilitiesInfo;
  
-	@ExcelProperty(value = "防火标志设立情况", index = 12)
+	@ExcelProperty(value = "防火标志设立情况", index = 11)
 	@ApiModelProperty(value = "防火标志设立情况")
 	private String firePreventionFlagName;
 
-	@ExcelProperty(value = "危险源", index = 13)
+	@ExcelProperty(value = "危险源", index = 12)
 	@ApiModelProperty(value = "危险源")
 	private String hazard;
 
-	@ExcelProperty(value = "消防安全管理措施", index = 14)
+	@ExcelProperty(value = "消防安全管理措施", index = 13)
 	@ApiModelProperty(value = "消防安全管理措施")
 	private String safetyManagementMeasures;
  
-	@ExcelProperty(value = "防范手段措施", index = 15)
+	@ExcelProperty(value = "防范手段措施", index = 14)
 	@ApiModelProperty(value = "防范手段措施")
 	private String preventiveMeasures;
 
-	@ExcelProperty(value = "备注", index = 16)
+	@ExcelProperty(value = "备注", index = 15)
 	@ApiModelProperty(value = "备注")
 	private String remark;
 }

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

@@ -18,10 +18,11 @@ public class OrgusrDataxDto {
 
    @ApiModelProperty(value = "单位基本信息")
    private  OrgUsrzhDto  OrgUsrzhDto;
-   @ApiModelProperty(value = "现场图片")
+   @ApiModelProperty(value = "消防通道布置图")
    private List<String> scenePicture;
-   @ApiModelProperty(value = "平面图")
+   @ApiModelProperty(value = "建筑平面图")
    private List<String> planePicture;
-
+   @ApiModelProperty(value = "建筑立面图")
+   private List<String> facadePicture;
 
 }

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

@@ -30,7 +30,10 @@ public class RequestData {
 
     @ApiModelProperty(value = "是否只显示24小时内警情")
     private  Boolean whether24=false;
-
+    /*2547 增加灾情事件类型匹配规则 xml中同步增加模糊查询 54-56行 陈召 2021-09-24 开始*/
+    @ApiModelProperty(value = "灾情事件类型模糊匹配")
+    private String alertType;
+    /*2547 增加灾情事件类型匹配规则 xml中同步增加模糊查询 54-56行 陈召 2021-09-24 结束*/
     @ApiModelProperty(value = "灾情地址模糊匹配")
     private String address;
 

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 单位归属
+ *
+ * @author gaojianqiang
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel(value = "UserDto", description = "用户信息")
+public class UserDto {
+
+    @ApiModelProperty(value = "人员类型1-维保公司；2-业主单位")
+    private String identityType;
+
+    @ApiModelProperty(value = "人员id")
+    private String personSeq;
+
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+
+    @ApiModelProperty(value = "公司id")
+    private String companyId;
+
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "字段名")
+    private String fieldCode;
+
+    @ApiModelProperty(value = "字段值")
+    private String fieldValue;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "机构类型（部门：DEPARTMENT，单位：COMPANY，人员：PERSON）")
+    private String bizOrgType;
+
+}

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

@@ -4,6 +4,7 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 
 import lombok.Data;
@@ -51,8 +52,9 @@ public class FailureDetails extends BaseEntity {
     /**
      * 故障时间
      */
+    @JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "YYYY-MM-dd")
 	@TableField("fault_time")
-    private Date faultTime;
+    private String faultTime;
 
     /**
      * 故障现象

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

@@ -129,4 +129,10 @@ public class Firefighters extends BaseEntity {
 
     @ApiModelProperty(value = "现居住地详细地址")
     private String residenceDetailVal;
+
+    @ApiModelProperty(value = "amos账户名称")
+    private String amosName;
+
+    @ApiModelProperty(value = "amos账户id")
+    private String amosUserId;
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 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.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -12,6 +13,9 @@ import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
 * 消防员思想谈话记录
 *
@@ -51,6 +55,10 @@ public class FirefightersThought extends BaseEntity {
     @ApiModelProperty(value = "附件")
     private String enclosure;
 
+    @ApiModelProperty(value = "附件")
+    @TableField(exist = false)
+    private Map<String, List<AttachmentDto>> attachments;
+
     @ApiModelProperty(value = "更新时间")
     @TableField(fill=FieldFill.UPDATE)
     private Date updateTime;

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

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+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 org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+* 消防人员配装记录
+*
+* @author tb
+* @date 2021-06-07
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_firestation_jacket")
+@ApiModel(value="FirestationJacket", description="微型消防站配装记录")
+public class FirestationJacket extends BaseEntity {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "消防队员")
+    private Long firefightersId;
+
+    @ApiModelProperty(value = "装备id")
+    private Long equipmentDetailId;
+
+    @ApiModelProperty(value = "装备数量")
+    private Double amount;
+
+    @ApiModelProperty(value = "装备计量单位")
+    private String unit;
+
+    @ApiModelProperty(value = "装备库存明细id")
+    private Long stockDetailId;
+    
+    
+    @ApiModelProperty(value = "装备名称")
+    private String equipmentDetailName;
+
+    @ApiModelProperty(value = "装备分类名称")
+    private String equipmentTypeName;
+
+    @ApiModelProperty(value = "配发日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(fill=FieldFill.INSERT_UPDATE)
+    private Date allotmentTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill=FieldFill.UPDATE)
+    private Date updateTime;
+}

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

@@ -137,4 +137,11 @@ public class KeySite extends BaseEntity {
 	@TableField("remark")
     private String remark;
 
+
+    @TableField( "longitude")
+    private Double longitude;
+
+    @TableField("latitude")
+    private Double latitude;
+
 }

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -93,7 +94,20 @@ public interface EquipFeignClient {
      */
     @RequestMapping(value = "/building/tree", method = RequestMethod.GET)
     ResponseModel<Object> getBuildingTree();
-
+    /**
+     * 获取消防建筑详情
+     *
+     * @return
+     */
+    @RequestMapping(value = "/building/getOne", method = RequestMethod.GET)
+    ResponseModel<Object> getOne(@RequestParam Long instanceId);
+    /**
+     * 获取指定建筑的经纬度信息
+     *
+     * @return
+     */
+    @RequestMapping(value = "/building/getBuildingToLongitudeAndLatitude", method = RequestMethod.GET)
+    ResponseModel<Object> getBuildingToLongitudeAndLatitude(@RequestParam String instanceId);
     /**
      * 更新车辆状态
      *
@@ -180,7 +194,6 @@ public interface EquipFeignClient {
     @RequestMapping(value = "/equipSpecificAlarm/getcountAlarmHandle/{type}", method = RequestMethod.GET)
     ResponseModel<Integer> getcountAlarmHandle(@PathVariable String type);
 
-
     /**
      * 获取装备全路径
      *
@@ -189,4 +202,25 @@ public interface EquipFeignClient {
     @RequestMapping(value = "/building/getBuildingAbsolutePosition", method = RequestMethod.GET)
     ResponseModel<Map<String, Object>> getBuildingAbsolutePosition();
 
+    /**
+     * 根据实例id 获取实例信息 // 需求 958 新增值班区域 值班区域id 字段 获取名称 by kongfm 2021-09-15
+     *
+     * @return
+     */
+    @RequestMapping(value = "/building/getFormInstanceById", method = RequestMethod.GET)
+    ResponseModel<Map<String, Object>> getFormInstanceById(@RequestParam Long instanceId);
+
+    /**
+     * 查询所有建筑的数据字典 // 需求 958 新增值班区域 值班区域id 字段  获取下拉列表 by kongfm 2021-09-15
+     * @return
+     */
+    @RequestMapping(value = "/building/getAllBuilding", method = RequestMethod.GET)
+    ResponseModel<List<LinkedHashMap<String, Object>>> getAllBuilding();
+
+    /**
+     * 查询所有建筑的数据字典// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
+     * @return
+     */
+    @RequestMapping(value = "equipment-category/tree/{type}", method = RequestMethod.GET)
+    ResponseModel<List<LinkedHashMap<String, Object>>> getEquipmentCategory(@PathVariable String type);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java

@@ -86,4 +86,23 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
             @Param("groupCode") String groupCode);
 
     List<DynamicFormInstance> getInstanceByCodeAndValue(String code, String value);
+
+    /**
+     * 新分页查询带日期过滤// 不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14
+     *
+     * @param page       分页信息
+     * @param appKey     应用
+     * @param fieldCodes 字段
+     * @param groupCode  表单类型
+     * @return IPage<Map < String, Object>>
+     */
+    IPage<Map<String, Object>> pageListNew(
+            Page page,
+            @Param("appKey") String appKey,
+            @Param("fieldCodes") Map<String, Object> fieldCodes,
+            @Param("groupCode") String groupCode,
+            @Param("params") Map<String, String> params,
+            @Param("stratTime") String stratTime,
+            @Param("endTime") String endTime
+    );
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FailureDetailsMapper.java

@@ -22,124 +22,141 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
 
     /**
      * 查询全部 分页
+     *
      * @param currentStatus 当前任务状态
-     *      * @param  startTime 起始时间
-     *      * @param endTime 结束时间
-     *      * @param submissionPid 报送人
-     * @param current 当前页
+     *                      * @param  startTime 起始时间
+     *                      * @param endTime 结束时间
+     *                      * @param submissionPid 报送人
+     * @param current       当前页
      * @return
      */
 
-    List<FailureDetails> selectAllPage(Long current,Long size, Long currentStatus,
-                                        String startTime,String endTime, Integer submissionPid);
-
-
+    List<FailureDetails> selectAllPage(Long current, Long size, Long currentStatus,
+                                       String startTime, String endTime, Integer submissionPid);
 
+    List<FailureDetailsDto> selectWebPage(Long current, Long size,Long currentStatus,
+                                       String startTime, String endTime, String submissionName, Long submissionBranchId,
+                                       Long sequenceNbr);
 
     /**
      * 查询我发起的 分页
      * current 当前页
      * size 条数
+     *
      * @param currentStatus 当前任务状态
-     *      * @param  startTime 起始时间
-     *      * @param endTime 结束时间
-     *      * @param submissionPid 报送人
+     *                      * @param  startTime 起始时间
+     *                      * @param endTime 结束时间
+     *                      * @param submissionPid 报送人
      * @return
      */
-    List<FailureDetails> selectISubPage(Long current,Long size, Long currentStatus,
-                                         String startTime,String endTime, Integer submissionPid);
+    List<FailureDetails> selectISubPage(Long current, Long size, Long currentStatus,
+                                        String startTime, String endTime, Integer submissionPid);
 
     /**
      * 查询待处理 分页
+     *
      * @param currentStatus 当前任务状态
-     *      * @param  startTime 起始时间
-     *      * @param endTime 结束时间
-     *      * @param submissionPid 报送人
+     *                      * @param  startTime 起始时间
+     *                      * @param endTime 结束时间
+     *                      * @param submissionPid 报送人
      * @param
      * @return
      */
-    List<FailureDetails> selectInProcessing(Long current,Long size,Long currentStatus,
-                                             String startTime,String endTime, Integer submissionPid);
+    List<FailureDetails> selectInProcessing(Long current, Long size, Long currentStatus,
+                                            String startTime, String endTime, Integer submissionPid);
+
     /**
      * 查询待处理  应急指挥科人员分页
      *
      * @param
      * @return
      */
-    List<FailureDetails> selectStatusWaitTj(Long current,Long size,Long currentStatus,
-                                             String startTime,String endTime, Integer submissionPid);
+    List<FailureDetails> selectStatusWaitTj(Long current, Long size, Long currentStatus,
+                                            String startTime, String endTime, Integer submissionPid);
+
     /**
      * 查询待处理  维修人员分页
+     *
      * @param currentStatus 当前任务状态
-     *      * @param  startTime 起始时间
-     *      * @param endTime 结束时间
-     *      * @param submissionPid 报送人
+     *                      * @param  startTime 起始时间
+     *                      * @param endTime 结束时间
+     *                      * @param submissionPid 报送人
      * @param
      * @return
      */
-    List<FailureDetails> selectStatusWaitWx(Long current,Long size,Long currentStatus,
-                                             String startTime,String endTime, Integer submissionPid);
+    List<FailureDetails> selectStatusWaitWx(Long current, Long size, Long currentStatus,
+                                            String startTime, String endTime, Integer submissionPid);
 
 
     /**
      * 统计  全部
      *
      * @param currentStatus 状态
-     * @param   startTime 起始时间
-     * @param   endTime 结束时间
-     * @param   submissionPid 报送人
-     *
+     * @param startTime     起始时间
+     * @param endTime       结束时间
+     * @param submissionPid 报送人
      * @return
      */
-    List<StatusDto> selectStatusCount(Long currentStatus,String startTime,String endTime, Integer submissionPid);
+    List<StatusDto> selectStatusCount(Long currentStatus, String startTime, String endTime, Integer submissionPid);
 
 
     /**
      * 统计  维修人员
      *
      * @param currentStatus 状态
-     * @param   startTime 起始时间
-     * @param   endTime 结束时间
-     * @param   submissionPid 报送人
-     *
+     * @param startTime     起始时间
+     * @param endTime       结束时间
+     * @param submissionPid 报送人
      * @return
      */
-    List<StatusDto> selectStatusWx(Long currentStatus,String startTime,String endTime, Integer submissionPid);
+    List<StatusDto> selectStatusWx(Long currentStatus, String startTime, String endTime, Integer submissionPid);
+
     /**
      * 统计  应急指挥科人员
      *
      * @param currentStatus 状态
-     * @param   startTime 起始时间
-     * @param   endTime 结束时间
-     * @param   submissionPid 报送人
-     *
+     * @param startTime     起始时间
+     * @param endTime       结束时间
+     * @param submissionPid 报送人
      * @return
      */
-    List<StatusDto> selectStatusFq(Long currentStatus,String startTime,String endTime, Integer submissionPid);
+    List<StatusDto> selectStatusFq(Long currentStatus, String startTime, String endTime, Integer submissionPid);
+
     /**
      * 统计  我发起
      *
      * @param currentStatus 状态
-     * @param   startTime 起始时间
-     * @param   endTime 结束时间
-     * @param   submissionPid 报送人
-     *
+     * @param startTime     起始时间
+     * @param endTime       结束时间
+     * @param submissionPid 报送人
      * @return
      */
-    List<StatusDto> selectStatusFqp(Long currentStatus,String startTime,String endTime, Integer submissionPid);
+    List<StatusDto> selectStatusFqp(Long currentStatus, String startTime, String endTime, Integer submissionPid);
+
     /**
      * 统计  领导
      *
      * @param currentStatus 状态
-     * @param   startTime 起始时间
-     * @param   endTime 结束时间
-     * @param   submissionPid 报送人
-     *
+     * @param startTime     起始时间
+     * @param endTime       结束时间
+     * @param submissionPid 报送人
      * @return
      */
-    List<StatusDto> selectStatusLeader(Long currentStatus,String startTime,String endTime, Integer submissionPid);
+    List<StatusDto> selectStatusLeader(Long currentStatus, String startTime, String endTime, Integer submissionPid);
+
+
+    List<StatusDto> selectAudit(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
+
+    List<StatusDto> selectMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId);
+
+    List<StatusDto> selectUserId(Long currentStatus, String startTime, String endTime,  String userId);
+
+    List<FailureDetails> selectYJ(Long currentStatus, String startTime, String endTime,  String userId,Long current, Long size);
+
+    List<FailureDetails> selectForAudit(Long currentStatus, String startTime, String endTime,Integer submissionPid,  String userId,Long current, Long size);
 
 
+    List<FailureDetails> selectForMaintain(Long currentStatus, String startTime, String endTime, Integer submissionPid, String userId,Long current, Long size);
 
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireTeamMapper.java

@@ -39,7 +39,7 @@ public interface FireTeamMapper extends BaseMapper<FireTeam> {
 	 *
 	 * @return
 	 */
-	List<FireBrigadeResourceDto> listMonitorFireBrigade();
+	List<FireBrigadeResourceDto> listMonitorFireBrigade(@Param("code") String code );
 
 	/**
 	 * 查询消防队伍卡片分页列表

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java

@@ -33,4 +33,6 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
     List<FirefightersTreeDto> getFirefightersJobTitleCount();
 
     List<FirefightersExcelDto> exportToExcel(Boolean isDelete);
+
+    List<String> getFirefightersName(String contactName);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirestationJacketMapper.java

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FirestationJacket;
+
+/**
+* 消防人员配装记录 Mapper 接口
+*
+* @author tb
+* @date 2021-06-07
+*/
+public interface FirestationJacketMapper extends BaseMapper<FirestationJacket> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
 
@@ -33,4 +34,8 @@ public List<KeySiteDto> getKeySiteList();
  */
 public KeySiteDto getSequenceNbr(Long sequenceNbr);
 
+
+public  List<KeySiteDateDto> getKeySiteDate(Long id);
+public List<String> getAddress(String address);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -23,6 +23,9 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<Map<String, Object>> selectPersonList(@Param("map")Map<String, Object> map);
 
+    //BUG 2880  by litw start 2021年9月16日
+    List<OrgUsr> selectAllChildrenList(@Param("map")Map<String, Object> map);
+
 	List<OrgUsr> selectCompanyDepartmentMsg();
 
 	List<Map<String, Object>> selectPersonAllList(Map<String, Object> map);
@@ -71,10 +74,14 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<UserUnitDto>  getUserUnit(String id, String type, String code);
 
+    List<UserDto> getUserInfo(String id, String type, String code, String[] fieldCode);
+
     /**
      * 导出机场单位带过滤      bug2657 by kongfm
      * @param parentId
      * @return
      */
     List< OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
+
+    List<OrgUsr> amosIdExist(String amosId);
 }

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.common.api.service;
 
 import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
 
+import java.util.List;
+
 /**
  * @author DELL
  */
@@ -23,4 +25,11 @@ public interface IDutyPersonService extends IDutyCommonService {
      * @return List<DutyCarDto>
      */
     DutyPersonDto update(Long instanceId, DutyPersonDto dutyPersonDto);
+
+    /**
+     * 根据区域ID 查询此时该区域值班人员 新需求 提供根据区域ID 获取值班人员 by kongfm 2021-09-15
+     * @param dutyAreaId
+     * @return
+     */
+    List<DutyPersonDto> findByDutyAreaId(Long dutyAreaId);
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
+import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
@@ -64,4 +65,8 @@ public boolean saveExcel(List<KeySiteExcleDto> excelDtoList);
  * @return
  */
 public  List<OrgMenuDto> getBuildAndKeyTree(Long sequenceNbr);
+
+public  List<KeySiteDateDto> getKeySiteDate(Long id);
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DutyPersonShiftMapper.xml

@@ -18,6 +18,7 @@
         AND i.field_code = 'userId'
         and s.duty_date >= #{beginDate}
         and s.duty_date <![CDATA[<=]]> #{endDate}
+        AND s.shift_id is not null <!--// BUG 2807 更新人员车辆排版值班的保存逻辑 如果没有填写数据则保存空数据 。 同步修改 查询 导出相关逻辑 by kongfm 2021-09-14-->
         and s.app_Key = #{appKey}
         GROUP BY s.duty_date,s.shift_id <!--增添分组条件 根据班次分组技术 -->
         ) a) as maxDutyPersonNumDay,
@@ -56,6 +57,7 @@
           AND ds.sequence_nbr = s.shift_id
           AND i.field_code = 'userName'
           AND s.duty_date = #{dutyDate}
+          AND s.shift_id is not null
           AND s.app_key = #{appKey}
           and i.group_code =#{groupCode}
         GROUP BY
@@ -76,6 +78,7 @@
             s.instance_id = i.instance_id
           and i.field_code = 'postTypeName'
           AND s.duty_date = #{dutyDate}
+          AND s.shift_id is not null
           AND s.app_key = #{appKey}
           and i.group_code =#{groupCode}
         GROUP BY i.field_value

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -198,4 +198,61 @@
             </if>
         </where>
     </select>
+
+
+    <!--不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14-->
+    <select id="pageListNew" resultType="java.util.Map">
+        select
+        d.*
+        from
+        (
+        select
+        i.INSTANCE_ID instanceId,
+        i.GROUP_CODE groupCode,
+        <foreach collection="fieldCodes" item="value" index="key" separator=",">
+            MAX(CASE WHEN i.FIELD_CODE = #{key} THEN i.FIELD_VALUE END) as ${key},
+            IF(FIND_IN_SET(i.field_type,'radio,select,treeSelect'), MAX(CASE WHEN i.FIELD_CODE = #{key} THEN
+            i.FIELD_VALUE_LABEL END), null) as ${key}Label
+        </foreach>
+        from
+        cb_dynamic_form_instance i
+        where
+        i.GROUP_CODE = #{groupCode}
+        and i.is_delete = 0
+        <if test="appKey != null and appKey !=''">
+            and i.APP_KEY = #{appKey}
+        </if>
+        <foreach collection="params" index="key" item="value" separator="">
+            <if test="key != null and key == 'instanceIds' ">
+                and find_in_set(i.instance_id, #{value}) > 0
+            </if>
+        </foreach>
+        GROUP by
+        i.INSTANCE_ID) d
+        <if test="params != null and params.size() > 0">
+            where
+            d.instanceId in (
+            select tt.instance_id from cb_duty_person_shift tt where tt.duty_date >= #{stratTime}
+            and tt.duty_date <![CDATA[<=]]>  #{endTime}
+            )
+            <foreach collection="params" index="key" item="value" separator="">
+                <choose>
+                    <when test="fieldCodes[key] == 'like' and value !=null and value !=''">
+                        and d.${key} like concat('%',#{value},'%')
+                    </when>
+                    <when test="fieldCodes[key] == 'eq' and value !=null and value !=''">
+                        and d.${key} = #{value}
+                    </when>
+                    <when test="fieldCodes[key] == 'ge' and value !=null and value !=''">
+                        and d.${key} >= #{value}
+                    </when>
+                    <when test="fieldCodes[key] == 'le' and value !=null and value !=''">
+                        and d.${key} <![CDATA[<=]]> #{value}
+                    </when>
+                </choose>
+            </foreach>
+        </if>
+        order by instanceId desc
+    </select>
+
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.FailureDetailsMapper">
+
     <select id="selectAllPage" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
         SELECT
         sequence_nbr,
@@ -28,6 +29,42 @@
                 and submission_pid = #{submissionPid}
             </if>
         </where>
+        order by submission_time DESC limit #{current},#{size};
+    </select>
+
+    <select id="selectWebPage" resultType="com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto">
+        SELECT
+        sequence_nbr,
+        current_status,
+        failure_equipment_id,
+        failure_equipment,
+        fault_time,
+        fault_phenomenon,
+        submission_name,
+        submission_pid,
+        biz_code,
+        submission_time,
+        submission_branch,
+        submission_branch_id
+        FROM
+        cb_failure_details
+        <where>
+            <if test="currentStatus!= null ">
+                and current_status = #{currentStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and submission_time between #{startTime} and #{endTime}
+            </if>
+            <if test="submissionName != null ">
+                and submission_name = #{submissionName}
+            </if>
+            <if test="submissionBranchId!= null ">
+                and submission_branch_id = #{submissionBranchId}
+            </if>
+            <if test="sequenceNbr!= null ">
+                and  sequence_nbr = #{ sequenceNbr}
+            </if>
+        </where>
         order by submission_time DESC limit #{current},#{size}
     </select>
 
@@ -257,5 +294,177 @@
         GROUP BY cb_failure_details.current_status
     </select>
 
+    <select id="selectAudit" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
+        SELECT
+            current_status,
+            count(current_status)
+                AS currentStatusCount
+        FROM
+            cb_failure_details d
+
+        <where>
+            d.sequence_nbr  in
+            (SELECT
+            fault_id
+            FROM
+            cb_failure_audit
+            where
+            rec_user_id = #{userId}
+            )
+            <if test="currentStatus!= null ">
+                and current_status = #{currentStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and submission_time between #{startTime} and #{endTime}
+            </if>
+            <if test="submissionPid!= null ">
+                and submission_pid = #{submissionPid}
+            </if>
+        </where>
+        GROUP BY current_status;
+    </select>
+
+    <select id="selectMaintain" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
+        SELECT
+            current_status,
+            count(current_status)
+                AS currentStatusCount
+        FROM
+            cb_failure_details d
+        <where>
+            d.sequence_nbr  in
+            (SELECT
+            fault_id
+            FROM
+            cb_failure_maintain
+            where
+            rec_user_id = #{userId}
+            )
+            <if test="currentStatus!= null ">
+                and current_status = #{currentStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and submission_time between #{startTime} and #{endTime}
+            </if>
+            <if test="submissionPid!= null ">
+                and submission_pid = #{submissionPid}
+            </if>
+        </where>
+        GROUP BY current_status;
+    </select>
+
+    <select id="selectUserId" resultType="com.yeejoin.amos.boot.module.common.api.dto.StatusDto">
+        SELECT
+            current_status,
+            count(current_status)
+                AS currentStatusCount
+        FROM
+            cb_failure_details d
+              <where>
+                  d.sequence_nbr  in
+                  (SELECT
+                  fault_id
+                  FROM
+                  cb_failure_audit
+                  where
+                  audit_result = 2
+                  )
+                  <if test="currentStatus!= null ">
+                      and current_status = #{currentStatus}
+                  </if>
+                  <if test="startTime!= null and endTime != null">
+                      and submission_time between #{startTime} and #{endTime}
+                  </if>
+                  <if test="userId != null ">
+                      and submission_pid = #{userId}
+                  </if>
+              </where>
+        GROUP BY current_status;
+    </select>
+
+    <select id="selectYJ" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            *
+        FROM
+            cb_failure_details d
+        <where>
+            d.sequence_nbr  in
+            (SELECT
+            fault_id
+            FROM
+            cb_failure_audit
+            where
+            audit_result = 2
+            )
+            <if test="currentStatus != null ">
+                and current_status = #{currentStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and submission_time between #{startTime} and #{endTime}
+            </if>
+            <if test="userId != null ">
+                and submission_pid = #{userId}
+            </if>
+        </where>
+        order by submission_time DESC
+                limit #{current},#{size};
+    </select>
+
+    <select id="selectForAudit" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+            *
+        FROM
+            cb_failure_details d
+        <where>
+            d.sequence_nbr  in
+            (SELECT
+            fault_id
+            FROM
+            cb_failure_audit
+            where
+            rec_user_id = #{userId}
+            )
+            <if test="currentStatus != null ">
+                and current_status = #{currentStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and submission_time between #{startTime} and #{endTime}
+            </if>
+            <if test="submissionPid!= null ">
+                and submission_pid = #{submissionPid}
+            </if>
+        </where>
+        order by submission_time DESC
+            limit #{current},#{size};
+    </select>
+
+    <select id="selectForMaintain" resultType="com.yeejoin.amos.boot.module.common.api.entity.FailureDetails">
+        SELECT
+        *
+        FROM
+        cb_failure_details d
+        <where>
+            d.sequence_nbr  in
+            (SELECT
+            fault_id
+            FROM
+            cb_failure_maintain
+            where
+            rec_user_id = #{userId}
+            )
+            <if test="currentStatus != null ">
+                and current_status = #{currentStatus}
+            </if>
+            <if test="startTime!= null and endTime != null">
+                and submission_time between #{startTime} and #{endTime}
+            </if>
+            <if test="submissionPid!= null ">
+                and submission_pid = #{submissionPid}
+            </if>
+        </where>
+        order by submission_time DESC
+        limit #{current},#{size};
+    </select>
+
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -5,12 +5,12 @@
     <select id="listMonitorFireBrigade" resultType="com.yeejoin.amos.boot.module.common.api.dto.FireBrigadeResourceDto">
         SELECT ft.sequence_nbr                 id,
                ft.NAME,
-               ft.img,
+               ft.img AS pic,
                COUNT(DISTINCT ff.sequence_nbr) personCount
         FROM cb_fire_team ft
                  LEFT JOIN cb_firefighters ff ON ff.fire_team_id = ft.sequence_nbr
         WHERE ft.is_delete = 0
-          and ft.type_code = 118
+          and ft.type_code = #{code}
         GROUP BY ft.sequence_nbr
     </select>
     <select id="queryFighterByTeamId" resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto">
@@ -99,12 +99,12 @@
         a.name ,
         a.contact_user contactUser,
         a.contact_phone contactPhone,
-        ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_nbr AND is_delete = 0 ) userNum,
+        ( SELECT count( 1 ) FROM cb_firefighters WHERE fire_team_id = a.sequence_n  br AND is_delete = 0 ) userNum,
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null
         <if test='par.typeCode!=null and par.typeCode!=""'>
-            and  a.type_code in (#{par.typeCode})
+            and  a.type_code in (116,830,114)
         </if>
         <if test='par.distance!=null'>
             and  Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;= #{par.distance}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -5,10 +5,12 @@
 
 	<select id="getFirefightersJobTitleCount"
 		resultType="com.yeejoin.amos.boot.biz.common.utils.FirefightersTreeDto">
-		select COUNT(a.sequence_nbr) num, a.job_title_code jobTitleCode
+		select COUNT(a.sequence_nbr) num, a.job_title_code
+		jobTitleCode
 		from cb_firefighters a
 		where a.is_delete = 0
-		GROUP BY a.job_title_code
+		GROUP BY
+		a.job_title_code
 	</select>
 	<!--消防队员列表按时间倒叙排列add desc 2021-09-08 by kongfm -->
 	<select id="getFirefighters"
@@ -16,7 +18,8 @@
 		select a.*,b.areas_expertise areasExpertise ,b.areas_expertise_code
 		areasExpertiseCode from cb_firefighters a LEFT JOIN
 		cb_firefighters_post b on
-		a.sequence_nbr=b.firefighters_id where a.is_delete=0
+		a.sequence_nbr=b.firefighters_id where
+		a.is_delete=0
 		<if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
 		<if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
 		<if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
@@ -48,7 +51,8 @@
 
 
 	<select id="listToSelectById" resultType="Map">
-		SELECT IFNULL(a.personnel_photos, '') personnelPhotos,
+		SELECT
+		IFNULL(a.personnel_photos, '') personnelPhotos,
 		a.sequence_nbr
 		sequenceNbr,
 		IFNULL(a.`name`, '无') `name`,
@@ -65,31 +69,103 @@
 		IFNULL(b.post_qualification, '无')
 		postQualification, year ( from_days( datediff( now( ),
 		a.birthday_time))) age
-		FROM cb_firefighters a LEFT JOIN cb_firefighters_post b
+		FROM cb_firefighters a LEFT JOIN
+		cb_firefighters_post b
 		ON a.sequence_nbr
-		= b.firefighters_id LEFT JOIN cb_fire_team c on
+		= b.firefighters_id LEFT JOIN
+		cb_fire_team c on
 		c.sequence_nbr=a.fire_team_id
 		WHERE a.is_delete =0
-		and a.sequence_nbr=#{id}
+		and
+		a.sequence_nbr=#{id}
 	</select>
 
 
 	<!-- BUG3553 BY kongfm 人员关系显示汉字 -->
+	<!---陈浩修改导出的数据量 2021-09-13-->
 	<select id="exportToExcel"
 		resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto">
+		<!-- SELECT f.*, ( SELECT cb_fire_team.NAME FROM cb_fire_team WHERE cb_fire_team.sequence_nbr 
+			= f.fire_team_id ) fireTeam, emergency_contact, da.NAME AS relationship, 
+			emergency_contact_phone FROM cb_firefighters f LEFT JOIN cb_firefighters_contacts 
+			fc ON f.sequence_nbr = fc.firefighters_id left join cb_data_dictionary da 
+			on da.CODE = fc.relationship where f.is_delete = #{isDelete} -->
+		SELECT
+	f.*,
+	(
+		SELECT
+			cb_fire_team. NAME
+		FROM
+			cb_fire_team
+		WHERE
+			cb_fire_team.sequence_nbr = f.fire_team_id
+	) fireTeam,
+	emergency_contact,
+	(
+		SELECT
+			NAME
+		FROM
+			cb_data_dictionary
+		WHERE
+			CODE = fc.relationship
+		AND type = 'RJGX'
+	) AS relationship,
+	emergency_contact_phone,
+	fw.working_hours,
+	fw.fire_working_hours,
+	(
+		SELECT
+			NAME
+		FROM
+			cb_data_dictionary
+		WHERE
+			CODE = fe.first_degree
+		AND type = 'XLLX'
+	) AS first_degree,
+	(
+		SELECT
+			NAME
+		FROM
+			cb_data_dictionary
+		WHERE
+			CODE = fe.highest_education
+		AND type = 'XLLX'
+	) AS highest_education,
+	(
+		SELECT
+			NAME
+		FROM
+			cb_data_dictionary
+		WHERE
+			CODE = fe.academic_degree
+		AND type = 'XWLX'
+	) AS academic_degree,
+	fe.school,
+	fe.professional_name,
+	fp.*
+FROM
+	cb_firefighters f
+LEFT JOIN cb_firefighters_contacts fc ON f.sequence_nbr = fc.firefighters_id
+LEFT JOIN cb_firefighters_workexperience fw ON f.sequence_nbr = fw.firefighters_id
+LEFT JOIN cb_firefighters_education fe ON f.sequence_nbr = fe.firefighters_id
+LEFT JOIN cb_firefighters_post fp ON f.sequence_nbr = fp.firefighters_id
+WHERE
+	f.is_delete = 0
+AND fc.is_delete = 0
+AND fw.is_delete = 0
+AND fe.is_delete = 0
+AND fp.is_delete = 0
+	</select>
+
+	<select id="getFirefightersName" resultType="string">
 		SELECT
-		f.*,
-		( SELECT cb_fire_team.NAME FROM cb_fire_team WHERE
-		cb_fire_team.sequence_nbr = f.fire_team_id ) fireTeam,
-		emergency_contact,
-		da.NAME AS relationship,
-		emergency_contact_phone
+		       a.name
 		FROM
-		cb_firefighters f
-		LEFT JOIN cb_firefighters_contacts fc ON f.sequence_nbr =
-		fc.firefighters_id
-		left join cb_data_dictionary da on da.CODE = fc.relationship
-		where f.is_delete = #{isDelete}
+		     cb_firefighters a
+		WHERE
+		      a.is_delete =0
+		  and
+		      a.name like concat ('%',#{contactName},'%')
 	</select>
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -120,5 +120,28 @@
 				 left join cb_org_usr cou on c.belong_id = cou.sequence_nbr
 		where c.is_delete = FALSE;
 	</select>
-		
+
+	<select id="getKeySiteDate" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto">
+		SELECT
+		c.sequence_nbr               AS `key`,
+		c.sequence_nbr               AS `value`,
+		c.`name`                     as label,
+		c.address_desc               as fireLocation,
+		c.longitude                  as floorLongitude,
+		c.latitude                   AS floorLatitude
+		FROM cb_key_site c
+		where c.is_delete=FALSE
+		<if test="belongId != null and belongId!='-1' and belongId != -1">
+			AND c.`belong_id`= #{id}
+		</if>
+	</select>
+
+	<select id="getAddress" resultType="string">
+		SELECT
+		c.address_desc
+		FROM cb_key_site c
+		where c.is_delete = FALSE
+		and
+		c.address_desc like concat ('%',#{address},'%');
+	</select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/LinkageUnitMapper.xml

@@ -127,7 +127,7 @@
 		cb_dynamic_form_instance m GROUP BY m.instance_id) b
 
 		on
-		b.instance_id=a.instance_id where a.unit_name is not null
+		b.instance_id=a.instance_id where a.unit_name is not null and a.is_delete=0
 	</select>
 
 	<!--联动单位列表按时间倒叙排列add order by clu.rec_date desc 同时处理单位根节点-1时查询全部数据问题 2021-09-08 by kongfm -->

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -94,6 +94,21 @@
         LIMIT #{map.pageNum}, #{map.pageSize}
     </select>
 
+    <!--机场单位查询机构下所有子数据 2021-09-16 by litw  -->
+    <select id="selectAllChildrenList" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        select
+        u.sequence_nbr sequenceNbr,
+        u.biz_org_name bizOrgName,
+        u.biz_org_code bizOrgCode
+        FROM
+        cb_org_usr u
+        where
+         u.is_delete = 0
+        <if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
+            AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
+        </if>
+    </select>
+
 
     <select id="selectPersonAllList" resultType="Map">
         select * from (
@@ -406,6 +421,38 @@ GROUP BY
         ORDER BY
             u.sequence_nbr DESC
     </select>
+    <select id="getUserInfo" resultType="com.yeejoin.amos.boot.module.common.api.dto.UserDto">
+        SELECT
+            u.sequence_nbr AS personSeq,
+            u.biz_org_name AS personName,
+            '2' AS identityType,
+            u.biz_org_code,
+            f.field_code,
+            f.field_value,
+            u.biz_org_type
+        FROM
+            `cb_org_usr` u
+            LEFT JOIN cb_dynamic_form_instance f ON f.instance_id = u.sequence_nbr
+        <where>
+            <if test="id != null and id != ''">
+                u.amos_org_id = #{id}
+            </if>
+            <if test="type != null and type != ''">
+                AND u.biz_org_type = #{type}
+            </if>
+            <if test="code != null and code != ''">
+                AND u.biz_org_code LIKE CONCAT(#{code}, '%')
+            </if>
+            <if test="fieldCode != null and fieldCode.length > 0">
+                AND fi.field_code IN
+                <foreach collection="fieldCode" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+            u.sequence_nbr DESC
+    </select>
     <!--BUG2655 导出机场人员存在已删除数据 bykongfm-->
     <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto">
          select
@@ -514,4 +561,12 @@ GROUP BY
 
     </select>
 
+    <select id="amosIdExist" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT *
+        FROM cb_org_usr
+        WHERE is_delete = 0
+        and
+            amos_org_id = #{amosId}
+    </select>
+
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.common.api.mapper.WaterResourceMapper">
-
+    <!--BUG 2919 消防水源导出没有设施定义 分类名称 设施编码 维保周期 by kongfm 2021-09-16   -->
     <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
         select r.name,
                r.address,
@@ -16,6 +16,10 @@
                r.reality_img,
                r.contact_user,
                r.contact_phone,
+               r.equip_name,
+			   r.equip_category_name,
+			   r.equip_code,
+			   r.maintenance_period,
                (case r.resource_type when 'crane' then rc.height when 'natural' then rn.height end) height,
                (case r.resource_type
                     when 'crane' then rc.status

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AirportStandDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+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;
+
+/**
+ * 机场机位旋转角度
+ *
+ * @author litw
+ * @date 2021-09-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="AirportStandDto", description="机场机位旋转角度")
+public class AirportStandDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "机位号")
+    private String standCode;
+
+    @ApiModelProperty(value = "坐标X")
+    private String coordinateX;
+
+    @ApiModelProperty(value = "坐标Y")
+    private String coordinateY;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertNewsDto.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/9/15
+ */
+
+/**
+ *物联消息
+ *
+ * */
+public class AlertNewsDto {
+
+    private String title;
+
+    private String content;
+
+    private String id;
+
+
+    private Object data;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    public AlertNewsDto() {
+    }
+
+    public AlertNewsDto(String title, String content, String id, Object data) {
+        this.title = title;
+        this.content = content;
+        this.id = id;
+        this.data = data;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/EquipSpecificDto.java

@@ -31,6 +31,8 @@ public class EquipSpecificDto extends BaseEntity {
      * 队伍ID
      */
     private Long teamId;
+    //单位id
+    private Long agencyId;
     /**
      * 分页
      */

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/NewsDate.java

+package com.yeejoin.amos.boot.module.jcs.api.dto;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2021/9/16
+ */
+public class NewsDate {
+
+     private Long      id;    // 物联警情id
+     private String    contactUser;//联系人
+     private String    contactPhone;//联系人电话
+     private String    unitInvolvedId;   // 事发单位
+     private String    unitInvolvedName; // 事发单位名称
+     private Double    longitude;   //  建筑经度
+     private Double    latitude;    // 建筑纬度
+     private String    address;        // 地址
+     private String    fireLocation;//火灾地址
+     private Double    floorLongitude;//楼经度
+     private Double    floorLatitude;//楼纬度
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getContactUser() {
+        return contactUser;
+    }
+
+    public void setContactUser(String contactUser) {
+        this.contactUser = contactUser;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getUnitInvolvedId() {
+        return unitInvolvedId;
+    }
+
+    public void setUnitInvolvedId(String unitInvolvedId) {
+        this.unitInvolvedId = unitInvolvedId;
+    }
+
+    public String getUnitInvolvedName() {
+        return unitInvolvedName;
+    }
+
+    public void setUnitInvolvedName(String unitInvolvedName) {
+        this.unitInvolvedName = unitInvolvedName;
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(Double longitude) {
+        this.longitude = longitude;
+    }
+
+    public Double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(Double latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getFireLocation() {
+        return fireLocation;
+    }
+
+    public void setFireLocation(String fireLocation) {
+        this.fireLocation = fireLocation;
+    }
+
+    public Double getFloorLongitude() {
+        return floorLongitude;
+    }
+
+    public void setFloorLongitude(Double floorLongitude) {
+        this.floorLongitude = floorLongitude;
+    }
+
+    public Double getFloorLatitude() {
+        return floorLatitude;
+    }
+
+    public void setFloorLatitude(Double floorLatitude) {
+        this.floorLatitude = floorLatitude;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AirportStand.java

+package com.yeejoin.amos.boot.module.jcs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 机场机位旋转角度
+ *
+ * @author litw
+ * @date 2021-09-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("jc_airport_stand")
+public class AirportStand extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 机位号
+     */
+	@TableField("stand_code")
+    private String standCode;
+
+    /**
+     * 坐标X
+     */
+	@TableField("coordinate_x")
+    private String coordinateX;
+
+    /**
+     * 坐标Y
+     */
+	@TableField("coordinate_y")
+    private String coordinateY;
+
+    /**
+     * 经度
+     */
+	@TableField("longitude")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+	@TableField("latitude")
+    private String latitude;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertCalled.java

@@ -101,13 +101,16 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
+
+    /*bug 2408 接警记录，按警情状态和接警时间筛选功能失效 陈召 2021-09-22 开始*/
     @ApiModelProperty(value = "接警时间开始---用于列表过滤")
     @TableField(exist=false)
-    private Date callTimeStart ;
+    private String callTimeStart ;
 
     @ApiModelProperty(value = "接警时间结束---用于列表过滤")
     @TableField(exist=false)
-    private Date callTimeEnd ;
+    private String callTimeEnd ;
+    /*bug 2408 接警记录，按警情状态和接警时间筛选功能失效 陈召 2021-09-22 结束*/
   
     @TableField(exist=false)
     @ApiModelProperty(value = "是否处警")

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertForm.java

@@ -42,7 +42,8 @@ public class AlertForm extends BaseEntity {
 
     @ApiModelProperty(value = "是否一行显示")
     private Boolean block;
-
+    @ApiModelProperty(value = "是否隱藏")
+    private Boolean hide;
     //新加排序字段
     @ApiModelProperty(value = "排序字段")
     private int sortNum;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertFormValue.java

@@ -47,6 +47,12 @@ public class AlertFormValue extends BaseEntity {
     @ApiModelProperty(value = "是否一行显示")
     private Boolean block;
 
+    @ApiModelProperty(value = "是否隱藏")
+    private Boolean hide;
+
+
+
+
     public AlertFormValue() {
         super();
     }
@@ -66,12 +72,13 @@ public class AlertFormValue extends BaseEntity {
         this.alertTypeCode = alertTypeCode;
     }
 
-    public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean block, String alertTypeCode,
+    public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean block,boolean hide, String alertTypeCode,
                           String fieldValue, String fieldValueCode) {
         this.alertFormId = alertFormId;
         this.fieldName = fieldName;
         this.fieldCode = fieldCode;
         this.block = block;
+        this.hide=hide;
         this.alertTypeCode = alertTypeCode;
         this.fieldValue = fieldValue;
         this.fieldValueCode = fieldValueCode;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/ExcelEnums.java

@@ -17,14 +17,15 @@ public  enum ExcelEnums {
         WXXFZ("微型消防站", "微型消防站", "com.yeejoin.amos.boot.module.common.api.dto.FireStationDto","WXXFZ"),//("WXXFZ","微型消防站")
         XFRY ("消防人员", "消防人员", "com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto","XFRY"),//("XFRY","消防人员")
         WBRY ("维保人员", "维保人员", "com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto","WBRY"),//("WBRY",维保人员)
-        KEYSITE ("重点部位", "重点部位", "com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto","KEYSITE"),//{"KEYSITE":重點部位}
+        KEYSITE ("重点部位", "重点部位", "com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto","KEYSITE"),//{"KEYSITE":}
         CLZQ ("车辆执勤", "车辆执勤", "com.yeejoin.amos.boot.module.common.api.dto.DutyCarExcelDto","CLZQ"),//("CLZQ","车辆执勤")
         JCDWRY ("机场单位人员", "机场单位人员", "com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto","JCDWRY"),//("JCDW","机场单位")
         LDDW ("联动单位", "联动单位", "com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto","LDDW"),//("JCDW","机场单位")
         RYZB ("人员值班", "人员值班", "com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto","RYZB"),//("RYZB","人员值班")
         //  BUG 2455 相关代码 bykongfm
         TGRY ("特岗人员", "特岗人员", "com.yeejoin.amos.boot.module.common.api.dto.SpecialPositionStaffDto","TGRY"),//("TGRY","特岗人员")
-        JYZB ("救援装备", "救援装备", "com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto","JYZB");//("JYZB","救援装备")
+        JYZB ("救援装备", "救援装备", "com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto","JYZB"),//("JYZB","救援装备")
+        XFZB ("消防装备", "消防装备", "com.yeejoin.amos.boot.module.common.api.dto.EquipmentDetailDownloadTemplateDto","XFZB");//("XFZB","消防装备")
 
         private String fileName;
         private String sheetName;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/FireBrigadeTypeEnum.java

@@ -12,6 +12,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum FireBrigadeTypeEnum {
     专职消防队("fullTime", "116", "专职消防队"),
+    医疗救援队("monitorTeam", "830", "医疗救援队"),
     监控大队("monitorTeam", "118", "监控大队");
 
     private String key;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AircraftMapper.java

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
 
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface AircraftMapper extends BaseMapper<Aircraft> {
 	 List<AircraftListTreeDto> getAircraft();
+	List<Map<String, Object>> queryAircraftList();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AirportStandMapper.java

+package com.yeejoin.amos.boot.module.jcs.api.mapper;
+
+import com.yeejoin.amos.boot.module.jcs.api.entity.AirportStand;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 机场机位旋转角度 Mapper 接口
+ *
+ * @author litw
+ * @date 2021-09-17
+ */
+public interface AirportStandMapper extends BaseMapper<AirportStand> {
+
+}

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

@@ -36,6 +36,10 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
 
     List<AlertCalledTodyDto> getTodayAlertCalled();
 
+    List<String> getContactName(String contactName);
+
+    List<String> getAddress(String address);
+
     List<AlertCalled> selectAllPage(Long current, Long size,
                                     Integer alertStatus,
                                     String alertTypeCode ,

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAircraftService.java

@@ -35,4 +35,7 @@ public interface IAircraftService {
      * @return
      */
     Aircraft queryAircraftInfoByModel(String aircraftModel);
+
+
+    List< Map<String, Object>> queryAircraftList();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAirportStandService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+
+/**
+ * 机场机位旋转角度接口类
+ *
+ * @author litw
+ * @date 2021-09-17
+ */
+public interface IAirportStandService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IFirestationJacketService.java

+package com.yeejoin.amos.boot.module.jcs.api.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
+import com.yeejoin.amos.boot.module.common.api.entity.FirestationJacket;
+import com.yeejoin.amos.boot.module.jcs.api.dto.EquipSpecificDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.EquipmentOnCarDto;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+
+/**
+* 消防人员配装记录 服务类
+*
+* @author tb
+* @date 2021-06-07
+*/
+public interface IFirestationJacketService {
+
+    ResponseModel<Page<Object>> getAirEquipSpecificPage(EquipSpecificDto equipSpecificDto, int current, int size);
+
+    boolean saveOrUpdateBatch(Long firefightersId, List<EquipmentOnCarDto> equipmentOnCarDtos);
+
+    boolean update(String type, FirestationJacket firestationJacket);
+
+    ResponseModel<Object> getEquipByStockDetailId(Long stockDetailId);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java

@@ -33,7 +33,7 @@ public interface IPowerTransferService extends IService<PowerTransfer> {
     /**
      * 获取力量调派资源树
      */
-    List<FireBrigadeResourceDto> getPowerTree();
+    List<FireBrigadeResourceDto> getPowerTree(String type);
     List<PowerCompanyCountDto> getPowerCompanyCountDtocount( Long id);
 
     /**

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AircraftMapper.xml

@@ -5,4 +5,9 @@
      select jc_aircraft.aircraft_model id,jc_aircraft.aircraft_model name
      from jc_aircraft  where is_delete=0
  </select>
+
+    <select id="queryAircraftList" resultType="Map">
+      select jc_aircraft.sequence_nbr id,jc_aircraft.aircraft_model name
+     from jc_aircraft  where is_delete=0
+ </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AirportStandMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AirportStandMapper">
+
+</mapper>

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

@@ -51,6 +51,9 @@
         <if test='par.address!=null and  par.address!="" '>
             and a.address like CONCAT('%',#{par.address},'%')
         </if>
+        <if test='par.alertType!=null and  par.alertType!="" '>
+            and a.alert_type like CONCAT('%',#{par.alertType},'%')
+        </if>
         <if test='par.whether24!=false'>
             and a.call_time &gt;= (NOW() - interval 24 hour)
         </if>
@@ -114,7 +117,7 @@
         FROM
         jc_alert_called a
         <where>
-            1=1
+            a.is_delete = 0
             <if test="alertStatus!= null ">
                 and alert_status = #{alertStatus}
             </if>
@@ -185,6 +188,27 @@
 
     </select>
 
+    <select id="getContactName" resultType="string">
+        SELECT
+            a.contact_user
+        FROM
+            jc_alert_called a
+        WHERE
+            a.is_delete =0
+          and
+            a.contact_user like concat ('%',#{contactName},'%')
+    </select>
+
+    <select id="getAddress" resultType="string">
+        SELECT
+            a.address
+        FROM
+            jc_alert_called a
+        WHERE
+            a.is_delete =0
+          and
+            a.address like concat ('%',#{address},'%')
+    </select>
 
      <!--  未结束警情列表  -->
     <select id="AlertCalledStatusPage" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled">

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/CheckTypeSuEnum.java

@@ -8,8 +8,8 @@ import java.util.stream.Collectors;
 
 public enum CheckTypeSuEnum {
 
-    TIME_DESC("日常检查", "1"),
-    TIME_ASC("专项检查", "2");
+    SUPERVISED("日常检查", "1", "supervised"),
+    DAILY("专项检查", "2", "daily");
 
     /**
      * 名字
@@ -20,9 +20,15 @@ public enum CheckTypeSuEnum {
      */
     private String code;
 
-    CheckTypeSuEnum(String name, String code) {
+    /**
+     * 执行控制条件
+     */
+    private String condition;
+
+    CheckTypeSuEnum(String name, String code, String condition) {
         this.name = name;
         this.code = code;
+        this.condition = condition;
     }
 
     public static List<Map<String, Object>> getEnumList() {
@@ -48,4 +54,12 @@ public enum CheckTypeSuEnum {
     public void setCode(String code) {
         this.code = code;
     }
+
+    public String getCondition() {
+        return condition;
+    }
+
+    public void setCondition(String condition) {
+        this.condition = condition;
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/PlanCheckLevelEnum.java

+package com.yeejoin.amos.supervision.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public enum PlanCheckLevelEnum {
+    DRAFT("单位级",0),
+    EXAMINE_ONE("公司级",1);
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 值
+     */
+    private int value;
+
+    private PlanCheckLevelEnum(String name, int value) {
+        this.name = name;
+        this.value = value;
+    }
+
+
+    public static String getName(int value) {
+        for (PlanCheckLevelEnum c : PlanCheckLevelEnum.values()) {
+            if (c.getValue() == value) {
+                return c.name;
+            }
+        }
+        return null;
+    }
+
+    public static int getValue(String name) {
+        for (PlanCheckLevelEnum c : PlanCheckLevelEnum.values()) {
+            if (c.getName().equals(name)) {
+                return c.value;
+            }
+        }
+        return -1;
+    }
+
+
+    public static PlanCheckLevelEnum getEnum(int value) {
+        for (PlanCheckLevelEnum c : PlanCheckLevelEnum.values()) {
+            if (c.getValue() == value) {
+                return c;
+            }
+        }
+        return null;
+    }
+
+
+    public static PlanCheckLevelEnum getEnum(String name) {
+        for (PlanCheckLevelEnum c : PlanCheckLevelEnum.values()) {
+            if (c.getName().equals(name)) {
+                return c;
+            }
+        }
+        return null;
+    }
+
+    public static List<Map<String,String>> getEnumList() {
+        List<Map<String,String>> nameList = new ArrayList<>();
+        for (PlanCheckLevelEnum c: PlanCheckLevelEnum.values()) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("name", c.getName());
+            map.put("value", c.getValue() +"");
+            nameList.add(map);
+        }
+        return nameList;
+    }
+
+    public static List<String> getEnumNameList() {
+        List<String> nameList = new ArrayList<String>();
+        for (PlanCheckLevelEnum c: PlanCheckLevelEnum.values()) {
+            nameList.add(c.getName());
+        }
+        return nameList;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+
+    public int getValue() {
+        return value;
+    }
+
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/PlanStatusEnum.java

+package com.yeejoin.amos.supervision.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public enum PlanStatusEnum {
+
+    DRAFT("草稿",0),
+    EXAMINE_ONE("一级待审核",1),
+    EXAMINE_TWO("二级待审核",2),
+    EXAMINE_THREE("三级待审核",3),
+    EXAMINE_FORMULATE("已审核/检查内容未制定",4),
+    EXAMINE_DEVELOPED("检查内容已制定/未执行",5);
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 值
+     */
+    private int value;
+
+    private PlanStatusEnum(String name, int value) {
+        this.name = name;
+        this.value = value;
+    }
+
+
+    public static String getName(int value) {
+        for (PlanStatusEnum c : PlanStatusEnum.values()) {
+            if (c.getValue() == value) {
+                return c.name;
+            }
+        }
+        return null;
+    }
+
+    public static int getValue(String name) {
+        for (PlanStatusEnum c : PlanStatusEnum.values()) {
+            if (c.getName().equals(name)) {
+                return c.value;
+            }
+        }
+        return -1;
+    }
+
+
+    public static PlanStatusEnum getEnum(int value) {
+        for (PlanStatusEnum c : PlanStatusEnum.values()) {
+            if (c.getValue() == value) {
+                return c;
+            }
+        }
+        return null;
+    }
+
+
+    public static PlanStatusEnum getEnum(String name) {
+        for (PlanStatusEnum c : PlanStatusEnum.values()) {
+            if (c.getName().equals(name)) {
+                return c;
+            }
+        }
+        return null;
+    }
+
+    public static List<Map<String,String>> getEnumList() {
+        List<Map<String,String>> nameList = new ArrayList<>();
+        for (PlanStatusEnum c: PlanStatusEnum.values()) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("name", c.getName());
+            map.put("value", c.getValue() +"");
+            nameList.add(map);
+        }
+        return nameList;
+    }
+
+    public static List<String> getEnumNameList() {
+        List<String> nameList = new ArrayList<String>();
+        for (PlanStatusEnum c: PlanStatusEnum.values()) {
+            nameList.add(c.getName());
+        }
+        return nameList;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+
+    public int getValue() {
+        return value;
+    }
+
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java

+package com.yeejoin.amos.supervision.core.common.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author xixinzhao
+ */
+@Data
+public class DangerDto {
+
+    /**
+     * 隐患id
+     */
+    private Long id;
+
+    /**
+     * 隐患名称
+     */
+    private String name;
+
+    /**
+     * 检查项记录id
+     */
+    private Long bizId;
+
+    /**
+     * 隐患级别
+     */
+    private String dangerLevel;
+
+    /**
+     * 隐患等级名称
+     */
+    private String dangerLevelName;
+
+    /**
+     * 状态
+     */
+    private String dangerState;
+
+    /**
+     * 是否删除
+     * 0：未删除 1：已删除
+     */
+    private Boolean deleted;
+
+    /**
+     * 治理方式
+     */
+    private String governWay;
+
+    /**
+     * 业务类型（不同业务创建的隐患以此区分:巡检隐患、防火监督隐患、其他隐患。。。）
+     */
+    private String bizType;
+
+    /**
+     * 整改期限
+     */
+    private Date reformLimitDate;
+
+
+    /**
+     * 问题描述
+     */
+    private String remark;
+
+
+    /**
+     * 检查类型:1-自行检查 ；2计划检查
+     */
+    private String checkMode;
+
+
+    /**
+     * 隐患图片列表
+     */
+    private List<String> photoUrl;
+
+    /**
+     * 检查项名称
+     */
+    private String inputItemName;
+
+    /**
+     * 检查时间
+     */
+    private String checkTime;
+
+    /**
+     * 2470	49	2052
+     * 检查人员名称
+     */
+    private String checkUserName;
+
+    /**
+     * 责任单位
+     */
+    private String pointName;
+
+    /**
+     * 状态
+     */
+    private String dangerStateName;
+
+    /**
+     * 建筑id
+     */
+    private Long structureId;
+
+    /**
+     * 建筑名称
+     */
+    private String structureName;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 隐患地址
+     */
+    private String dangerPosition;
+
+
+    /**
+     * 治理方式
+     */
+    private String reformType;
+
+    /**
+     * 治理方式名称
+     */
+    private String reformTypeName;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/CheckInput.java

 package com.yeejoin.amos.supervision.dao.entity;
 
+import com.yeejoin.amos.supervision.core.common.dto.DangerDto;
+
 import javax.persistence.*;
 import java.util.List;
 
@@ -121,6 +123,8 @@ public class CheckInput extends BasicEntity {
 	@Column(name="major_danger_num")
 	private int majorDangerNum;
 
+	private List<DangerDto> dangerDtoList;
+
 	@Transient
 	public List<CheckShot> getCheckShotList() {
 		return checkShotList;
@@ -291,4 +295,13 @@ public class CheckInput extends BasicEntity {
 	public void setSafetyDangerNum(int safetyDangerNum) {
 		this.safetyDangerNum = safetyDangerNum;
 	}
+
+	@Transient
+	public List<DangerDto> getDangerDtoList() {
+		return dangerDtoList;
+	}
+
+	public void setDangerDtoList(List<DangerDto> dangerDtoList) {
+		this.dangerDtoList = dangerDtoList;
+	}
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/HiddenDanger.java

+package com.yeejoin.amos.supervision.dao.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @author xixinzhao
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Entity
+@Table(name = "p_hidden_danger")
+public class HiddenDanger extends BasicEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 隐患id
+     */
+    @Column(name = "latent_danger_id")
+    private Long latentDangerId;
+
+    /**
+     * 检查记录id
+     */
+    @Column(name = "check_id")
+    private Long checkId;
+
+    /**
+     * 检查项记录id
+     */
+    @Column(name = "check_input_id")
+    private Long checkInputId;
+
+    /**
+     * 计划id
+     */
+    @Column(name = "plan_id")
+    private Long planId;
+
+    /**
+     * 点id
+     */
+    @Column(name = "point_id")
+    private Long pointId;
+
+
+    /**
+     * 隐患类型（1-防火监督检查；2-自行检查）
+     */
+    @Column(name = "danger_type")
+    private String dangerType;
+
+    /**
+     * 隐患类型名称
+     */
+    @Column(name = "danger_type_name")
+    private String dangerTypeName;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新日期
+     */
+    private Date updateDate;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java

@@ -222,10 +222,13 @@ public class InputItem extends BasicEntity {
     private Integer itemStart;
 
     /**
-     * 扩展属性
+     * 检查类别IDS
      */
     private String ext;
 
+    @Column(name = "item_type_classify_ids")
+    private Integer itemTypeClassifyIds;
+
     public Integer getItemStart() {
         return itemStart;
     }
@@ -519,7 +522,11 @@ public class InputItem extends BasicEntity {
         return ext;
     }
 
-    public void setExt(String ext) {
-        this.ext = ext;
+    public Integer getItemTypeClassifyIds() {
+        return itemTypeClassifyIds;
+    }
+
+    public void setItemTypeClassifyIds(Integer itemTypeClassifyIds) {
+        this.itemTypeClassifyIds = itemTypeClassifyIds;
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Plan.java

@@ -163,6 +163,13 @@ public class Plan extends BasicEntity {
      */
 	@Column(name="plan_type")
 	private String planType;
+
+	/**
+	 * 检查级别
+	 */
+	@Column(name="check_level")
+	private String checkLevel;
+
 	/**
      * 备注
      */
@@ -188,8 +195,8 @@ public class Plan extends BasicEntity {
 	/**
      * 状态:0-已停用；1-正常
      */
-	@Column(name="[status]")
-	private byte status;
+	@Column(name="status")
+	private Integer status;
 	/**
 	 * 用户编号
 	 */
@@ -555,11 +562,11 @@ public class Plan extends BasicEntity {
 		this.scoreFormula = scoreFormula;
 	}
 
-	public byte getStatus() {
+	public Integer getStatus() {
 		return this.status;
 	}
 
-	public void setStatus(byte status) {
+	public void setStatus(Integer status) {
 		this.status = status;
 	}
 
@@ -745,4 +752,12 @@ public class Plan extends BasicEntity {
 	public void setMakerUserDeptName(String makerUserDeptName) {
 		this.makerUserDeptName = makerUserDeptName;
 	}
+
+	public String getCheckLevel() {
+		return checkLevel;
+	}
+
+	public void setCheckLevel(String checkLevel) {
+		this.checkLevel = checkLevel;
+	}
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/PlanAudit.java

+package com.yeejoin.amos.supervision.dao.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @ProjectName: amos-biz-boot
+ * @Package: com.yeejoin.amos.supervision.dao.entity
+ * @ClassName: PlanAudit
+ * @Author: Jianqiang Gao
+ * @Description: 计划审核申请表
+ * @Date: 2021/9/23 9:52
+ * @Version: 1.0
+ */
+@Entity
+@Table(name = "p_plan_audit")
+@NamedQuery(name = "PlanAudit.findAll", query = "SELECT p FROM PlanAudit p")
+@Data
+public class PlanAudit extends BasicEntity {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 计划id
+     */
+    @Column(name = "plan_id")
+    private Long planId;
+    /**
+     * 业务唯一标识
+     */
+    @Column(name = "business_key")
+    private String businessKey;
+
+    /**
+     * 工作流实例编号
+     */
+    @Column(name = "process_instance_id")
+    private String processInstanceId;
+    /**
+     * 流程定义key
+     */
+    @Column(name = "process_definition_key")
+    private String processDefinitionKey;
+    /**
+     * 启动者id
+     */
+    @Column(name = "start_user_id")
+    private String startUserId;
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_date")
+    private Date updateDate;
+
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/PlanAuditLog.java

+package com.yeejoin.amos.supervision.dao.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+/**
+ * @ProjectName: amos-biz-boot
+ * @Package: com.yeejoin.amos.supervision.dao.entity
+ * @ClassName: PlanAudit
+ * @Author: Jianqiang Gao
+ * @Description: 计划审核申请表
+ * @Date: 2021/9/23 9:52
+ * @Version: 1.0
+ */
+@Entity
+@Table(name = "p_plan_audit_log")
+@NamedQuery(name = "PlanAuditLog.findAll", query = "SELECT p FROM PlanAuditLog p")
+@Data
+public class PlanAuditLog extends BasicEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 计划id（冗余）
+     */
+    @Column(name = "plan_id")
+    private Long planId;
+    /**
+     * 计划审核申请主表
+     */
+    @Column(name = "plan_audit_id")
+    private Long planAuditId;
+    /**
+     * 当前节点编号
+     */
+    @Column(name = "flow_task_id")
+    private String flowTaskId;
+
+    /**
+     * 当前节点名称
+     */
+    @Column(name = "flow_task_name")
+    private String flowTaskName;
+    /**
+     * 实际执行人
+     */
+    @Column(name = "excute_user_id")
+    private String excuteUserId;
+    /**
+     * 执行人用户名称（冗余）
+     */
+    @Column(name = "excute_user_name")
+    private String excuteUserName;
+    /**
+     * 执行状态（1：不通过；2：通过）
+     */
+    @Column(name = "excute_state")
+    private Integer excuteState;
+    /**
+     * 角色名称
+     */
+    @Column(name = "role_name")
+    private String roleName;
+
+    /**
+     * 执行结果
+     */
+    @Column(name = "excute_result")
+    private String excuteResult;
+    /**
+     * 提交工作流json数据
+     */
+    @Column(name = "flow_json")
+    private String flowJson;
+    /**
+     * 备注
+     */
+    @Column(name = "remark")
+    private String remark;
+}
\ No newline at end of file

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

@@ -123,6 +123,7 @@ public class AlertCalledDto  extends BaseDto {
     @ApiModelProperty(value = "电梯使用状态")
     private Integer useStatus;
 
+    // 废弃
     @ApiModelProperty(value = "警情地址")
     private String alertAddress;
 
@@ -143,4 +144,13 @@ public class AlertCalledDto  extends BaseDto {
 
     @ApiModelProperty(value = "是否辅屏查询")
     private String isAuxiliaryScreen;
+
+    @ApiModelProperty(value = "投诉描述/故障报修描述")
+    private String describe;
+
+    @ApiModelProperty(value = "图片")
+    private String images;
+
+    @ApiModelProperty(value = "设备id")
+    private Long equipmentId;
 }

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

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -90,4 +91,25 @@ public class DispatchPaperDto  extends BaseDto {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "到达时间")
+    private Date arriveTime;
+
+    @ApiModelProperty(value = "处置时间")
+    private Date dealTime;
+
+    @ApiModelProperty(value = "救援机构名称")
+    private String saveOrgName;
+
+    @ApiModelProperty(value = "维修单位名称")
+    private String repairOrgName;
+
+    @ApiModelProperty(value = "维修人")
+    private String repairUser;
+
+    @ApiModelProperty(value = "处置单位")
+    private String dealOrgName;
+
+    @ApiModelProperty(value = "处置人")
+    private String dealUser;
+
 }

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author litw
+ * @date 2021-09-22.
+ */
+@Data
+@ApiModel(value = "ElevatorBaseInfoDto", description = "ElevatorBaseInfoDto")
+public class ElevatorBaseInfoDto {
+
+    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 brand;
+
+    @ApiModelProperty(value = "使用单位")
+    private String useUnit;
+
+    @ApiModelProperty(value = "维保单位")
+    private String maintainUnit;
+
+    @ApiModelProperty(value = "安装地址")
+    private String address;
+
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author fengwang
+ * @date 2021-09-22.
+ */
+@Data
+@ApiModel(value = "ElevatorInfoDto", description = "ElevatorInfoDto")
+public class ElevatorInfoDto {
+
+    ElevatorBaseInfoDto elevatorBaseInfoDto;
+
+    ElevatorMaintenanceInfoDto elevatorMaintenanceInfoDto;
+
+    ElevatorTestInfoDto elevatorTestInfoDto;
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author litw
+ * @date 2021-09-22.
+ */
+@Data
+@ApiModel(value = "ElevatorMaintenanceInfo", description = "ElevatorMaintenanceInfo")
+public class ElevatorMaintenanceInfoDto {
+
+    @ApiModelProperty(value = "最新维保日期")
+    private Date maintenanceTime;
+
+    @ApiModelProperty(value = "下次维保日期")
+    private Date nextMaintenanceTime;
+
+    @ApiModelProperty(value = "维保单位")
+    private String maintenanceUnit;
+
+    @ApiModelProperty(value = "维保人员")
+    private String maintenancePerson;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author fengwang
+ * @date 2021-09-22.
+ */
+@Data
+@ApiModel(value="ElevatorTestInfoDto", description="检验信息表")
+public class ElevatorTestInfoDto {
+
+    @ApiModelProperty(value = "最新检验时间")
+    private Date testTime;
+
+    @ApiModelProperty(value = "检验单位")
+    private String testUnit;
+
+    @ApiModelProperty(value = "检验人员")
+    private String testPerson;
+
+    @ApiModelProperty(value = "检验结论")
+    private String testResult;
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 关注电梯关系表
+ *
+ * @author litw
+ * @date 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="EnevatorRelationDto", description="关注电梯关系表")
+public class EnevatorRelationDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "openid个人识别id")
+    private Long openId;
+
+    @ApiModelProperty(value = "电梯id")
+    private String enevatorId;
+
+}

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

@@ -30,7 +30,8 @@ public class FormValue implements Serializable{
     private String value;
     @ApiModelProperty(value = "是否一行显示")
     private boolean block;
-  
+
+
     public FormValue() {
     }
 

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+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;
+
+/**
+ * 维保信息表
+ *
+ * @author litw
+ * @date 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MaintainInfoDto", description="维保信息表")
+public class MaintainInfoDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "电梯id")
+    private String enevatorId;
+
+
+    @ApiModelProperty(value = "最新维保时间")
+    private Date maintainTime;
+
+    @ApiModelProperty(value = "下次维保时间")
+    private Date nextMaintainTime;
+
+    @ApiModelProperty(value = "维保单位id")
+    private String maintainUnitId;
+
+    @ApiModelProperty(value = "维保单位")
+    private String maintainUnit;
+
+    @ApiModelProperty(value = "维保人员id")
+    private String maintainPersonId;
+
+    @ApiModelProperty(value = "维保人员")
+    private String maintainPerson;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+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;
+
+/**
+ * 检验信息表
+ *
+ * @author litw
+ * @date 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TestInfoDto", description="检验信息表")
+public class TestInfoDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "电梯id")
+    private String enevatorId;
+
+    @ApiModelProperty(value = "最新检验时间")
+    private Date testTime;
+
+    @ApiModelProperty(value = "检验单位id")
+    private String testUnitId;
+
+    @ApiModelProperty(value = "检验单位")
+    private String testUnit;
+
+    @ApiModelProperty(value = "检验人员id")
+    private String testPersonId;
+
+    @ApiModelProperty(value = "检验人员")
+    private String testPerson;
+
+    @ApiModelProperty(value = "检验结论")
+    private String testResult;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 通话记录附件
+ *
+ * @author kongfm
+ * @date 2021-09-23
+ */
+@Data
+@ApiModel(value="WechatAccessDto", description="微信认证dto")
+public class WechatAccessDto {
+
+    @ApiModelProperty(value = "微信openId")
+    private String openId;
+
+    @ApiModelProperty(value = "手机号")
+    private String tel;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String nickname;
+
+    @ApiModelProperty(value = "用户性别")
+    private String sex;
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 微信验证DTO
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "WechatDto", description = "WechatDto")
+public class WechatDto {
+
+    @ApiModelProperty(value = "微信加密签名，signature结合了开发者填写的token参数和请求中的timestamp参数、nonce参数")
+    private String signature;
+
+    @ApiModelProperty(value = "时间戳")
+    private String timestamp;
+
+    @ApiModelProperty(value = "随机数")
+    private String nonce;
+
+    @ApiModelProperty(value = "随机字符串")
+    private String echostr;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 微信公众号返回我的任务dto类
+ * kongfm
+ */
+@Data
+@ApiModel(value="WechatMyTaskDto", description="微信公众号返回我的任务dto类")
+public class WechatMyTaskDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "警情id")
+    private Long alertId;
+
+    @ApiModelProperty(value = "派遣单id")
+    private Long paperId;
+
+    @ApiModelProperty(value = "任务状态")
+    private String taskStatus;
+
+    @ApiModelProperty(value = "任务类别")
+    private String taskType;
+
+    @ApiModelProperty(value = "任务类别code")
+    private String taskTypeCode;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "电梯识别码")
+    private String rescueCode;
+
+    @ApiModelProperty(value = "被困楼层")
+    private String trappedFloorNum;
+
+    @ApiModelProperty(value = "被困人数")
+    private String trappedNum;
+
+    @ApiModelProperty(value = "派遣时间")
+    private Date dispatchTime;
+
+    @ApiModelProperty(value = "有无人员伤亡")
+    private String hasDeadHurt;
+
+    @ApiModelProperty(value = "使用单位")
+    private String useUnit;
+
+    @ApiModelProperty(value = "使用单位id")
+    private Long useUnitId;
+
+    @ApiModelProperty(value = "使用单位主管机构")
+    private String useUnitAuthority;
+
+    @ApiModelProperty(value = "求援人电话")
+    private String emergencyCall;
+
+    @ApiModelProperty(value = "求援时间/ 报修时间/ 投诉时间")
+    private Date recDate;
+
+    @ApiModelProperty(value = "到达时间")
+    private Date arriveTime;
+
+    @ApiModelProperty(value = "救援完成时间")
+    private Date saveTime;
+
+    @ApiModelProperty(value = "救援单位")
+    private String saveOrg;
+
+    @ApiModelProperty(value = "任务接收人")
+    private String taskResponseUser;
+
+    @ApiModelProperty(value = "维修完成时间")
+    private Date fixFinishTime;
+
+    @ApiModelProperty(value = "维修单位")
+    private String responseOrg;
+
+    @ApiModelProperty(value = "维修人")
+    private String responseUser;
+
+    @ApiModelProperty(value = "故障原因")
+    private String errorResult;
+
+    @ApiModelProperty(value = "维修结果")
+    private String fixResult;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "现场照片")
+    private List<String> fixImgs;
+
+    @ApiModelProperty(value = "故障描述")
+    private String errorContent;
+
+    @ApiModelProperty(value = "故障照片")
+    private List<String> errorImgs;
+
+    @ApiModelProperty(value = "反馈时间")
+    private Date responseTime;
+
+    @ApiModelProperty(value = "反馈人")
+    private String feedbackUname;
+
+    @ApiModelProperty(value = "结果评价")
+    private String feedbackResult;
+
+    @ApiModelProperty(value = "反馈备注")
+    private String feedbackRemark;
+
+    @ApiModelProperty(value = "反馈现场照片")
+    private List<String> feedBackImgs;
+
+    @ApiModelProperty(value = "处置时间")
+    private Date dealTime;
+
+    @ApiModelProperty(value = "处置单位")
+    private String dealOrg;
+
+    @ApiModelProperty(value = "处置人")
+    private String dealUser;
+
+    @ApiModelProperty(value = "处置结果")
+    private String actionResult;
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 微信公众号任务列表dto类
+ * kongfm
+ */
+@Data
+@ApiModel(value="WechatMyTaskListDto", description="微信公众号任务列表dto类")
+public class WechatMyTaskListDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "任务类型")
+    private String taskType;
+
+    @ApiModelProperty(value = "是否结案")
+    private Boolean taskStatus;
+
+    @ApiModelProperty(value = "地址")
+    private String address;
+
+    @ApiModelProperty(value = "派遣时间")
+    private Date dispatchTime;
+
+}

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

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+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;
+
+/**
+ * 微信公众号openid与电话号对应关系表
+ *
+ * @author system_generator
+ * @date 2021-09-22
+ */
+@Data
+@ApiModel(value="WechatRelationDto", description="微信公众号openid与电话号对应关系表")
+public class WechatRelationDto  {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "微信公众号openid")
+    private String openId;
+
+    @ApiModelProperty(value = "系统注册账户电话号")
+    private String phone;
+
+    @ApiModelProperty(value = "验证码")
+    private String code;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/AlertCalled.java

@@ -221,4 +221,12 @@ public class AlertCalled extends BaseEntity {
     @ApiModelProperty(value = "是否辅屏查询")
     private String isAuxiliaryScreen;
 
+    @TableField("equipment_id")
+    @ApiModelProperty(value = "设备id")
+    private Long equipmentId;
+
+    @TableField("images")
+    @ApiModelProperty(value = "图片")
+    private String images;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/AlertFormValue.java

@@ -46,6 +46,8 @@ public class AlertFormValue extends BaseEntity {
 
     @ApiModelProperty(value = "是否一行显示")
     private Boolean block;
+    @ApiModelProperty(value = "是否影藏")
+    private Boolean hide;
 
     public AlertFormValue() {
         super();

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/DispatchPaper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -160,4 +161,48 @@ public class DispatchPaper extends BaseEntity {
 	@TableField("remark")
     private String remark;
 
+    /**
+     * 到达时间
+     */
+    @TableField("arrive_time")
+    private Date arriveTime;
+
+    /**
+     * 处置时间
+     */
+    @TableField("deal_time")
+    private Date dealTime;
+
+
+    /**
+     * 救援机构名称
+     */
+    @TableField("save_org_name")
+    private String saveOrgName;
+
+    /**
+     * 维修单位名称
+     */
+    @TableField("repair_org_name")
+    private String repairOrgName;
+
+    /**
+     * 维修人
+     */
+    @TableField("repair_user")
+    private String repairUser;
+
+    /**
+     * 处置单位
+     */
+    @TableField("deal_org_name")
+    private String dealOrgName;
+
+    /**
+     * 处置人
+     */
+    @TableField("deal_user")
+    private String dealUser;
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/EnevatorRelation.java

+package com.yeejoin.amos.boot.module.tzs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 关注电梯关系表
+ *
+ * @author litw
+ * @date 2021-09-22
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tz_enevator_relation")
+public class EnevatorRelation  {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * openid个人识别id
+     */
+	@TableField("open_id")
+    private Long openId;
+
+    /**
+     * 电梯id
+     */
+	@TableField("enevator_id")
+    private String enevatorId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/MaintainInfo.java

+package com.yeejoin.amos.boot.module.tzs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 维保信息表
+ *
+ * @author litw
+ * @date 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_maintain_info")
+public class MaintainInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 电梯id
+     */
+    @TableField("enevator_id")
+    private String enevatorId;
+
+    /**
+     * 最新维保时间
+     */
+	@TableField("maintain_time")
+    private Date maintainTime;
+
+    /**
+     * 下次维保时间
+     */
+	@TableField("next_maintain_time")
+    private Date nextMaintainTime;
+
+    /**
+     * 维保单位id
+     */
+	@TableField("maintain_unit_id")
+    private String maintainUnitId;
+
+    /**
+     * 维保单位
+     */
+	@TableField("maintain_unit")
+    private String maintainUnit;
+
+    /**
+     * 维保人员id
+     */
+	@TableField("maintain_person_id")
+    private String maintainPersonId;
+
+    /**
+     * 维保人员
+     */
+	@TableField("maintain_person")
+    private String maintainPerson;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TestInfo.java

+package com.yeejoin.amos.boot.module.tzs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 检验信息表
+ *
+ * @author litw
+ * @date 2021-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_test_info")
+public class TestInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 电梯id
+     */
+    @TableField("enevator_id")
+    private String enevatorId;
+
+    /**
+     * 最新检验时间
+     */
+	@TableField("test_time")
+    private Date testTime;
+
+    /**
+     * 检验单位id
+     */
+	@TableField("test_unit_id")
+    private String testUnitId;
+
+    /**
+     * 检验单位
+     */
+	@TableField("test_unit")
+    private String testUnit;
+
+    /**
+     * 检验人员id
+     */
+	@TableField("test_person_id")
+    private String testPersonId;
+
+    /**
+     * 检验人员
+     */
+	@TableField("test_person")
+    private String testPerson;
+
+    /**
+     * 检验结论
+     */
+	@TableField("test_result")
+    private String testResult;
+
+    /**
+     * 更新时间
+     */
+	@TableField("update_time")
+    private Date updateTime;
+
+}