Skip to content

A
amos-boot-biz
Commit 37c3bbde authored by 李成龙's avatar 李成龙
Browse files
Options

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

# Conflicts: # amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java
parents f729bb77 f0310916
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3137 additions and 204 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ 37c3bbde
......@@ -30,7 +30,6 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
......@@ -64,7 +63,7 @@ public class ControllerAop {
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"};
String[] url = new String[]{"/api/user/selectInfo", "/api/user/save/curCompany", "/jcs/command/lookHtmlText", "/jcs/common/duty-person/findByDutyAreaId", "/tzs/wechatBack", "/tzs/elevator/getElevatorInfo"};
// 获取请求路径
for(String uri : url) {
if(request.getRequestURI().indexOf(uri) != -1) {
......@@ -107,10 +106,10 @@ public class ControllerAop {
CompanyBo company = new CompanyBo();
DepartmentBo department = new DepartmentBo();
RoleBo role = new RoleBo();
CompanyModel companyM = user.getCompanys().get(0);
CompanyModel companyM = user.getCompanys() != null ? user.getCompanys().get(0) : null ;
Bean.copyExistPropertis(companyM, company);
Map<Long, List<DepartmentModel>> mapDepartments = user.getCompanyDepartments();
DepartmentModel departmentM = mapDepartments.get(companyM.getSequenceNbr()).get(0);
DepartmentModel departmentM = companyM != null ? mapDepartments.get(companyM.getSequenceNbr()).get(0) : null ;
Bean.copyExistPropertis(departmentM, department);
Map<Long, List<RoleModel>> roles = user.getOrgRoles();
Long sequenceNbr;
......@@ -121,7 +120,7 @@ public class ControllerAop {
}
RoleModel roleM = null;
if (sequenceNbr == null) {
roleM = roles.get(companyM.getSequenceNbr()).get(0);
roleM = companyM != null ?roles.get(companyM.getSequenceNbr()).get(0) : null;
} else {
roleM = roles.get(sequenceNbr).get(0);
}
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/enums/WorkFlowEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.biz.common.enums;
import lombok.AllArgsConstructor;
@AllArgsConstructor
public enum WorkFlowEnum {
BUSINESSKEY("businessKey","自动生成的ID"),
processDefinitionKey("processDefinitionKey","流程定义的KEY"),
制定计划内容("制定计划+内容","流程节点的特殊值"),
现场确认("现场确认","流程节点的特殊值"),
CONDITION("condition",""),
DATA("data","data"),
ID("id","id"),
CHECKFLAG("checkFlag","自定义是否具有执行权限的标识符"),
TASKID("taskId","可执行任务的主键"),
GROUP("group","角色组"),
GROUPID("groupId","角色组的key"),
GROUPNAME("groupName","角色组的key"),
NAME("name","任务节点的key"),
PROCESSINSTANCEID("processInstanceId",""),
ASSIGN("assignee","角色执行人key");
private String code;//对应菜单组件名称
private String desc;//描述
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/excel/ExcelUtil.java
View file @ 37c3bbde
......@@ -257,7 +257,7 @@ public class ExcelUtil {
//创建本地文件
String filePath = fileName + excelTypeEnum.getValue();
try {
fileName = new String(filePath.getBytes(),"UTF-8");
fileName = new String(filePath.getBytes(), StandardCharsets.UTF_8);
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
response.setContentType("application/vnd.ms-excel");
response.addHeader("Content-Disposition", "filename=" + fileName);
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/service/IWorkflowExcuteService.java
View file @ 37c3bbde
......@@ -40,6 +40,25 @@ public interface IWorkflowExcuteService{
* @return
*/
boolean CompleteTask(String processInstanceId,String condition, ReginParams userInfo);
/**
* 查询并执行一步工作流-无权限
* @param procressId 流程id
* @param condition 条件
* @return boolean
* @throws Exception
*/
boolean excuteTask(String procressId, String condition) throws Exception;
/**
* 获取当前登录用户所能执行的任务信息列表
* @param key 流程定义的key ，例如 ：fire_supervision 防火监督
* @param userInfo
* @return List<map<String,String>> eg: [{ "processInstanceId": "110d3af9-1f5a-11ec-a26e-b07b25133c48"}]
* @throws Exception
*/
public Object getCurrentUserAllTaskList(String key, ReginParams userInfo) throws Exception;
}
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/MyBatisPlusCodeGenerator.java
View file @ 37c3bbde
......@@ -26,7 +26,7 @@ public class MyBatisPlusCodeGenerator {
/**
* 项目名称缩写
*/
static String projectShortName = "common";
static String projectShortName = "tzs";
/**
* 项目api目录
......@@ -102,7 +102,7 @@ public class MyBatisPlusCodeGenerator {
gc.setActiveRecord(false);
// 数据源配置
DataSourceConfig dsc = new DataSourceConfig();
dsc.setUrl("jdbc:mysql://172.16.6.60:3306/amos-jcs-biz?serverTimezone=GMT%2B8");
dsc.setUrl("jdbc:mysql://172.16.6.60:3306/amos-tzs-biz?serverTimezone=GMT%2B8");
// dsc.setSchemaName("public");
// dsc.setDriverName("com.mysql.jdbc.Driver");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java
View file @ 37c3bbde
......@@ -32,6 +32,8 @@ public class RedisKey {
public static final String CTI_TOKEN = "cti_token";
/**微信公众平台 token */
public static final String WECHAT_TOKEN = "wechat_token";
/**微信公众平台 token */
public static final String WECHAT_JS_TOKEN = "wechat_js_token";
/** 驼峰转下划线(简单写法，效率低于 ) */
public static String humpToLine(String str) {
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/TreeParser.java
View file @ 37c3bbde
......@@ -312,7 +312,6 @@ public class TreeParser {
String.valueOf(NAMEMethodNameme.invoke(entity)),
String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
String.valueOf(nodeTypeMethod == null ? "0" : nodeTypeMethod.invoke(entity)));
menu.setIsLeaf(false);
childList.add(menu);
}
}
......
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java
View file @ 37c3bbde
......@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import java.text.ParseException;
import com.alibaba.fastjson.JSONObject;
import feign.Response;
......@@ -166,4 +166,51 @@ public interface WorkflowFeignService {
*/
@RequestMapping(value = "/task/")
JSONObject getTask(@RequestParam(value="processInstanceId") String processInstanceId);
/**
* 获取当前登录人所有可以执行的任务列表
* @param definitionKey
* @return
* @throws Exception
*/
@RequestMapping(value = "/task/getCurrentUserAllTaskList/{definitionKey}",method = RequestMethod.GET)
JSONObject getCurrentUserAllTaskList(@PathVariable String definitionKey) throws Exception;
/**
* 获取当前登录人所有已执行的历史任务列表
* @param processDefinitionKey
* @return
* @throws ParseException
*/
@RequestMapping(value = "/activitiHistory/historytasks/{processDefinitionKey}",method = RequestMethod.GET)
JSONObject queryHistoryTasks(@PathVariable String processDefinitionKey)throws ParseException;
/**
* 获取历史流程中带有执行角色组的流程信息
* @param processInstanceId
* @return
* @throws ParseException
*/
@RequestMapping(value = "/activitiHistory/processes/historytasks/getGroupNamelist/{taskId}",method = RequestMethod.GET)
JSONObject getHistoricIdentityLinksForTask(@PathVariable("taskId") String taskId) throws ParseException;
/**
*获取指定流程定义下所有的历史流程任务任务执行信息 --获取historytask表数据
* @param processInstanceId
* @return
* @throws ParseException
*/
@RequestMapping(value = "/activitiHistory/processes/historytasks/getHistoricTaskForProcessInstanceId/{processInstanceId}",method = RequestMethod.GET)
JSONObject getHistoricTaskForProcessInstanceId(@PathVariable("processInstanceId") String processInstanceId) throws ParseException;
/**'
* 查询指定任务名称的任务列表
* @param taskName
* @return
* @throws Exception
*/
@RequestMapping(value = "/activitiHistory/getTaskListForTaskName/{taskName}/{definitionKey}",method = RequestMethod.GET)
JSONObject getTaskListForTaskName(@PathVariable String taskName,@PathVariable String definitionKey) throws Exception ;
}
amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml
View file @ 37c3bbde
......@@ -40,6 +40,7 @@ LEFT JOIN (
COUNT(1) count
FROM
cb_linkage_unit
WHERE is_delete = 0
GROUP BY
emergency_linkage_unit_code
) elink ON elink.emergency_linkage_unit_code = cbb.`code`
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyFireFightingDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.common.api.dto;
import java.io.Serializable;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "DutyFireFightingDto", description = "微型消防站值班")
public class DutyFireFightingDto implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "用户id")
private String userId;
@ApiModelProperty(value = "用户名称")
private String userName;
@ApiModelProperty(value = "单位ID")
private String teamId;
@ApiModelProperty(value = "单位名称")
private String teamName;
@ApiModelProperty(value = "岗位id")
private String postType;
@ApiModelProperty(value = "岗位名称")
private String postTypeName;
@ApiModelProperty(value = "值班信息")
private List<DutyPersonShiftDto> dutyShift;
@ApiModelProperty(value = "值班开始时间")
private String startTime;
@ApiModelProperty(value = "值班结束时间")
private String endTime;
@ApiModelProperty(value = "微型消防站")
private String fireFighting;
@ApiModelProperty(value = "微型消防站Id")
private String fireFightingId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyFireFightingExcleDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.common.api.dto;
import java.io.Serializable;
import java.util.List;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "DutyFireFightingExcleDto", description = "微型消防站值班")
public class DutyFireFightingExcleDto implements Serializable{
@ExcelIgnore
private static final long serialVersionUID = 1L;
@ExcelProperty(value = "序号", index = 0)
@ApiModelProperty(value = "序号")
private Integer number;
@ExcelIgnore
@ApiModelProperty(value = "单位ID")
private String teamId;
@ExcelProperty(value = "单位名称", index = 1)
@ApiModelProperty(value = "单位名称")
private String teamName;
@ExcelIgnore
@ApiModelProperty(value = "用户id")
private String userId;
@ExcelProperty(value = "用户名称", index = 2)
@ApiModelProperty(value = "用户名称")
private String userName;
// @ExcelIgnore
// @ApiModelProperty(value = "部门id")
// private String deptId;
// @ExcelIgnore
// @ApiModelProperty(value = "部门名称")
// private String deptName;
@ExcelIgnore
@ApiModelProperty(value = "岗位id")
private String postType;
@ExcelProperty(value = "岗位", index = 3)
@ApiModelProperty(value = "岗位名称")
private String postTypeName;
@ExcelProperty(value = "微型消防站", index = 4)
@ApiModelProperty(value = "微型消防站")
private String fireFighting;
@ExcelIgnore
@ApiModelProperty(value = "微型消防站Id")
private String fireFightingId;
@ExcelIgnore
@ApiModelProperty(value = "值班信息")
private List<DutyPersonShiftDto> dutyShift;
@ExcelIgnore
@ApiModelProperty(value = "值班开始时间")
private String startTime;
@ExcelIgnore
@ApiModelProperty(value = "值班结束时间")
private String endTime;
}
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
View file @ 37c3bbde
......@@ -57,25 +57,42 @@ public class FireExpertsDto extends BaseDto {
@ApiModelProperty(value = "民族")
private String nation;
// @ExplicitConstraint(indexNum = 7, sourceClass = RoleNameExplicitConstraint.class, method = "getAdministrativeDivisions") //固定下拉内容
@ExcelProperty(value = "籍贯", index = 7)
@ApiModelProperty(value = "籍贯")
private String nativePlace;
@ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
@ExcelProperty(value = "政治面貌", index = 8)
@ExplicitConstraint(indexNum = 7, sourceClass = CommonExplicitConstraint.class, method = "getPoliticalOutlook") //固定下拉内容
@ExcelProperty(value = "政治面貌", index = 7)
@ApiModelProperty(value = "政治面貌")
private String politicalOutlook;
// @ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getCitys") //固定下拉内容
@ExcelIgnore
// @ExcelProperty(value = "籍贯", index = 8)
@ApiModelProperty(value = "籍贯")
private String nativePlace;
// @ExplicitConstraint(indexNum = 9, sourceClass = RoleNameExplicitConstraint.class, method = "getAdministrativeDivisions") //固定下拉内容
@ExcelProperty(value = "现居住地", index = 9)
@ExplicitConstraint(indexNum = 8, sourceClass = CommonExplicitConstraint.class, method = "getCitys") //固定下拉内容
@ExcelProperty(value = "籍贯/户口所在地详细地址", index = 8)
@ApiModelProperty(value = "籍贯/户口所在地详细地址")
private String nativePlaceVal;
// @ExplicitConstraint(indexNum = 10,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
@ApiModelProperty(value = "现居住地")
@ExcelIgnore
//@ExcelProperty(value = "现居住地", index = 10)
private String residence;
@ExcelProperty(value = "居住地详情", index = 10)
// @ExcelIgnore
//@ExplicitConstraint(indexNum =11,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
@ExcelProperty(value = "现居住地", index = 10)
@ApiModelProperty(value = "居住地详情")
private String residenceDetails;
@ExplicitConstraint(indexNum =9,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
@ExcelProperty(value = "现居住地", index = 9)
@ApiModelProperty(value = "现居住地详细地址")
private String residenceDetailVal;
@ExcelProperty(value = "办公电话", index = 11)
@ApiModelProperty(value = "办公电话")
private String officePhone;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgMenuDto.java
View file @ 37c3bbde
......@@ -72,4 +72,12 @@ public class OrgMenuDto {
public OrgMenuDto() {
// TODO Auto-generated constructor stub
}
public OrgMenuDto(Long key, Long value, String title, String name, List<OrgMenuDto> children) {
this.key = key;
this.value = value;
this.title = title;
this.name = name;
this.children = children;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrDto.java
View file @ 37c3bbde
......@@ -75,4 +75,7 @@ public class OrgUsrDto extends BaseDto {
@ApiModelProperty(value = "动态表单值")
private List<DynamicFormInstance> dynamicFormValue;
@ApiModelProperty(value = "动态表单值-DTO类型")
private List<DynamicFormInstanceDto> dynamicFormValueDto;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java
View file @ 37c3bbde
......@@ -34,14 +34,6 @@ public class WaterResourceDto extends BaseDto {
private String address;
@ApiModelProperty(value = "经度")
@ExcelProperty(value = "经度", index = 48)
private Double longitude;
@ApiModelProperty(value = "纬度")
@ExcelProperty(value = "纬度", index = 49)
private Double latitude;
@ExcelIgnore
@ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）")
private String resourceType;
......@@ -73,8 +65,8 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "管理单位id")
private Long managementUnitId;
@ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ExcelProperty(value = "管理单位", index = 5)
@ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ExcelProperty(value = "管理单位", index = 9)
@ApiModelProperty(value = "管理单位")
private String managementUnit;
......@@ -82,8 +74,8 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "维保单位id")
private Long maintenanceUnitId;
@ExplicitConstraint(indexNum = 6, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ExcelProperty(value = "维保单位", index = 6)
@ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class, method = "getCompanyList")
@ExcelProperty(value = "维保单位", index = 10)
@ApiModelProperty(value = "维保单位")
private String maintenanceUnit;
......@@ -111,11 +103,11 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "实景图")
private String realityImg;
@ExcelProperty(value = "联系人姓名", index = 9)
@ExcelProperty(value = "联系人姓名", index = 41)
@ApiModelProperty(value = "联系人姓名")
private String contactUser;
@ExcelProperty(value = "联系人电话", index = 10)
@ExcelProperty(value = "联系人电话", index = 42)
@ApiModelProperty(value = "联系人电话")
private String contactPhone;
......@@ -151,7 +143,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "水源可用状态类别代码")
private String statusCode;
@ExplicitConstraint(type = "SYKYZT", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "SYZT", indexNum = 12, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "水源可用状态", index = 12)
@ApiModelProperty(value = "水源可用状态类别名称")
private String status;
......@@ -168,7 +160,7 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "消防给水管网形式类型代码")
private String pipeTypeCode;
@ExplicitConstraint(type = "XFJSGWXS", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExplicitConstraint(type = "XFJSGW", indexNum = 15, sourceClass = CommonExplicitConstraint.class) //动态下拉内容
@ExcelProperty(value = "消防给水管网形式", index = 15)
@ApiModelProperty(value = "消防给水管网形式")
private String pipeTypeName;
......@@ -262,11 +254,19 @@ public class WaterResourceDto extends BaseDto {
@ApiModelProperty(value = "四季变化简要情况")
private String seasonChangeInfo;
@ExplicitConstraint(indexNum = 32, source = {"1", "0"}) //固定下拉内容
@ExcelProperty(value = "有无枯水期", index = 32)
// @ExplicitConstraint(indexNum = 32, source = {"0", "1"}) //固定下拉内容
// @ExcelProperty(value = "有无枯水期", index = 32)
@ExcelIgnore
@ApiModelProperty(value = "有无枯水期")
private Boolean hasDrySeason;
@ExplicitConstraint(indexNum = 32, source = {"有", "无"}) //固定下拉内容
@ExcelProperty(value = "有无枯水期", index = 32)
@ApiModelProperty(value = "有无枯水期")
private String hasDrySeasonType;
@ExcelProperty(value = "枯水期跨度简要情况", index = 33)
@ApiModelProperty(value = "枯水期跨度简要情况")
private String dryPeriodSpan;
......@@ -313,7 +313,8 @@ public class WaterResourceDto extends BaseDto {
private Long equipId;
@ApiModelProperty("设施定义名称")
@ExcelProperty(value = "设施定义名称", index = 41)
@ExcelProperty(value = "设施定义名称", index = 5)
@ExplicitConstraint(indexNum = 5, sourceClass = CommonExplicitConstraint.class, method = "getEquipDefinition")
private String equipName;
@ExcelIgnore
......@@ -321,8 +322,9 @@ public class WaterResourceDto extends BaseDto {
private Long equipCategoryId;
// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
@ApiModelProperty("设施分类名称")
@ExplicitConstraint(indexNum = 44, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory")
@ExcelProperty(value = "设施分类名称", index = 42)
@ExcelIgnore
// @ExplicitConstraint(indexNum = 42, sourceClass = CommonExplicitConstraint.class, method = "getEquipCategory")
// @ExcelProperty(value = "设施分类名称", index = 42)
private String equipCategoryName;
@ApiModelProperty("设施编码")
......@@ -330,6 +332,15 @@ public class WaterResourceDto extends BaseDto {
private String equipCode;
@ApiModelProperty("维保周期")
@ExcelProperty(value = "维保周期(月)", index = 43)
@ExcelProperty(value = "维保周期(月)", index = 6)
private String maintenancePeriod;
@ApiModelProperty(value = "经度")
@ExcelProperty(value = "经度", index = 43)
private Double longitude;
@ApiModelProperty(value = "纬度")
@ExcelProperty(value = "纬度", index = 44)
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/entity/FireExperts.java
View file @ 37c3bbde
......@@ -106,4 +106,10 @@ public class FireExperts extends BaseEntity {
@ApiModelProperty(value = "出生日期")
private Date birthdayTime;
@ApiModelProperty(value = "现居住地详细地址")
private String residenceDetailVal;
@ApiModelProperty(value = "户籍所在地详细地址")
private String nativePlaceVal;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/TemplateCellWriteHandlerDate.java
View file @ 37c3bbde
......@@ -32,7 +32,7 @@ public class TemplateCellWriteHandlerDate implements SheetWriteHandler {
/**
* 避免生成的导入模板下拉值获取不到
*/
private static final Integer LIMIT_NUMBER = 1;
private static final Integer LIMIT_NUMBER = 0;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/excel/TemplateDynamicCellWriteHandlerDate.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.common.api.excel;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.poi.ss.usermodel.DataValidation;
import org.apache.poi.ss.usermodel.DataValidationConstraint;
import org.apache.poi.ss.usermodel.DataValidationHelper;
import org.apache.poi.ss.usermodel.Name;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddressList;
import org.apache.poi.xssf.usermodel.XSSFDataValidation;
import com.alibaba.excel.write.handler.SheetWriteHandler;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
public class TemplateDynamicCellWriteHandlerDate implements SheetWriteHandler{
/**
* 构造器注入
*/
private List<Map<Integer, String[]>> explicitListConstraintMap = new ArrayList<Map<Integer, String[]>>();
public TemplateDynamicCellWriteHandlerDate(List<Map<Integer, String[]>> explicitListConstraintMap) {
this.explicitListConstraintMap = explicitListConstraintMap;
}
/**
* 避免生成的导入模板下拉值获取不到
*/
private static final Integer LIMIT_NUMBER = 0;
/**
* 返回excel列标A-Z-AA-ZZ
*
* @param num 列数
* @return java.lang.String
*/
private String getExcelLine(int num) {
String line = "";
int first = num / 26;
int second = num % 26;
if (first > 0) {
line = (char) ('A' + first - 1) + "";
}
line += (char) ('A' + second) + "";
return line;
}
@Override
public void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
// TODO Auto-generated method stub
}
@Override
public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
if(explicitListConstraintMap!=null) {
// 这里可以对cell进行任何操作
Sheet sheet = writeSheetHolder.getSheet();
DataValidationHelper helper = sheet.getDataValidationHelper();
for(int index =0 ; index < explicitListConstraintMap.size() ;index++ ) {
int startIndex = index+1;
explicitListConstraintMap.get(index).forEach((k, v)->{
// 设置下拉单元格的首行 末行 首列 末列
CellRangeAddressList rangeList = new CellRangeAddressList(startIndex, startIndex, k, k);
// 如果下拉值总数大于100，则使用一个新sheet存储，避免生成的导入模板下拉值获取不到
if (v.length > LIMIT_NUMBER) {
//定义sheet的名称
//1.创建一个隐藏的sheet 名称为 hidden + k
String sheetName = "hidden" +startIndex + k;
Workbook workbook = writeWorkbookHolder.getWorkbook();
Sheet hiddenSheet = workbook.createSheet(sheetName);
for (int i = 0, length = v.length; i < length; i++) {
// 开始的行数i，列数k
hiddenSheet.createRow(i).createCell(k).setCellValue(v[i]);
}
Name category1Name = workbook.createName();
category1Name.setNameName(sheetName);
String excelLine = getExcelLine(k);
// =hidden!$H:$1:$H$50 sheet为hidden的 H1列开始H50行数据获取下拉数组
String refers = "=" + sheetName + "!$" + excelLine + "$1:$" + excelLine + "$" + (v.length + 1);
// 将刚才设置的sheet引用到你的下拉列表中
DataValidationConstraint constraint = helper.createFormulaListConstraint(refers);
DataValidation dataValidation = helper.createValidation(constraint, rangeList);
if(dataValidation instanceof XSSFDataValidation){
dataValidation.setSuppressDropDownArrow(true);
dataValidation.setShowErrorBox(true);
}else{
dataValidation.setSuppressDropDownArrow(false);
}
writeSheetHolder.getSheet().addValidationData(dataValidation);
// 设置存储下拉列值得sheet为隐藏
int hiddenIndex = workbook.getSheetIndex(sheetName);
if (!workbook.isSheetHidden(hiddenIndex)) {
workbook.setSheetHidden(hiddenIndex, true);
}
}
});
}
}
}
}
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
View file @ 37c3bbde
......@@ -220,4 +220,7 @@ public interface EquipFeignClient {
@RequestMapping(value = "equipment-category/tree/{type}", method = RequestMethod.GET)
ResponseModel<List<LinkedHashMap<String, Object>>> getEquipmentCategory(@PathVariable String type);
@RequestMapping(value = "/equipment/listLike/{code}", method = RequestMethod.GET)
ResponseModel<List<LinkedHashMap<String, Object>>> listLikePage(@PathVariable 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/FailureDetailsMapper.java
View file @ 37c3bbde
......@@ -38,6 +38,7 @@ public interface FailureDetailsMapper extends BaseMapper<FailureDetails> {
String startTime, String endTime, String submissionName, Long submissionBranchId,
Long sequenceNbr);
int selectAllCount();
/**
* 查询我发起的 分页
* current 当前页
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireStationMapper.java
View file @ 37c3bbde
......@@ -23,11 +23,11 @@ public interface FireStationMapper extends BaseMapper<FireStation> {
// 微型消防站按时间倒叙排列add order by cb_fire_station.rec_date desc 2021-09-08 by kongfm
@Select("<script>"
+ "select * from cb_fire_station where cb_fire_station.is_delete=0 "
+ "<if test='par.name!=null'> and cb_fire_station.name like CONCAT('%',#{par.name},'%') </if>"
+ "<if test='par.bizCompanyId!=null'> and cb_fire_station.biz_company_id = #{par.bizCompanyId} </if>"
+ "<if test='par.bizCompanyCode!=null'> and cb_fire_station.biz_company_code like CONCAT('',#{par.bizCompanyCode},'%') </if>"
+" order by cb_fire_station.rec_date desc limit #{pageNum},#{pageSize}"
+ "select * ,(SELECT COUNT(*)FROM jc_firestation_jacket WHERE firefighters_id = a.sequence_nbr and is_delete =0) AS eqNum from cb_fire_station a where a.is_delete=0 "
+ "<if test='par.name!=null'> and a.name like CONCAT('%',#{par.name},'%') </if>"
+ "<if test='par.bizCompanyId!=null'> and a.biz_company_id = #{par.bizCompanyId} </if>"
+ "<if test='par.bizCompanyCode!=null'> and a.biz_company_code like CONCAT('',#{par.bizCompanyCode},'%') </if>"
+" order by a.rec_date desc limit #{pageNum},#{pageSize}"
+ "</script>")
List<FireStationDto>getFireStation(@Param("pageNum")int pageNum,@Param("pageSize")int pageSize,@Param("par")FireStationDto par);
@Select("<script>"
......
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
View file @ 37c3bbde
......@@ -84,4 +84,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
List< OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
List<OrgUsr> amosIdExist(String amosId);
void updatelistByParentId(String codex, String code);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyCommonService.java
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.common.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto;
import java.text.ParseException;
import java.util.List;
......@@ -86,4 +87,33 @@ public interface IDutyCommonService {
* @return
*/
List<Long> getDutyShiftIdList();
/**
* 添加动态表单数据保存的方法，返回保存数据的instanceid
* @param userId
* @param map
* @param groupCode
* @return
*/
public Long excuteDynamicFormInstance( String userId,Map<String, Object> map, String groupCode);
/**
* 修改动态表单数据
* @param groupCode
* @param instanceId
* @param map
*/
public void updateDynamicFormInstance(String groupCode,Long instanceId, Map<String, Object> map) ;
/**
* 保存值班人的信息---
* @param instanceId
* @param dutyShift
* @param startTime
*/
public void saveDutyPersonShiftDetail( Long instanceId ,List<DutyPersonShiftDto> dutyShift ,String startTime) ;
/**
* 添加值班人的信息 可以保存空信息
* @param instanceId
* @param dutyShiftList
*/
public void insertPersonShift(Long instanceId, List<DutyPersonShiftDto> dutyShiftList);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyFireFightingService.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.common.api.service;
import com.yeejoin.amos.boot.module.common.api.dto.DutyFireFightingDto;
public interface IDutyFireFightingService extends IDutyCommonService {
/**
* 值班信息保存
* @param DutyFireFightingDto 对象
* @return List<DutyCarDto>
*/
DutyFireFightingDto save(DutyFireFightingDto dto);
/**
* 更新
* @param instanceId 实例id
* @param DutyFireFightingDto 业务对象
* @return List<DutyCarDto>
*/
DutyFireFightingDto update(Long instanceId, DutyFireFightingDto dto);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java
View file @ 37c3bbde
......@@ -216,4 +216,10 @@ public interface IOrgUsrService {
* @return
*/
List<OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
/**
* 查询目标公司下所有人员的简要信息，数据包含：所在公司id和name ,人员id和name,岗位id和name
* @param ids
* @return
*/
public List<Map<String, Object>> getPersonDetailByCompanyIds(List<String> ids);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FailureDetailsMapper.xml
View file @ 37c3bbde
......@@ -32,6 +32,10 @@
order by submission_time DESC limit #{current},#{size};
</select>
<select id="selectAllCount" resultType="int">
SELECT COUNT(*) FROM cb_failure_details
</select>
<select id="selectWebPage" resultType="com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto">
SELECT
sequence_nbr,
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml
View file @ 37c3bbde
......@@ -104,7 +104,7 @@
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 (116,830,114)
and a.type_code in (#{par.typeCode})
</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
View file @ 37c3bbde
......@@ -151,10 +151,10 @@ 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
-- 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">
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/LinkageUnitMapper.xml
View file @ 37c3bbde
......@@ -46,91 +46,97 @@
a.longitude,
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
AS distance,
case when csps.person_number is null then 0 else
csps.person_number end as userNum,
case when cre.vehicle_number is null then 0 else cre.vehicle_number end as
carNum
FROM
cb_linkage_unit a
LEFT JOIN cb_special_position_staff csps ON a.sequence_nbr =
csps.company_id
LEFT JOIN cb_rescue_equipment cre on a.sequence_nbr = cre.company_id
where a.longitude is not null and
a.latitude is not null
<if test='par.distance!=null'>
and
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
&lt;=
#{par.distance}
</if>
ORDER BY distance limit #{pageNum},#{pageSize}
</select>
(select SUM(csps.person_number) from cb_special_position_staff csps where a.sequence_nbr = csps.company_id and csps.is_delete=0 ) as userNum,
(select SUM(cre.vehicle_number) from cb_rescue_equipment cre where a.sequence_nbr = cre.company_id and cre.is_delete=0 ) as carNum
<select id="listLinkageUnitZhDtoCount" resultType="Integer">
select
COUNT(a.sequence_nbr) num
FROM cb_linkage_unit a
where a.longitude
is not null and a.latitude is not null
<if test='par.distance!=null'>
and
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
&lt;=
#{par.distance}
</if>
</select>
<!--
case when csps.person_number is null then 0 else
csps.person_number end as userNum,
case when cre.vehicle_number is null then 0 else cre.vehicle_number end as
carNum-->
FROM
cb_linkage_unit a
<!-- LEFT JOIN cb_special_position_staff csps ON a.sequence_nbr =
csps.company_id
LEFT JOIN cb_rescue_equipment cre on a.sequence_nbr = cre.company_id-->
<select id="getEmergencyLinkageUnitCodeGroupByAndCount"
resultType="java.util.Map">
SELECT
emergency_linkage_unit_code as
emergencyLinkageUnitCode,
COUNT(unit_code) AS count
FROM
cb_linkage_unit
WHERE
is_delete = 0
GROUP BY
emergency_linkage_unit_code
</select>
where a.is_delete=0 and a.longitude is not null and
a.latitude is not null
<if test='par.distance!=null'>
and
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
&lt;=
#{par.distance}
</if>
ORDER BY distance limit #{pageNum},#{pageSize}
</select>
<select id="exportToExcel"
resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
select
a.unit_name unitName,
a.linkage_unit_type
linkageUnitType,
a.address ,
a.latitude,
a.longitude,
a.agreement_start_date agreementStartDate,
a.agreement_end_date
agreementEndDate,
a.contact_user contactUser,
a.contact_phone
contactPhone,
b.*
from cb_linkage_unit a LEFT JOIN
(SELECT
m.instance_id,
max(case m.field_code when 'emergencyServiceContent' then
m.field_value end) emergencyServiceContent,
max(case m.field_code when
'fireRescueCapability' then m.field_value end) fireRescueCapability,
max(case m.field_code when 'responsibilitiesSituation' then
m.field_value end) responsibilitiesSituation,
max(case m.field_code
when 'unitSituation' then m.field_value end) unitSituation
FROM
cb_dynamic_form_instance m GROUP BY m.instance_id) b
<select id="listLinkageUnitZhDtoCount" resultType="Integer">
select
COUNT(a.sequence_nbr) num
FROM cb_linkage_unit a
where a.is_delete=0 and a.longitude is not null and a.latitude is not null
<if test='par.distance!=null'>
and
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1)
&lt;=
#{par.distance}
</if>
</select>
on
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 -->
<select id="getEmergencyLinkageUnitCodeGroupByAndCount"
resultType="java.util.Map">
SELECT
emergency_linkage_unit_code as
emergencyLinkageUnitCode,
COUNT(unit_code) AS count
FROM
cb_linkage_unit
WHERE
is_delete = 0
GROUP BY
emergency_linkage_unit_code
</select>
<select id="exportToExcel"
resultType="com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto">
select
a.unit_name unitName,
a.linkage_unit_type
linkageUnitType,
a.address ,
a.latitude,
a.longitude,
a.agreement_start_date agreementStartDate,
a.agreement_end_date
agreementEndDate,
a.contact_user contactUser,
a.contact_phone
contactPhone,
b.*
from cb_linkage_unit a LEFT JOIN
(SELECT
m.instance_id,
max(case m.field_code when 'emergencyServiceContent' then
m.field_value end) emergencyServiceContent,
max(case m.field_code when
'fireRescueCapability' then m.field_value end) fireRescueCapability,
max(case m.field_code when 'responsibilitiesSituation' then
m.field_value end) responsibilitiesSituation,
max(case m.field_code
when 'unitSituation' then m.field_value end) unitSituation
FROM
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 and a.is_delete=0
</select>
<!--联动单位列表按时间倒叙排列add order by clu.rec_date desc 同时处理单位根节点-1时查询全部数据问题 2021-09-08 by kongfm -->
<select id="getEmergencyLinkageUnitList"
resultType="java.util.Map">
SELECT
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ 37c3bbde
......@@ -245,10 +245,10 @@
Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance,
case when cks_d.count is null then 0 else cks_d.count end as keySiteNum
FROM important_companys a left join (
SELECT cks.belong_id ,count(cks.belong_id) count from cb_key_site cks GROUP BY cks.belong_id
SELECT cks.belong_id ,count(cks.belong_id) count from cb_key_site cks where cks.is_delete=0 GROUP BY cks.belong_id
)cks_d
on a.id=cks_d.belong_id
where a.longitude is not null and a.latitude is not null
where a.longitude is not null and a.latitude is not null
<if test='par.distance!=null'>
and Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) &lt;=
#{par.distance}
......@@ -569,4 +569,14 @@ GROUP BY
amos_org_id = #{amosId}
</select>
<update id="updatelistByParentId">
UPDATE cb_org_usr
SET biz_org_code=replace(biz_org_code,#{code},#{codex})
WHERE biz_org_code like concat(#{code}, '%');
</update>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml
View file @ 37c3bbde
......@@ -17,6 +17,8 @@
r.contact_user,
r.contact_phone,
r.equip_name,
r.longitude,
r.latitude,
r.equip_category_name,
r.equip_code,
r.maintenance_period,
......@@ -45,6 +47,7 @@
rn.quality_situation_info,
rn.season_change_info,
rn.has_dry_season,
(case rn.has_dry_season when 0 then '有' when 1 then '无' end) hasDrySeasonType,
rn.dry_period_span,
rp.intake_height,
rp.elevation_difference,
......
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
View file @ 37c3bbde
......@@ -26,7 +26,8 @@ public class EquipSpecificDto extends BaseEntity {
/**
* 装备分类code（人员装备【10000000】）
*/
private String categoryCode = "10000000";
//private String categoryCode = "10000000";
private String categoryCode;
/**
* 队伍ID
*/
......
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
View file @ 37c3bbde
......@@ -25,8 +25,8 @@ public enum ExcelEnums {
// 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","救援装备")
XFZB ("消防装备", "消防装备", "com.yeejoin.amos.boot.module.common.api.dto.EquipmentDetailDownloadTemplateDto","XFZB");//("XFZB","消防装备")
XFZB ("消防装备", "消防装备", "com.yeejoin.amos.boot.module.common.api.dto.EquipmentDetailDownloadTemplateDto","XFZB"),//("XFZB","消防装备")
WXXFZB("微型消防站值班", "微型消防站值班", "com.yeejoin.amos.boot.module.common.api.dto.DutyFireFightingExcleDto","WXXFZB");//("WXXFZB","微型消防站值班")
private String fileName;
private String sheetName;
private String classUrl;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/feign/CommonResponseUtil2.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.jcs.api.feign;
import org.springframework.http.HttpStatus;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
public class CommonResponseUtil2 {
public static ResponseModel success() {
ResponseModel res = new ResponseModel();
res.setDevMessage(Constant.RESULT_SUCCESS);
res.setStatus(HttpStatus.OK.value());
return res;
}
public static ResponseModel success(Object obj) {
ResponseModel res = new ResponseModel();
res.setResult(obj);
res.setDevMessage(Constant.RESULT_SUCCESS);
res.setStatus(HttpStatus.OK.value());
return res;
}
public static ResponseModel success(Object obj, String message) {
ResponseModel res = new ResponseModel();
res.setResult(obj);
res.setDevMessage(message);
res.setStatus(HttpStatus.OK.value());
return res;
}
public static ResponseModel failure() {
ResponseModel res = new ResponseModel();
res.setDevMessage(Constant.RESULT_FAILURE);
res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
return res;
}
public static ResponseModel failure(String message) {
ResponseModel res = new ResponseModel();
res.setDevMessage(Constant.RESULT_FAILURE);
res.setMessage(message);
res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
return res;
}
public static ResponseModel failure(Object obj, String message) {
ResponseModel res = new ResponseModel();
res.setResult(obj);
res.setDevMessage(Constant.RESULT_FAILURE);
res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
return res;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/feign/Constant.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.jcs.api.feign;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.format.DateTimeFormatter;
/**
* @Description: 常量类
* @Author: duanwei
* @Date: 2019/7/29
*/
public interface Constant {
String SMALL_PRO_PRCODE = "SMALL_PRO_PRCODE_";
String RESULT_SUCCESS = "SUCCESS";
String RESULT_FAILURE = "FAILURE";
/**
* 任务-作业交底
*/
Integer JOB_TYPE = 0;
/**
* 任务-三交三查
*/
Integer HAND_QUERY = 1;
/**
* 违规管理
*/
Integer BAD_MANAGEMENT = 2;
Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
String FILE_SEPARATOR = System.getProperty("file.separator");
DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String PAGE_NUM = "0";
String SIZE_NUM = "20";
String PAGE = "page";
String SIZE = "size";
String ZERO = "0";
String ONE = "1";
String TWO = "2";
String THREE = "3";
String FOUR = "4";
String FIVE = "5";
String NULL = "";
String JSON_NULL = "[]";
/**
* 请求成功
*/
String SUCCESS = "200";
/**
* 请求错误
*/
String ERROR = "300";
/**
* 无权限
*/
String PERMISSION = "401";
/**
* 请求成功，其他错误
*/
String DATA_NULL = "402";
/**
* 请求失败
*/
String FAILED = "999";
/**
* 最大值
*/
Integer MAX = 32767;
/**
* 数据请求返回码
*/
public static final int RESCODE_SUCCESS = 1000; //成功
public static final int RESCODE_SUCCESS_MSG = 1001; //成功(有返回信息)
public static final int RESCODE_EXCEPTION = 1002; //请求抛出异常
public static final int RESCODE_NOLOGIN = 1003; //未登陆状态
public static final int RESCODE_NOEXIST = 1004; //查询结果为空
public static final int RESCODE_NOAUTH = 1005; //无操作权限
public static final int RESCODE_LOGINEXPIRE = 1006; //登录过期
/**
* token
*/
public static final int JWT_ERRCODE_EXPIRE = 1007;//Token过期
public static final int JWT_ERRCODE_FAIL = 1008;//验证不通过
/**
* jwt
*/
public static final String JWT_ID = "jwt-black";//jwt签发者
public static final String JWT_SECRET = "Isi5Ob9OfvJt+4IHoMJlHkS1ttg=";//密匙
public static final int JWT_TTL = 60 * 60 * 1000; // 60*60*1000; //millisecond
public static final int JWT_REFRESH_INTERVAL = 18 * 1000; //55*60*1000; //millisecond
public static final int JWT_REFRESH_TTL = 60 * 1000; // 12*60*60*1000; //millisecond
}
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
View file @ 37c3bbde
......@@ -49,6 +49,11 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
String data,
String lift);
int selectAllCount(Integer alertStatus,
String alertTypeCode ,
String alertSourceCode,
String startTime,
String endTime);
Integer AlertCalledcount(@Param("alertStatus")int alertStatus);
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @ 37c3bbde
......@@ -25,7 +25,10 @@
a.alert_stage alertStage,
a.call_time callTime,
a.rescue_grid rescueGrid,
a.alert_type alertType,
-- a.alert_type alertType,
CONCAT('【',a.alert_type,'】',IFNULL((select field_value from jc_alert_form_value where jc_alert_form_value.alert_called_id =a.sequence_nbr and jc_alert_form_value.field_code='remark'),"")) alertType,
a.alert_type_code alarmTypeCode,
a.unit_involved unitInvolved,
a.trapped_num trappedNum,
......@@ -49,11 +52,9 @@
and a.alert_status =1
</if>
<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},'%')
and a.address like CONCAT('%',#{par.address},'%') || a.alert_type like CONCAT('%',#{par.address},'%')
</if>
<if test='par.whether24!=false'>
and a.call_time &gt;= (NOW() - interval 24 hour)
</if>
......@@ -130,10 +131,16 @@
<if test="alertSourceCode!= null ">
and alert_source_code = #{alertSourceCode}
</if>
<if test="data != null and lift == 'ascend'">
<if test="data == 'address' and data != null and lift == 'ascend'">
order by CONVERT(address USING 'gbk') ASC limit #{current},#{size}
</if>
<if test="data == 'address' and data != null and lift == 'descend'">
order by CONVERT(address USING 'gbk') DESC limit #{current},#{size}
</if>
<if test="data != null and data != 'address' and lift == 'ascend'">
order by #{data} ASC limit #{current},#{size}
</if>
<if test="data != null and lift == 'descend'">
<if test="data != null and data != 'address' and lift == 'descend'">
order by #{data} DESC limit #{current},#{size}
</if>
<if test="data == null ">
......@@ -142,6 +149,28 @@
</where>
</select>
<select id="selectAllCount" resultType="int">
SELECT
COUNT(*)
FROM
jc_alert_called
<where>
is_delete = 0
<if test="alertStatus!= null ">
and alert_status = #{alertStatus}
</if>
<if test="startTime!= null and endTime != null">
and call_time between #{startTime} and #{endTime}
</if>
<if test="alertTypeCode!= null ">
and alarm_type_code = #{alertTypeCode}
</if>
<if test="alertSourceCode!= null ">
and alert_source_code = #{alertSourceCode}
</if>
</where>
</select>
<select id="AlertCalledcountTime" resultType="Integer">
......
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/CheckTypeSuEnum.java
View file @ 37c3bbde
package com.yeejoin.amos.supervision.common.enums;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
public enum CheckTypeSuEnum {
/**
* @author DELL
*/
SUPERVISED("日常检查", "1", "supervised"),
DAILY("专项检查", "2", "daily");
public enum CheckTypeSuEnum {
/**
* 检查类型枚举
*/
DAILY("日常检查", "1", "daily"),
SPECIAL_RQ("燃气专项", "2", "special"),
SPECIAL_GW("高温专项", "3", "special"),
SPECIAL_DQ("电气专项", "4", "special"),
SPECIAL_HD("重大活动专项", "5", "special"),
SPECIAL_BZ("重大保障专项", "6", "special");
/**
* 名字
......@@ -34,11 +41,23 @@ public enum CheckTypeSuEnum {
public static List<Map<String, Object>> getEnumList() {
return Arrays.stream(CheckTypeSuEnum.values()).map(e -> {
Map<String, Object> map = new HashMap<>();
map.put(e.getCode(), e.getName());
map.put("code", e.getCode());
map.put("name", e.getName());
return map;
}).collect(Collectors.toList());
}
/**
* 获取枚举
* @param code 编号
* @return CheckTypeSuEnum
* @throws Exception
*/
public static CheckTypeSuEnum getEumByCode(String code) throws Exception {
Optional<CheckTypeSuEnum> op = Arrays.stream(CheckTypeSuEnum.values()).filter(e->e.code.equals(code)).findFirst();
return op.orElseThrow(()->new Exception("不存在"));
}
public String getName() {
return name;
}
......
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/DangerCheckTypeLevelEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.supervision.common.enums;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author DELL
*/
public enum DangerCheckTypeLevelEnum {
DEPARTMENT("单位级", "1", "department"),
COMPANY("公司级", "2", "company"),
EXTERNAL("外部消防单位", "3", "external"),
OTHER("其他", "4", "external");
/**
* 名称，描述
*/
private String name;
/**
* 编码
*/
private String code;
/**
* 执行控制条件
*/
private String condition;
DangerCheckTypeLevelEnum(String name, String code, String condition) {
this.name = name;
this.code = code;
this.condition = condition;
}
/**
* 获取枚举
* @param code 编号
* @return DangerCheckTypeLevelEnum
* @throws Exception
*/
public static DangerCheckTypeLevelEnum getEumByCode(String code) throws Exception {
Optional<DangerCheckTypeLevelEnum> op = Arrays.stream(DangerCheckTypeLevelEnum.values()).filter(e->e.code.equals(code)).findFirst();
return op.orElseThrow(()->new Exception("不存在"));
}
public static List<Map<String, Object>> getEnumList() {
return Arrays.stream(DangerCheckTypeLevelEnum.values()).map(e -> {
Map<String, Object> map = new HashMap<>();
map.put("code", e.getCode());
map.put("name", e.getName());
return map;
}).collect(Collectors.toList());
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCondition(String condition) {
this.condition = condition;
}
public String getCondition() {
return condition;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/DangerHandleTypeEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.supervision.common.enums;
/**
* @author DELL
*/
public enum DangerHandleTypeEnum {
SUPERVISION("防火监督检查", "2"),
SELF("自行检查", "1");
/**
* 名称，描述
*/
private String name;
/**
* 编码
*/
private String code;
DangerHandleTypeEnum(String name, String code) {
this.name = name;
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/PlanStatusEnum.java
View file @ 37c3bbde
......@@ -7,12 +7,14 @@ import java.util.Map;
public enum PlanStatusEnum {
DRAFT("草稿",0),
EXAMINE_ONE("一级待审核",1),
EXAMINE_TWO("二级待审核",2),
EXAMINE_THREE("三级待审核",3),
EXAMINE_FORMULATE("已审核/检查内容未制定",4),
EXAMINE_DEVELOPED("检查内容已制定/未执行",5);
DRAFT("草稿",0, 1),
EXAMINE_ONE("一级待审核",1, 2),
EXAMINE_TWO("二级待审核",2, 3),
EXAMINE_THREE("三级待审核",3, 4),
EXAMINE_FORMULATE("已审核/检查内容未制定",4, 5),
EXAMINE_DEVELOPED("检查内容已制定/未执行",5, 6),
IN_EXECUTION("执行中",6, 7),
COMPLETED("已完成",7, 7);
/**
* 名称
......@@ -24,9 +26,12 @@ public enum PlanStatusEnum {
*/
private int value;
private PlanStatusEnum(String name, int value) {
private int nextStatus;
private PlanStatusEnum(String name, int value, int nextStatus) {
this.name = name;
this.value = value;
this.nextStatus = nextStatus;
}
......@@ -105,4 +110,12 @@ public enum PlanStatusEnum {
public void setValue(int value) {
this.value = value;
}
public int getNextStatus() {
return nextStatus;
}
public void setNextStatus(int nextStatus) {
this.nextStatus = nextStatus;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/WorkFlowBranchEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.supervision.common.enums;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author DELL
*/
public enum WorkFlowBranchEnum {
DAILY("日常检查", "company", "daily", "daily"),
SPECIAL_C("专项检查", "company", "special", "special"),
SPECIAL_E("专项检查", "external", "special-daily", "special"),
SUPERVISED_DW("单位级审核", "department", "special-daily", "supervised");
/**
* 名称，描述
*/
private String name;
/**
* 隐患类型级别
*/
private String dangerCheckTypeLevel;
/**
* 计划检查类型
*/
private String checkType;
/**
* 工作流分支
*/
private String workFlowBranch;
public String getName() {
return name;
}
public String getDangerCheckTypeLevel() {
return dangerCheckTypeLevel;
}
public String getCheckType() {
return checkType;
}
public String getWorkFlowBranch() {
return workFlowBranch;
}
WorkFlowBranchEnum(String name, String dangerCheckTypeLevel, String checkType, String workFlowBranch) {
this.name = name;
this.dangerCheckTypeLevel = dangerCheckTypeLevel;
this.checkType = checkType;
this.workFlowBranch = workFlowBranch;
}
public static List<Map<String,String>> getEnumList() {
List<Map<String,String>> list = new ArrayList<>();
for(WorkFlowBranchEnum e : WorkFlowBranchEnum.values()) {
Map<String, String> map = new HashMap<String, String>();
map.put("dangerCheckTypeLevel", e.getDangerCheckTypeLevel());
map.put("name", e.getName());
map.put("checkType", e.getCheckType());
map.put("workFlowBranch", e.getWorkFlowBranch());
list.add(map);
}
return list;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java
View file @ 37c3bbde
package com.yeejoin.amos.supervision.core.common.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author xixinzhao
*/
@Data
public class DangerDto {
public class DangerDto implements Serializable {
/**
* 隐患id
......@@ -19,7 +22,7 @@ public class DangerDto {
/**
* 隐患名称
*/
private String name;
private String dangerName;
/**
* 检查项记录id
......@@ -55,6 +58,7 @@ public class DangerDto {
/**
* 整改期限
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date reformLimitDate;
......@@ -136,4 +140,20 @@ public class DangerDto {
* 治理方式名称
*/
private String reformTypeName;
/**
* 隐患类型
*/
private String dangerType;
/**
* 隐患类型描述
*/
private String dangerTypeName;
/**
* 业务信息
*/
private Map bizInfo;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/InputItem.java
View file @ 37c3bbde
......@@ -225,7 +225,7 @@ public class InputItem extends BasicEntity {
* 检查类别IDS
*/
@Column(name = "item_type_classify_ids")
private Integer itemTypeClassifyIds;
private String itemTypeClassifyIds;
public Integer getItemStart() {
return itemStart;
......@@ -515,11 +515,11 @@ public class InputItem extends BasicEntity {
this.checkTypeId = checkTypeId;
}
public Integer getItemTypeClassifyIds() {
public String getItemTypeClassifyIds() {
return itemTypeClassifyIds;
}
public void setItemTypeClassifyIds(Integer itemTypeClassifyIds) {
public void setItemTypeClassifyIds(String 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
View file @ 37c3bbde
......@@ -171,6 +171,17 @@ public class Plan extends BasicEntity {
private String checkLevel;
/**
* 检查人单位id
*/
@Column(name="check_unit_id")
private String checkUnitId;
/**
* 检查人单位名称
*/
@Column(name="check_unit_name")
private String checkUnitName;
/**
* 备注
*/
private String remark;
......@@ -760,4 +771,20 @@ public class Plan extends BasicEntity {
public void setCheckLevel(String checkLevel) {
this.checkLevel = checkLevel;
}
public String getCheckUnitId() {
return checkUnitId;
}
public void setCheckUnitId(String checkUnitId) {
this.checkUnitId = checkUnitId;
}
public String getCheckUnitName() {
return checkUnitName;
}
public void setCheckUnitName(String checkUnitName) {
this.checkUnitName = checkUnitName;
}
}
\ 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
View file @ 37c3bbde
......@@ -56,7 +56,7 @@ public class PlanAuditLog extends BasicEntity {
@Column(name = "excute_user_name")
private String excuteUserName;
/**
* 执行状态（1：不通过；2：通过）
* 执行状态（1：不通过；0：通过）
*/
@Column(name = "excute_state")
private Integer excuteState;
......
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
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
/**
* 警情接警填报记录
......@@ -147,10 +149,13 @@ public class AlertCalledDto extends BaseDto {
@ApiModelProperty(value = "投诉描述/故障报修描述")
private String describe;
@ApiModelProperty(value = "图片")
private String images;
//
// @ApiModelProperty(value = "图片")
// private String images;
@ApiModelProperty(value = "设备id")
private Long equipmentId;
@ApiModelProperty(value = "现场照片")
private List<AttachmentDto> images;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertCalledQueryDto.java
View file @ 37c3bbde
......@@ -82,6 +82,8 @@ public class AlertCalledQueryDto {
@ApiModelProperty(value = "条数")
private Integer pageSize;
@ExcelIgnore
@ApiModelProperty(value = "ID")
private Long sequenceNbr;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertHandlerDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @author litw
* @date 2021-09-27.
*/
@Data
public class AlertHandlerDto {
@ApiModelProperty(value = "处置时间")
Map<String, Date> handlerTime;
@ApiModelProperty(value = "处置信息")
List<AlertHandlerInfoDto> alertHandlerInfoDto;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertHandlerInfoDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author litw
* @date 2021-09-27.
*/
@Data
public class AlertHandlerInfoDto {
@ApiModelProperty(value = "处置流程")
String abProcess;
@ApiModelProperty(value = "接警")
String acAnswerThePolice;
@ApiModelProperty(value = "上报")
String acReport;
@ApiModelProperty(value = "派遣/通知")
String adNotice;
@ApiModelProperty(value = "到达")
String aedArrive;
@ApiModelProperty(value = "完成")
String afeComplete;
@ApiModelProperty(value = "回访")
String agReturnVisit;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertPaperInfoDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author litw
* @date 2021-09-28.
*/
@Data
public class AlertPaperInfoDto {
@ApiModelProperty(value = "警情id")
private Long alertId;
@ApiModelProperty(value = "所属区域代码")
private String regionCode;
@ApiModelProperty(value = "电梯应急救援识别码")
private Integer rescueCode;
@ApiModelProperty(value = "警情类别code")
private String alarmTypeCode;
@ApiModelProperty(value = "所属区域")
private String area;
@ApiModelProperty(value = "地址")
private String address;
@ApiModelProperty(value = "报警时间")
private Date callTime;
@ApiModelProperty(value = "救援倒计时")
private String rescueTime;
@ApiModelProperty(value = "被困人数")
private String trappedNum;
@ApiModelProperty(value = "死亡人数")
private String dieNum;
@ApiModelProperty(value = "受伤人数")
private String injuredNum;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "停留时间")
private String stopTime;
@ApiModelProperty(value = "状态信息")
private String alertStatus;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/DispatchConsultFeedbackDto.java
View file @ 37c3bbde
......@@ -28,7 +28,7 @@ public class DispatchConsultFeedbackDto extends BaseDto {
private String emergencyCall;
@ApiModelProperty(value = "投诉反馈方式")
private String consultFeedbackType;
private String consultFeedbackCode;
@ApiModelProperty(value = "投诉反馈结果")
private String feedbackResult;
......
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
View file @ 37c3bbde
......@@ -112,4 +112,10 @@ public class DispatchPaperDto extends BaseDto {
@ApiModelProperty(value = "处置人")
private String dealUser;
@ApiModelProperty(value = "到达反馈方式")
private String arriveFeedbackType;
@ApiModelProperty(value = "到达反馈方式code")
private String arriveFeedbackCode;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/DispatchRepairFeedbackDto.java
View file @ 37c3bbde
......@@ -28,7 +28,7 @@ public class DispatchRepairFeedbackDto extends BaseDto {
private String emergencyCall;
@ApiModelProperty(value = "报修反馈方式")
private String fixFeedbackType;
private String fixFeedbackCode;
@ApiModelProperty(value = "报修反馈结果")
private String feedbackResult;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/DispatchTaskDto.java
View file @ 37c3bbde
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;
......@@ -75,4 +76,8 @@ public class DispatchTaskDto extends BaseDto {
@ApiModelProperty(value = "警情类型code")
private String alertCode;
@ApiModelProperty(value = "救援完成时间")
private Date saveTime;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorAlarmDto.java 0 → 100644
View file @ 37c3bbde
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-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElevatorAlarmDto", description="")
public class ElevatorAlarmDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "电梯注册码")
private String registerCode;
@ApiModelProperty(value = "原始故障编号")
private String faultId;
@ApiModelProperty(value = "故障发生时间")
private Date startDate;
@ApiModelProperty(value = "故障类型")
private String type;
@ApiModelProperty(value = "处置状态。0：处置完成。1：故障发生 2：发出通知 3：处置响应 4：处置到场 5：误报")
private Integer dealStatus;
@ApiModelProperty(value = "处置时间")
private Date dealDate;
@ApiModelProperty(value = "处置人")
private Integer dealPerson;
@ApiModelProperty(value = "现场确认是否困人。0：不困人，1：困人")
private Integer isTrap;
@ApiModelProperty(value = "是否自恢复 0：否1：是")
private Integer selfrepair;
@ApiModelProperty(value = "故障发生时的总接触器吸合或是断开。0：吸合，1：断开")
private Integer dealNote;
@ApiModelProperty(value = "是否自恢复 0：否1：是")
private Integer mainContactor;
@ApiModelProperty(value = "故障发生时的运行接触器吸合或是断开。0：吸合，1：断开")
private Integer runContactor;
@ApiModelProperty(value = "故障发生时的安全回路是否断开 0：正常，1：断开")
private Integer circuit;
@ApiModelProperty(value = "故障发生时的轿厢运行状态。1：停止，2：运行")
private Integer carStatus;
@ApiModelProperty(value = "故障发生时的方向。1：无方向 2：上行 3：下行")
private Integer direction;
@ApiModelProperty(value = "故障发生时的轿厢是否在门区。1：轿厢在门区 0：轿厢在非门区")
private Integer isZone;
@ApiModelProperty(value = "故障发生时的当前物理楼层")
private Integer floor;
@ApiModelProperty(value = "故障发生时的关门到位 1：关门到位，0：无关门到位信号")
private Integer doorStatus;
@ApiModelProperty(value = "故障发生时的上极限是否动作 0:否，1：是")
private Integer upLimit;
@ApiModelProperty(value = "故障发生时的下极限是否动作 0:否，1：是")
private Integer downLimit;
@ApiModelProperty(value = "故障发生时的轿厢报警按钮是否动作 0:否，1：是")
private Integer alarm;
@ApiModelProperty(value = "累计运行小时数，保留到小数点后两位")
private Double hours;
@ApiModelProperty(value = "累计运行次数")
private Integer runCount;
}
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
View file @ 37c3bbde
......@@ -16,4 +16,6 @@ public class ElevatorInfoDto {
ElevatorMaintenanceInfoDto elevatorMaintenanceInfoDto;
ElevatorTestInfoDto elevatorTestInfoDto;
boolean hasFocus;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorListDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 电梯列表dto
*/
@Data
@ApiModel(value = "ElevatorInfoDto", description = "ElevatorInfoDto")
public class ElevatorListDto {
@ApiModelProperty(value = "电梯id")
private String elevatorId;
@ApiModelProperty(value = "电梯地址")
private String elevatorAddress;
@ApiModelProperty(value = "电梯救援码")
private String rescueCode;
}
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 → amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorRelationDto.java
View file @ 37c3bbde
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 com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 关注电梯关系表
*
* @author litw
* @date 2021-09-22
* @author system_generator
* @date 2021-10-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="EnevatorRelationDto", description="关注电梯关系表")
public class EnevatorRelationDto extends BaseDto {
@ApiModel(value="ElevatorRelationDto", description="关注电梯关系表")
public class ElevatorRelationDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "openid个人识别id")
private Long openId;
private String openId;
@ApiModelProperty(value = "电梯id")
private String enevatorId;
private Long elevatorId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorStatusDto.java 0 → 100644
View file @ 37c3bbde
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-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElevatorStatusDto", description="")
public class ElevatorStatusDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "电梯注册码")
private String registerCode;
@ApiModelProperty(value = "原始状态编号")
private String statusId;
@ApiModelProperty(value = "是否在线。1：是，0：否")
private Integer isOnline;
@ApiModelProperty(value = "运行数据上传时间")
private Date uploadDate;
@ApiModelProperty(value = "总接触器吸合或是断开。0：吸合，1：断开")
private Integer mainContactor;
@ApiModelProperty(value = "运行接触器吸合或是断开。0：吸合，1：断开")
private Integer runContactor;
@ApiModelProperty(value = "安全回路是否断开，0：正常，1：断开")
private Integer circuit;
@ApiModelProperty(value = "当前电梯运行模式。1：停止服务 2：正常运行 3：检修 4：消防返回 5：消防员运行 6：应急电源运行 7：地震模式 8: 未知")
private Integer serviceModel;
@ApiModelProperty(value = "轿厢运行状态。1：停止，2：运行")
private Integer liftStatus;
@ApiModelProperty(value = "轿厢运行方向。1：无方向 2：上行 3：下行")
private Integer liftDirection;
@ApiModelProperty(value = "轿厢是否在门区。1：轿厢在门区 0：轿厢在非门区")
private Integer isZone;
@ApiModelProperty(value = "运行速度")
private Integer elevatorSpeed;
@ApiModelProperty(value = "当前物理楼层")
private Integer currFloor;
@ApiModelProperty(value = "关门到位 1：关门到位，0：无关门到位信号")
private Integer doorStatus;
@ApiModelProperty(value = "上极限是否动作 0:否，1：是")
private Integer upLimit;
@ApiModelProperty(value = "下极限是否动作 0:否，1：是")
private Integer downLimit;
@ApiModelProperty(value = "轿厢报警按钮是否动作 0:否，1：是")
private Integer alarm;
@ApiModelProperty(value = "轿厢内是否有人 0：无，1：有")
private Integer personFlag;
@ApiModelProperty(value = "累计运行小时数，保留到小数点后两位")
private Double hours;
@ApiModelProperty(value = "累计运行次数")
private Integer runCount;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorStatusHandleDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author litw
* @date 2021-09-29.
*/
@Data
public class ElevatorStatusHandleDto {
@ApiModelProperty(value = "当前电梯运行模式。1：停止服务 2：正常运行 3：检修 4：消防返回 5：消防员运行 6：应急电源运行 7：地震模式 8: 未知")
private String serviceModel;
@ApiModelProperty(value = "轿厢运行状态。1：停止，2：运行")
private String liftStatus;
@ApiModelProperty(value = "轿厢运行方向。1：无方向 2：上行 3：下行")
private String liftDirection;
@ApiModelProperty(value = "轿厢是否在门区。1：轿厢在门区 0：轿厢在非门区")
private String isZone;
@ApiModelProperty(value = "关门到位 1：关门到位，0：无关门到位信号")
private String doorStatus;
@ApiModelProperty(value = "轿厢内是否有人 0：无，1：有")
private String personFlag;
@ApiModelProperty(value = "当前物理楼层")
private Integer currFloor;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorWlInfoDto.java 0 → 100644
View file @ 37c3bbde
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-29.
*/
@Data
@ApiModel(value="ElevatorWlInfoDto", description="电梯物联信息")
public class ElevatorWlInfoDto {
/**
*
*/
private static final long serialVersionUID = 1L;
/**
* 电梯id
*/
@ApiModelProperty(value = "电梯id")
private Long sequenceNbr;
/**
* 注册编码
*/
@ApiModelProperty(value = "注册编码")
private String registerCode;
/**
* 电梯识别码
*/
@ApiModelProperty(value = "电梯识别码")
private Integer rescueCode;
/**
* 地址
*/
@ApiModelProperty(value = "地址")
private String address;
/**
* 发生时间
*/
@ApiModelProperty(value = "发生时间")
private Date happenTime ;
/**
* 故障类型
*/
@ApiModelProperty(value = "故障类型")
private String type ;
/**
* 物联服务提供商
*/
@ApiModelProperty(value = "物联服务提供商")
private String IotServiceProvider ;
/**
* 处置状态
*/
@ApiModelProperty(value = "处置状态")
private String dealStatus ;
/**
* 设备种类
*/
@ApiModelProperty(value = "设备种类")
private String category ;
/**
* 区域
*/
@ApiModelProperty(value = "区域")
private String area ;
/**
* 设备种类临时
*/
@ApiModelProperty(value = "设备种类临时")
private String categoryName ;
int page;
int size;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/EsElevatorDto.java 0 → 100644
View file @ 37c3bbde
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-26.
*/
@Data
@ApiModel(value="EsElevatorDto", description="ES电梯信息")
public class EsElevatorDto {
/**
*
*/
private static final long serialVersionUID = 1L;
/**
* 电梯id
*/
@ApiModelProperty(value = "电梯id")
private Long sequenceNbr;
/**
* 注册编码
*/
@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 Integer rescueCode;
/**
* 电梯经度
*/
@ApiModelProperty(value = "电梯经度")
private String longitude;
/**
* 电梯纬度
*/
@ApiModelProperty(value = "电梯纬度")
private String latitude;
/**
* 地址
*/
@ApiModelProperty(value = "地址")
private String address;
/**
* 警情类型code
*/
@ApiModelProperty(value = "警情类型")
private String alarmTypeCode;
/**
* 警情id
*/
@ApiModelProperty(value = "警情id")
private String alertId;
/**
* 是否当天
*/
@ApiModelProperty(value = "是否当天")
private Boolean isToday ;
/**
* 发生时间
*/
@ApiModelProperty(value = "发生时间")
private Date happenTime ;
/**
* 故障类型
*/
@ApiModelProperty(value = "故障类型")
private String type ;
/**
* 物联服务提供商
*/
@ApiModelProperty(value = "物联服务提供商")
private String IOTServiceProvider ;
/**
* 处置状态
*/
@ApiModelProperty(value = "处置状态")
private String status ;
/**
* 设备种类
*/
@ApiModelProperty(value = "设备种类")
private String category ;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/MainPersonDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 维保人员DTO
*/
@Data
@ApiModel(value="MainPersonDto", description="维保人员DTO")
public class MainPersonDto {
@ApiModelProperty(value = "维保人员名称")
private String name;
@ApiModelProperty(value = "维保人员电话")
private String telephone;
@ApiModelProperty(value = "维保单位id")
private String orgId;
@ApiModelProperty(value = "警情id")
private String alertId;
@ApiModelProperty(value = "维保单位名称")
private String orgName;
@ApiModelProperty(value = "维保单位地址")
private String orgAddress;
@ApiModelProperty(value = "使用单位地址")
private String unitAddress;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/SignatureDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 获取微信扫一扫签名信息
*/
@Data
@ApiModel(value="SignatureDto", description="获取微信扫一扫签名信息")
public class SignatureDto {
@ApiModelProperty(value = "时间戳")
private String timestamp;
@ApiModelProperty(value = "随机字符串")
private String noncestr;
@ApiModelProperty(value = "url地址")
private String url;
}
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
View file @ 37c3bbde
......@@ -25,4 +25,13 @@ public class WechatAccessDto {
@ApiModelProperty(value = "用户性别")
private String sex;
@ApiModelProperty(value = "token信息")
private String token;
@ApiModelProperty(value = "product")
private String product;
@ApiModelProperty(value = "appKey")
private String appKey;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatMessageDto.java 0 → 100644
View file @ 37c3bbde
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.Map;
/**
* 微信公众号模板dto
*/
@Data
@ApiModel(value="WechatMessageDto", description="微信公众号模板消息dto类")
public class WechatMessageDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "模板id")
private String templateId;
@ApiModelProperty(value = "跳转地址")
private String url;
@ApiModelProperty(value = "数据")
private Map<String, String> data;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatMyBusinessListDto.java 0 → 100644
View file @ 37c3bbde
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;
/**
* 微信公众号我的业务列表
*/
@Data
@ApiModel(value="WechatMyBusinessListDto", description="微信公众号业务列表dto类")
public class WechatMyBusinessListDto {
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;
@ApiModelProperty(value = "业务状态")
private String bussinessStatus;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatMyBussinessDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
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="WechatMyBussinessDto", description="微信公众号返回我的业务dto类")
public class WechatMyBussinessDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键ID")
protected Long sequenceNbr;
@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 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<AttachmentDto> fixImgs;
@ApiModelProperty(value = "故障描述")
private String errorContent;
@ApiModelProperty(value = "故障照片")
private List<AttachmentDto> 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<AttachmentDto> 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/WechatMyTaskDto.java
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -99,13 +100,13 @@ public class WechatMyTaskDto {
private String remark;
@ApiModelProperty(value = "现场照片")
private List<String> fixImgs;
private List<AttachmentDto> fixImgs;
@ApiModelProperty(value = "故障描述")
private String errorContent;
@ApiModelProperty(value = "故障照片")
private List<String> errorImgs;
private List<AttachmentDto> errorImgs;
@ApiModelProperty(value = "反馈时间")
private Date responseTime;
......@@ -120,7 +121,7 @@ public class WechatMyTaskDto {
private String feedbackRemark;
@ApiModelProperty(value = "反馈现场照片")
private List<String> feedBackImgs;
private List<AttachmentDto> feedBackImgs;
@ApiModelProperty(value = "处置时间")
private Date dealTime;
......
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
View file @ 37c3bbde
......@@ -29,4 +29,7 @@ public class WechatRelationDto {
@ApiModelProperty(value = "验证码")
private String code;
@ApiModelProperty(value = "amos 用户id")
private String userId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatTaskLatLonDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 微信公众号任务id 和经纬度接受dto类
*
* @author system_generator
* @date 2021-09-22
*/
@Data
@ApiModel(value="WechatTaskLatLonDto", description="微信公众号任务id 和经纬度接受dto类")
public class WechatTaskLatLonDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "任务id")
private Long taskId;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatUserFeedbackDto.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.dto;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* 微信公众号维修反馈dto 类
*/
@Data
@ApiModel(value="WechatUserFeedbackDto", description="微信公众号上报人反馈DTO")
public class WechatUserFeedbackDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "警情id")
private Long alertId;
@ApiModelProperty(value = "结果评价")
private String feedBackResult;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "现场照片")
private List<AttachmentDto> imgs;
}
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
View file @ 37c3bbde
......@@ -3,12 +3,14 @@ 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 com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
/**
* 警情接警填报记录
......@@ -225,8 +227,9 @@ public class AlertCalled extends BaseEntity {
@ApiModelProperty(value = "设备id")
private Long equipmentId;
@TableField("images")
@ApiModelProperty(value = "图片")
private String images;
@TableField(exist=false)
@ApiModelProperty(value = "现场照片")
private List<AttachmentDto> images;
}
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
View file @ 37c3bbde
......@@ -204,5 +204,18 @@ public class DispatchPaper extends BaseEntity {
@TableField("deal_user")
private String dealUser;
/**
* 到达反馈方式
*/
@TableField("arrive_feedback_type")
private String arriveFeedbackType;
/**
* 到达反馈方式code
*/
@TableField("arrive_feedback_code")
private String arriveFeedbackCode;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/DispatchTask.java
View file @ 37c3bbde
......@@ -124,4 +124,11 @@ public class DispatchTask extends BaseEntity {
@TableField("task_status")
private String taskStatus;
/**
* 救援完成时间
*/
@TableField("save_time")
private Date saveTime;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/ElevatorAlarm.java 0 → 100644
View file @ 37c3bbde
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-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_elevator_alarm")
public class ElevatorAlarm extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 电梯注册码
*/
@TableField("register_code")
private String registerCode;
/**
* 原始故障编号
*/
@TableField("fault_id")
private String faultId;
/**
* 故障发生时间
*/
@TableField("start_date")
private Date startDate;
/**
* 故障类型
*/
@TableField("type")
private String type;
/**
* 处置状态。0：处置完成。1：故障发生 2：发出通知 3：处置响应 4：处置到场 5：误报
*/
@TableField("deal_status")
private Integer dealStatus;
/**
* 处置时间
*/
@TableField("deal_date")
private Date dealDate;
/**
* 处置人
*/
@TableField("deal_person")
private Integer dealPerson;
/**
* 现场确认是否困人。0：不困人，1：困人
*/
@TableField("is_trap")
private Integer isTrap;
/**
* 是否自恢复 0：否1：是
*/
@TableField("selfrepair")
private Integer selfrepair;
/**
* 故障发生时的总接触器吸合或是断开。0：吸合，1：断开
*/
@TableField("deal_note")
private Integer dealNote;
/**
* 是否自恢复 0：否1：是
*/
@TableField("main_contactor")
private Integer mainContactor;
/**
* 故障发生时的运行接触器吸合或是断开。0：吸合，1：断开
*/
@TableField("run_contactor")
private Integer runContactor;
/**
* 故障发生时的安全回路是否断开 0：正常，1：断开
*/
@TableField("circuit")
private Integer circuit;
/**
* 故障发生时的轿厢运行状态。1：停止，2：运行
*/
@TableField("car_status")
private Integer carStatus;
/**
* 故障发生时的方向。1：无方向 2：上行 3：下行
*/
@TableField("direction")
private Integer direction;
/**
* 故障发生时的轿厢是否在门区。1：轿厢在门区 0：轿厢在非门区
*/
@TableField("is_zone")
private Integer isZone;
/**
* 故障发生时的当前物理楼层
*/
@TableField("floor")
private Integer floor;
/**
* 故障发生时的关门到位 1：关门到位，0：无关门到位信号
*/
@TableField("door_status")
private Integer doorStatus;
/**
* 故障发生时的上极限是否动作 0:否，1：是
*/
@TableField("up_limit")
private Integer upLimit;
/**
* 故障发生时的下极限是否动作 0:否，1：是
*/
@TableField("down_limit")
private Integer downLimit;
/**
* 故障发生时的轿厢报警按钮是否动作 0:否，1：是
*/
@TableField("alarm")
private Integer alarm;
/**
* 累计运行小时数，保留到小数点后两位
*/
@TableField("hours")
private Double hours;
/**
* 累计运行次数
*/
@TableField("run_count")
private Integer runCount;
}
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 → amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/ElevatorRelation.java
View file @ 37c3bbde
......@@ -2,19 +2,22 @@ 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
* @author system_generator
* @date 2021-10-08
*/
@Data
@Accessors(chain = true)
@TableName("tz_enevator_relation")
public class EnevatorRelation {
@TableName("tz_elevator_relation")
public class ElevatorRelation {
private static final long serialVersionUID = 1L;
......@@ -22,12 +25,12 @@ public class EnevatorRelation {
* openid个人识别id
*/
@TableField("open_id")
private Long openId;
private String openId;
/**
* 电梯id
*/
@TableField("enevator_id")
private String enevatorId;
@TableField("elevator_id")
private Long elevatorId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/ElevatorStatus.java 0 → 100644
View file @ 37c3bbde
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-28
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_elevator_status")
public class ElevatorStatus extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 电梯注册码
*/
@TableField("register_code")
private String registerCode;
/**
* 原始状态编号
*/
@TableField("status_id")
private String statusId;
/**
* 是否在线。1：是，0：否
*/
@TableField("is_online")
private Integer isOnline;
/**
* 运行数据上传时间
*/
@TableField("upload_date")
private Date uploadDate;
/**
* 总接触器吸合或是断开。0：吸合，1：断开
*/
@TableField("main_contactor")
private Integer mainContactor;
/**
* 运行接触器吸合或是断开。0：吸合，1：断开
*/
@TableField("run_contactor")
private Integer runContactor;
/**
* 安全回路是否断开，0：正常，1：断开
*/
@TableField("circuit")
private Integer circuit;
/**
* 当前电梯运行模式。1：停止服务 2：正常运行 3：检修 4：消防返回 5：消防员运行 6：应急电源运行 7：地震模式 8: 未知
*/
@TableField("service_model")
private Integer serviceModel;
/**
* 轿厢运行状态。1：停止，2：运行
*/
@TableField("lift_status")
private Integer liftStatus;
/**
* 轿厢运行方向。1：无方向 2：上行 3：下行
*/
@TableField("lift_direction")
private Integer liftDirection;
/**
* 轿厢是否在门区。1：轿厢在门区 0：轿厢在非门区
*/
@TableField("is_zone")
private Integer isZone;
/**
* 运行速度
*/
@TableField("elevator_speed")
private Integer elevatorSpeed;
/**
* 当前物理楼层
*/
@TableField("curr_floor")
private Integer currFloor;
/**
* 关门到位 1：关门到位，0：无关门到位信号
*/
@TableField("door_status")
private Integer doorStatus;
/**
* 上极限是否动作 0:否，1：是
*/
@TableField("up_limit")
private Integer upLimit;
/**
* 下极限是否动作 0:否，1：是
*/
@TableField("down_limit")
private Integer downLimit;
/**
* 轿厢报警按钮是否动作 0:否，1：是
*/
@TableField("alarm")
private Integer alarm;
/**
* 轿厢内是否有人 0：无，1：有
*/
@TableField("person_flag")
private Integer personFlag;
/**
* 累计运行小时数，保留到小数点后两位
*/
@TableField("hours")
private Double hours;
/**
* 累计运行次数
*/
@TableField("run_count")
private Integer runCount;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/EsElevator.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.entity;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
/**
* @author litw
* @date 2021-09-26.
*/
@Data
@Accessors(chain = true)
@Document(indexName = "elev", type = "tzsElevator", shards = 1, replicas = 0)
public class EsElevator {
/** 主键 */
@Id
private Long sequenceNbr;
/**
* 注册编码
*/
@Field(type = FieldType.Text)
private String registerCode;
/**
* 所属省
*/
@Field(type = FieldType.Text)
private String province;
/**
* 所属地市
*/
@Field(type = FieldType.Text)
private String city;
/**
* 所属区县
*/
@Field(type = FieldType.Text)
private String district;
/**
* 所属区域代码
*/
@Field(type = FieldType.Text, searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
private String regionCode;
/**
* 电梯识别码
*/
@Field(type = FieldType.Text)
private Integer rescueCode;
/**
* 电梯经度
*/
@Field(type = FieldType.Text)
private String longitude;
/**
* 电梯纬度
*/
@Field(type = FieldType.Text)
private String latitude;
/**
* 地址
*/
@Field(type = FieldType.Text, searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
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/entity/WechatRelation.java
View file @ 37c3bbde
......@@ -4,11 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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;
/**
* 微信公众号openid与电话号对应关系表
......@@ -38,4 +35,11 @@ public class WechatRelation {
@TableField("phone")
private String phone;
/**
* amos 用户id
*/
@TableField("user_id")
private String userId;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/AlertStageEnums.java
View file @ 37c3bbde
......@@ -19,9 +19,9 @@ public enum AlertStageEnums {
TSZX("962","TSZX", "投诉咨询"),
// 来源类型JQLYLX
DHBJ("963","233","电话报警"),
// 来源类型JQLYLX
GZHSB("972","APPJJ","移动端上报"),
DHBJ("963","96333","电话报警"),
WLJR("1014","WLJR","物联接入"),
APPJJ("1015","APPJJ","移动端上报"),
// 警情阶段 JQJD
JJ("964","JJ","接警"),
......
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftAlarmDealStatusEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯故障处置状态枚举
* </pre>
*
* @author gwb
* @version $Id: LiftServiceModelEnum.java, v 0.1 2021年9月29日 上午9:24:15 gwb Exp $
*/
public enum LiftAlarmDealStatusEnum{
DISPOSAL_COMPLETED(0,"处置完成"),
FAULT_OCCURRENCE(1,"故障发生"),
GIVE_NOTICE(2,"发出通知"),
DISPOSAL_RESPONSE(3,"处置响应"),
DISPOSAL_SITE(4,"处置到场"),
FALSE_ALARM(5,"误报");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftAlarmDealStatusEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftAlarmDealStatusEnum getEnum(Integer code)
{
for (LiftAlarmDealStatusEnum liftAlarmDealStatusEnum : LiftAlarmDealStatusEnum.values())
{
if (liftAlarmDealStatusEnum.getCode().equals(code))
{
return liftAlarmDealStatusEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftBitStatusEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯安全回路状态枚举
* </pre>
*
* @author gwb
* @version $Id: LiftCircuitStatusEnum.java, v 0.1 2021年9月29日 上午9:23:00 gwb Exp $
*/
public enum LiftBitStatusEnum{
NO(1,"否"),
YES (2,"是");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftBitStatusEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftBitStatusEnum getEnum(Integer code)
{
for (LiftBitStatusEnum liftBitStatusEnum : LiftBitStatusEnum.values())
{
if (liftBitStatusEnum.getCode().equals(code))
{
return liftBitStatusEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftCircuitStatusEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯安全回路状态枚举
* </pre>
*
* @author gwb
* @version $Id: LiftCircuitStatusEnum.java, v 0.1 2021年9月29日 上午9:23:00 gwb Exp $
*/
public enum LiftCircuitStatusEnum{
NORMAL(0,"正常"),
BREAK (1,"断开");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftCircuitStatusEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftCircuitStatusEnum getEnum(Integer code)
{
for (LiftCircuitStatusEnum liftCircuitStatusEnum : LiftCircuitStatusEnum.values())
{
if (liftCircuitStatusEnum.getCode().equals(code))
{
return liftCircuitStatusEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftContactorStatusEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯接触器状态枚举
* </pre>
*
* @author gwb
* @version $Id: LiftContactorStatusEnum.java, v 0.1 2021年9月29日 上午9:08:16 gwb Exp $
*/
public enum LiftContactorStatusEnum{
PULL(0,"吸合"),
BREAK (1,"断开");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftContactorStatusEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftContactorStatusEnum getEnum(Integer code)
{
for (LiftContactorStatusEnum liftContactorStatusEnum : LiftContactorStatusEnum.values())
{
if (liftContactorStatusEnum.getCode().equals(code))
{
return liftContactorStatusEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftDirectionEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯轿厢运行方向枚举
* </pre>
*
* @author gwb
* @version $Id: LiftDirectionEnum.java, v 0.1 2021年9月29日 上午9:33:40 gwb Exp $
*/
public enum LiftDirectionEnum{
No (1,"无方向"),
Up (2,"上行"),
Down (3,"下行");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftDirectionEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftDirectionEnum getEnum(Integer code)
{
for (LiftDirectionEnum liftDirectionEnum : LiftDirectionEnum.values())
{
if (liftDirectionEnum.getCode().equals(code))
{
return liftDirectionEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftDoorStatusEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯关门到位枚举
* </pre>
*
* @author gwb
* @version $Id: LiftDoorStatusEnum.java, v 0.1 2021年9月29日 上午9:39:52 gwb Exp $
*/
public enum LiftDoorStatusEnum{
NOT_CLOSED (1,"无关门到位信号"),
CLOSE (2,"关门到位");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftDoorStatusEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftDoorStatusEnum getEnum(Integer code)
{
for (LiftDoorStatusEnum liftDoorStatusEnum : LiftDoorStatusEnum.values())
{
if (liftDoorStatusEnum.getCode().equals(code))
{
return liftDoorStatusEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftIsOnlineEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯是否在线枚举
* </pre>
*
* @author gwb
* @version $Id: IsOnlineEnum.java, v 0.1 2021年9月29日 上午9:08:16 gwb Exp $
*/
public enum LiftIsOnlineEnum{
OFF(0,"离线"),
ON(1,"在线");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftIsOnlineEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftIsOnlineEnum getEnum(Integer code)
{
for (LiftIsOnlineEnum liftIsOnlineEnum : LiftIsOnlineEnum.values())
{
if (liftIsOnlineEnum.getCode().equals(code))
{
return liftIsOnlineEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftIszoneEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯轿厢是否在门区
* </pre>
*
* @author gwb
* @version $Id: LiftIszoneEnum.java, v 0.1 2021年9月29日 上午9:35:27 gwb Exp $
*/
public enum LiftIszoneEnum{
NON_DOOR_AREA(0,"轿厢在非门区"),
DOOR_AREA (1,"轿厢在门区");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftIszoneEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftIszoneEnum getEnum(Integer code)
{
for (LiftIszoneEnum liftIszoneEnum : LiftIszoneEnum.values())
{
if (liftIszoneEnum.getCode().equals(code))
{
return liftIszoneEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftServiceModelEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯运行模式枚举
* </pre>
*
* @author gwb
* @version $Id: LiftServiceModelEnum.java, v 0.1 2021年9月29日 上午9:24:15 gwb Exp $
*/
public enum LiftServiceModelEnum{
STOP_SERVICE(1,"停止服务"),
NORMAL_OPERATION(2,"正常运行"),
OVERHAUL(3,"检修"),
FIRE_RETURN(4,"消防返回"),
FIREFIGHTER_OPERATION(5,"消防员运行"),
EMERGENCY_POWER_OPERATION(6,"应急电源运行"),
SEISMIC_MODEL(7,"地震模式"),
UNKNOWN (8,"未知");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftServiceModelEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftServiceModelEnum getEnum(Integer code)
{
for (LiftServiceModelEnum liftCircuitStatusEnum : LiftServiceModelEnum.values())
{
if (liftCircuitStatusEnum.getCode().equals(code))
{
return liftCircuitStatusEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/LiftStatusEnum.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.enums;
/**
*
* <pre>
* 电梯运行状态枚举
* </pre>
*
* @author gwb
* @version $Id: LiftStatusEnum.java, v 0.1 2021年9月29日 上午9:32:16 gwb Exp $
*/
public enum LiftStatusEnum{
STOP (1,"停止"),
RUN (2,"运行");
/**
* 编码
*/
private Integer code;
/**
* 名称
*/
private String name;
// 构造方法
private LiftStatusEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
public Integer getCode() {
return code;
}
public String getName()
{
return name;
}
public static LiftStatusEnum getEnum(Integer code)
{
for (LiftStatusEnum liftStatusEnum : LiftStatusEnum.values())
{
if (liftStatusEnum.getCode().equals(code))
{
return liftStatusEnum;
}
}
return null;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/AlertCalledMapper.java
View file @ 37c3bbde
......@@ -4,6 +4,9 @@ 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.tzs.api.dto.AlertCalledQueryDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
import org.apache.ibatis.annotations.Param;
......@@ -62,10 +65,17 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
String alertStage,
String alertStatus,
String address);
Map<String, Integer> getTodayEmergencyCount();
Map<String, Integer> getTodayEmergencyCount(String regionCode);
Map<String, Integer> getImportantEventCount();
Map<String, Integer> getImportantEventDetail();
Map<String, Integer> getImportantEventCount(String regionCode);
List<Map<String, Object>> getImportantEventDetail(String type,String regionCode);
List<Map<String, Object>> getTodayEmergencyDetail(String rescueTotal,String rescueComplete, String regionCode);
WechatMyBussinessDto getBussinessInfoById(@Param("alertId") Long alertId);
List<WechatMyBusinessListDto> getBussinessListByPhonePager(@Param("phone") String phone, @Param("bussinessCode") String bussinessCode, @Param("current") Long current);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/DispatchTaskMapper.java
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.api.dto.MainPersonDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyTaskListDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
......@@ -22,4 +23,6 @@ public interface DispatchTaskMapper extends BaseMapper<DispatchTask> {
WechatMyTaskDto getTaskInfoByTaskId(@Param("taskId") Long taskId);
List<WechatMyTaskListDto> getTaskListByPhonePager(@Param("phone") String phone,@Param("typeCode") String typeCode, @Param("current") Long current);
List<MainPersonDto> todayTaskPerson();
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/EnevatorRelationMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ElevatorAlarmMapper.java
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.mapper;
import com.yeejoin.amos.boot.module.tzs.api.entity.EnevatorRelation;
import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorAlarm;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 关注电梯关系表 Mapper 接口
* Mapper 接口
*
* @author litw
* @date 2021-09-22
* @date 2021-09-28
*/
public interface EnevatorRelationMapper extends BaseMapper<EnevatorRelation> {
public interface ElevatorAlarmMapper extends BaseMapper<ElevatorAlarm> {
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ElevatorMapper.java
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorWlInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
import java.util.List;
/**
* Mapper 接口
*
......@@ -11,4 +14,17 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
*/
public interface ElevatorMapper extends BaseMapper<Elevator> {
List<ElevatorWlInfoDto> queryElevatorList(String address,
String registerCode,
Integer rescueCode,
String type,
Integer dealStatus,
Long sequenceNbr,
int current, int size);
List<ElevatorWlInfoDto> queryElevatorListDetails(
Long sequenceNbr
);
int queryElevatorListCount();
}
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/ElevatorRelationMapper.java 0 → 100644
View file @ 37c3bbde
package com.yeejoin.amos.boot.module.tzs.api.mapper;
import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorListDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.ElevatorRelation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 关注电梯关系表 Mapper 接口
*
* @author system_generator
* @date 2021-10-08
*/
public interface ElevatorRelationMapper extends BaseMapper<ElevatorRelation> {
/**
* 获取是否关注电梯
* @param openId
* @param elevatorId
* @return
*/
Integer hasFocusElevator(@Param("openId") String openId, @Param("elevatorId") Long elevatorId);
/**
* 关注电梯
* @param openId
* @param elevatorId
* @return
*/
Integer focusElevator(@Param("openId") String openId, @Param("elevatorId") String elevatorId);
/**
* 取消关注电梯
* @param openId
* @param elevatorId
* @return
*/
Integer cancelFocusElevator(@Param("openId") String openId, @Param("elevatorId") String elevatorId);
/**
* 获取用户关注电梯列表
* @param openId
* @return
*/
List<ElevatorListDto> getMyFocusElevator(@Param("openId") String openId);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment