巡检项导入导出模板下载

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

@@ -1152,7 +1152,7 @@ LEFT JOIN (
         cf.certificate_number certificatesNumber,
         ( SELECT field_value FROM cb_dynamic_form_instance dfi WHERE dfi.field_code = 'personNumber' AND dfi.instance_id = u.sequence_nbr ) AS employee_number,
         ( SELECT field_value FROM cb_dynamic_form_instance dfi WHERE dfi.field_code = 'telephone' AND dfi.instance_id = u.sequence_nbr ) AS telephone,
-        ( CASE WHEN cfp.post_qualification IS NULL or cfp.post_qualification == ''  THEN 0 ELSE 1 END ) AS is_certificate,
+        ( CASE WHEN cfp.post_qualification IS NULL or cfp.post_qualification = ''  THEN 0 ELSE 1 END ) AS is_certificate,
         IF
         (
         ( SELECT field_value FROM cb_dynamic_form_instance dfi WHERE dfi.field_code = 'peopleType' AND dfi.instance_id = u.sequence_nbr ) = 1601,

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/VideoImportantEquipmentVo.java

@@ -43,4 +43,10 @@ public class VideoImportantEquipmentVo {
 
     @ApiModelProperty(value = "详细地址")
     private String address;
+
+    @ApiModelProperty(value = "token")
+    private String token;
+
+    @ApiModelProperty(value = "视频格式")
+    private String videoType;
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/common/enums/PointCheckTypeEnum.java

+package com.yeejoin.amos.patrol.common.enums;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public enum PointCheckTypeEnum {
+	WGJC("外观检查", "WGJC"),
+	GNCS("功能测试", "GNCS"),
+	HJJC("环境检查", "HJJC"),
+	QT("其他", "QT");
+
+	private String name;
+
+	private String value;
+
+	private PointCheckTypeEnum(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+	
+
+	public static String getName(String value) {
+		for (PointCheckTypeEnum c : PointCheckTypeEnum.values()) {
+			if (c.getValue().equals(value)) {
+				return c.name;
+			}
+		}
+		return null;
+	}
+	
+	public static String getValue(String name) {
+		for (PointCheckTypeEnum c : PointCheckTypeEnum.values()) {
+			if (c.getName().equals(name)) {
+				return c.value;
+			}
+		}
+		return null;
+	}
+
+
+
+	public static PointCheckTypeEnum getEnum(String name) {
+		for (PointCheckTypeEnum c : PointCheckTypeEnum.values()) {
+			if (c.getName().equals(name)) {
+				return c;
+			}
+		}
+		return null;
+	}
+	
+	public static List<String> getEnumNameList() {
+		List<String> nameList = new ArrayList<String>();
+		for (PointCheckTypeEnum c: PointCheckTypeEnum.values()) {
+			nameList.add(c.getName());
+		}
+		return nameList;
+	}
+	
+
+
+	public String getName() {
+		return name;
+	}
+
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+
+	public String getValue() {
+		return value;
+	}
+
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/InputItemController.java

 package com.yeejoin.amos.patrol.business.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.patrol.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.IInputItemDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
+import com.yeejoin.amos.patrol.business.dto.InputItemDataDto;
+import com.yeejoin.amos.patrol.business.dto.InputItemDataJsonlDto;
+import com.yeejoin.amos.patrol.business.dto.InputItemExcelDto;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import com.yeejoin.amos.patrol.business.param.InputItemPageParam;
 import com.yeejoin.amos.patrol.business.param.InputItemParam;
@@ -26,6 +31,7 @@ import com.yeejoin.amos.patrol.dao.entity.InputItem;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import liquibase.pro.packaged.S;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -36,14 +42,13 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
 
 /**
  * 检查项
@@ -317,6 +322,92 @@ public class InputItemController extends AbstractBaseController {
 		}
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "导入检查项", notes = "导入检查项")
+	@PostMapping(value = "/importData", produces = "application/json;charset=UTF-8")
+	public void importData(@RequestPart("file") MultipartFile multipartFile) {
+		try {
+			List<InputItemExcelDto> inputItemExcelDtos = ExcelUtil.readFirstSheetExcel(multipartFile, InputItemExcelDto.class, 1);
+			for (InputItemExcelDto inputItemExcelDto : inputItemExcelDtos) {
+				if (StringUtils.isEmpty(inputItemExcelDto.getItemNo()) || StringUtils.isEmpty(inputItemExcelDto.getName()) || StringUtils.isEmpty(inputItemExcelDto.getInputClassify())){
+					throw new BadRequest("编号、名称、检查类型不能为空");
+				}
+				//组装参数 因部分字段数据数据库中用json统一保存 按类型组装为所需数据结构
+				if (inputItemExcelDto.getItemType().equals("选择")  && StringUtil.isNotEmpty(inputItemExcelDto.getDataJson())){
+					List<InputItemDataDto> itemDataDtos = new ArrayList<>();
+					if (inputItemExcelDto.getDataJson().contains("|")) {
+						String[] datas = inputItemExcelDto.getDataJson().split("\\|");
+						List<String> list = Arrays.asList(datas);
+						list.forEach(e->{
+							String[] data = e.split(",");
+							InputItemDataDto inputItemDataDto = new InputItemDataDto(data[0],data[1],data[2],data[3]);
+							itemDataDtos.add(inputItemDataDto);
+						});
+					}else {
+						String[] data = inputItemExcelDto.getDataJson().split(",");
+						InputItemDataDto inputItemDataDto = new InputItemDataDto(data[0],data[1],data[2],data[3]);
+						itemDataDtos.add(inputItemDataDto);
+					}
+					inputItemExcelDto.setDataJson(JSON.toJSONString(itemDataDtos));
+				}else if(inputItemExcelDto.getItemType().equals("数字")  && StringUtil.isNotEmpty(inputItemExcelDto.getDataJson())){
+					InputItemDataJsonlDto inputItemDataJsonlDto = new InputItemDataJsonlDto();
+					BeanUtils.copyProperties(inputItemExcelDto,inputItemDataJsonlDto);
+					inputItemExcelDto.setDataJson(JSON.toJSONString(inputItemExcelDto));
+				}
+				//转化为新增接口所需参数
+				InputItemParam inputItemParam = new InputItemParam();
+				BeanUtils.copyProperties(inputItemExcelDto,inputItemParam);
+				//新增接口
+				this.addNewItemNew(inputItemParam);
+			}
+		} catch (Exception e) {
+			throw new BadRequest(e.getMessage());
+		}
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "导出检查项", notes = "导出检查项")
+	@RequestMapping(value = "/exportData", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+	public void exportData(HttpServletResponse response) {
+		InputItemPageParam  criterias = new InputItemPageParam();
+		List<InputItemExcelDto> content = inputItemMapper.getInputItemInfoExcelNew(criterias);
+		//此处对数据做统一处理 拼接为易读内容
+		for (InputItemExcelDto inputItemExcelDto : content) {
+			String text = "";
+			if (inputItemExcelDto.getItemType().equals("选择")&& !inputItemExcelDto.getDataJson().equals("[]")) {
+				List<Map> maps = JSONObject.parseArray(inputItemExcelDto.getDataJson(), Map.class);
+				for (int i = 0; i< maps.size(); i++) {
+					Map jsonObject = maps.get(i);
+					text = text + jsonObject.get("name")+","+jsonObject.get("score")+","+jsonObject.get("isOk")+","+jsonObject.get("isChecked");
+					if(i < (maps.size()-1) ){
+						text = text+"|";
+						inputItemExcelDto.setDataJson(text);
+					}else {
+						inputItemExcelDto.setDataJson(text);
+					}
+				}
+			}
+			if (inputItemExcelDto.getItemType().equals("数字") || inputItemExcelDto.getItemType().equals("文本")) {
+				//此处为避免大量set方法 将data_json字段中的数据转为对象组装
+				InputItemDataJsonlDto inputItemDataJsonlDto = JSONObject.parseObject(inputItemExcelDto.getDataJson(), InputItemDataJsonlDto.class);
+				BeanUtils.copyProperties(inputItemDataJsonlDto,inputItemExcelDto);
+				inputItemExcelDto.setDataJson(null);
+			}
+		}
+
+		ExcelUtil.createTemplate(response,"检查项","检查项",content,InputItemExcelDto.class,null,true);
+
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(value = "模板下载", notes = "模板下载")
+	@RequestMapping(value = "/downTemplate", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+	public void downTemplate(HttpServletResponse response) {
+		ExcelUtil.createTemplate(response,"检查项模板","检查项",null,InputItemExcelDto.class,null,true);
+	}
+
+
+
 	/**
 	 * 删除检查项
 	 *
@@ -557,7 +648,6 @@ public class InputItemController extends AbstractBaseController {
 			}
 		}
 
-
 		if (CollectionUtils.isNotEmpty(inputItemDao.findByItemNo(param.getItemNo(), param.getId() != 0 ? String.valueOf(param.getId()) : null))) {
 			throw new BadRequest("该编号已存在,请重新输入");
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/InputItemMapper.java

 package com.yeejoin.amos.patrol.business.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.patrol.business.dto.InputItemExcelDto;
 import com.yeejoin.amos.patrol.business.param.InputItemPageParam;
 import com.yeejoin.amos.patrol.business.vo.InputItemVo;
 import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
@@ -30,6 +31,8 @@ public interface InputItemMapper extends BaseMapper<InputItem> {
 
     public List<InputItemVo> getInputItemInfoNew(InputItemPageParam param);
 
+    public List<InputItemExcelDto> getInputItemInfoExcelNew(InputItemPageParam param);
+
     Map<Long, Long> getAllCountInfo();
 
     Map<String,String> getEquipParentCode(String code);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/ExcelDto.java

+package com.yeejoin.amos.patrol.business.dto;
+
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
+
+@Data
+public class ExcelDto {
+	@ApiModelProperty(value = "文件名称")
+    private String fileName;
+    @ApiModelProperty(value = "sheet页名称")
+    private String sheetName;
+    @ApiModelProperty(value = "类包全路径")
+    private String classUrl;
+    @ApiModelProperty(value = "导出类型 来源于ExcelEnums常量")
+    private String type;
+
+    public ExcelDto(String fileName, String sheetName, String classUrl, String type) {
+        super();
+        this.fileName = fileName;
+        this.sheetName = sheetName;
+        this.classUrl = classUrl;
+        this.type = type;
+    }
+
+    public ExcelDto(String fileName, String sheetName, String type) {
+        this.fileName = fileName;
+        this.sheetName = sheetName;
+        this.type = type;
+    }
+
+    public ExcelDto() {
+
+    }
+
+    public String getFileName() {
+        return StringUtils.isEmpty(fileName) ? DateUtils.convertDateToString(new Date(), "yyyyMMddHHmmss") : fileName;
+    }
+
+    public String getSheetName() {
+        return StringUtils.isEmpty(sheetName) ? "Sheet1" : sheetName;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/InputItemDataDto.java

+package com.yeejoin.amos.patrol.business.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(value = "InputItemDataDto", description = "检查项文本JSON数据")
+@Data
+public class InputItemDataDto extends BaseDto {
+   private  String name;
+   private  String score;
+   private  String isOk;
+   private  String isChecked;
+
+    public InputItemDataDto(String name, String score, String isOk, String isChecked) {
+        this.name = name;
+        this.score = score;
+        this.isOk = isOk;
+        this.isChecked = isChecked;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/InputItemDataJsonlDto.java

+package com.yeejoin.amos.patrol.business.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(value = "InputItemDataJsonlDto", description = "检查项JSON数据")
+@Data
+public class InputItemDataJsonlDto extends BaseDto {
+
+    @ApiModelProperty(value = "合格评分数")
+    private Integer okScore;
+
+    @ApiModelProperty(value = "不合格评分数")
+    private Integer noScore;
+
+    @ApiModelProperty(value = "合格判断方法")
+    private String checkType;
+
+    @ApiModelProperty(value = "有效值上限")
+    private Integer validUp;
+
+    @ApiModelProperty(value = "有效值下限")
+    private Integer validDown;
+
+    @ApiModelProperty(value = "合格值上限")
+    private Integer okUp;
+
+    @ApiModelProperty(value = "合格值下限")
+    private Integer okDown;
+
+    @ApiModelProperty(value = "强制校验，输入值不能大于有效值上限")
+    private String checkValidUp;
+
+    @ApiModelProperty(value = "强制校验，输入值不能小于有效值下限")
+    private String checkValidDown;
+
+    @ApiModelProperty(value = "合格判断，输入值大于合格值上限时为不合格")
+    private String checkOkUp;
+
+    @ApiModelProperty(value = "合格判断，输入值小于合格值上限时为不合格")
+    private String checkOkDown;
+
+    @ApiModelProperty(value = "小数点后位数")
+    private Integer precision;
+
+    public String getCheckValidUp() {
+        if (checkValidUp != null) {
+            return  checkValidUp.equals("true") ? "是":"否";
+        }
+
+        return checkValidUp;
+    }
+
+    public String getCheckValidDown() {
+        if (checkValidDown != null) {
+            return  checkValidDown.equals("true") ? "是":"否";
+        }
+        return checkValidDown;
+    }
+
+    public String getCheckOkUp() {
+        if (checkOkUp != null) {
+            return  checkOkUp.equals("true") ? "是":"否";
+        }
+        return checkOkUp;
+    }
+
+    public String getCheckOkDown() {
+        if (checkOkDown != null) {
+            return  checkOkDown.equals("true") ? "是":"否";
+        }
+        return checkOkDown;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dto/InputItemExcelDto.java

+package com.yeejoin.amos.patrol.business.dto;
+
+import cn.jiguang.common.utils.StringUtils;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.biz.common.excel.ExplicitConstraint;
+import com.yeejoin.amos.patrol.common.enums.PointCheckTypeEnum;
+import com.yeejoin.amos.patrol.common.enums.PointLevelEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(value = "InputItemExcelDto", description = "检查项")
+@Data
+public class InputItemExcelDto extends BaseDto {
+
+    @ExcelProperty(value = "编号", index = 0)
+    @ApiModelProperty(value = "检查项编号")
+    private String itemNo;
+
+    @ExcelProperty(value = "名称", index = 1)
+    @ApiModelProperty(value = "检查项名称")
+    private String name;
+
+    @ExplicitConstraint(indexNum=2,source = {"选择","数字","文本"})
+    @ExcelProperty(value = "检查项类型", index = 2)
+    @ApiModelProperty(value = "检查项类型")
+    private String itemType;
+
+    @ExplicitConstraint(indexNum=3,source = {"一级","二级","三级","四级","五级"})
+    @ExcelProperty(value = "检查项等级", index = 3)
+    @ApiModelProperty(value = "检查项等级")
+    private String level;
+
+    @ExcelProperty(value = "检查方法", index = 4)
+    @ApiModelProperty(value = "检查方法")
+    private String checkMethod;
+
+    @ExcelProperty(value = "评分项(选择)", index = 5)
+    @ApiModelProperty(value = "评分项")
+    private String dataJson;
+    @ExcelProperty(value = "消防装备类型", index = 6)
+    @ApiModelProperty(value = "消防装备类型")
+    private String equipmentType;
+
+    @ExcelProperty(value = "消防设施类型", index = 7)
+    @ApiModelProperty(value = "消防设施类型")
+    private String facilitiesType;
+
+    @ExplicitConstraint(indexNum=8,source = {"是","否"})
+    @ExcelProperty(value = "是否重点类型", index = 8)
+    @ApiModelProperty(value = "重点类型")
+    private String keyPartsType = "1";
+
+    @ExplicitConstraint(indexNum=9,source = {"是","否"})
+    @ExcelProperty(value = "是否自定义类型", index = 9)
+    @ApiModelProperty(value = "自定义类型")
+    private String customType = "1";
+
+    @ExplicitConstraint(indexNum=10,source = {"外观检查","功能测试","环境检查","其他"})
+    @ExcelProperty(value = "检查类型", index =10)
+    @ApiModelProperty(value = "检查类型")
+    private String inputClassify;
+
+    @ExcelProperty(value = "拍照项(文本/选择)", index = 14)
+    @ApiModelProperty(value = "拍照项")
+    private Object pictureJson;
+
+    @ExplicitConstraint(indexNum=11,source = {"是","否"})
+    @ExcelProperty(value = "是否必填", index = 11)
+    @ApiModelProperty(value = "是否必填")
+    private String isMust = "0";
+
+    @ExplicitConstraint(indexNum=12,source = {"是","否"})
+    @ExcelProperty(value = "是否评分", index = 12)
+    @ApiModelProperty(value = "是否评分")
+    private String isScore = "0";
+
+    @ExplicitConstraint(indexNum=13,source = {"始终合格","始终不合格","无内容合格","有内容合格"})
+    @ExcelProperty(value = "合格判断方法(文本)", index = 13)
+    @ApiModelProperty(value = "合格判断方法")
+    private String checkType = "始终合格";
+
+    @ExcelProperty(value = "默认输入值(文本/数字)", index = 17)
+    @ApiModelProperty(value = "默认输入值")
+    private String defaultValue;
+
+    @ExcelProperty(value = "合格评分数(文本/数字)", index = 16)
+    @ApiModelProperty(value = "合格评分数")
+    private Integer okScore;
+
+    @ExcelProperty(value = "不合格评分数(文本/数字)", index = 15)
+    @ApiModelProperty(value = "不合格评分数")
+    private Integer noScore;
+
+    @ExcelProperty(value = "输入值单位(数字)", index = 27)
+    @ApiModelProperty(value = "输入值单位")
+    private String unit;
+
+    @ExcelProperty(value = "有效值上限(数字)", index = 18)
+    @ApiModelProperty(value = "有效值上限")
+    private Integer validUp;
+
+    @ExcelProperty(value = "有效值下限(数字)", index = 19)
+    @ApiModelProperty(value = "有效值下限")
+    private Integer validDown;
+
+    @ExcelProperty(value = "合格值上限(数字)", index = 20)
+    @ApiModelProperty(value = "合格值上限")
+    private Integer okUp;
+
+    @ExcelProperty(value = "合格值下限(数字)", index = 21)
+    @ApiModelProperty(value = "合格值下限")
+    private Integer okDown;
+
+    @ExcelProperty(value = "强制校验，输入值不能大于有效值上限(数字)", index = 22)
+    @ApiModelProperty(value = "强制校验，输入值不能大于有效值上限")
+    private String checkValidUp = "false";
+
+    @ExcelProperty(value = "强制校验，输入值不能小于有效值下限(数字)", index = 23)
+    @ApiModelProperty(value = "强制校验，输入值不能小于有效值下限")
+    private String checkValidDown = "false";
+
+    @ExcelProperty(value = "合格判断，输入值大于合格值上限时为不合格(数字)", index = 24)
+    @ApiModelProperty(value = "合格判断，输入值大于合格值上限时为不合格")
+    private String checkOkUp = "false";
+
+    @ExcelProperty(value = "合格判断，输入值小于合格值上限时为不合格(数字)", index = 25)
+    @ApiModelProperty(value = "合格判断，输入值小于合格值上限时为不合格")
+    private String checkOkDown = "false";
+
+    @ExcelProperty(value = "小数点后位数(数字)", index = 26)
+    @ApiModelProperty(value = "小数点后位数")
+    private Integer precision;
+
+    @ExcelIgnore
+    private long id;
+    @ExcelIgnore
+    private long catalogId;
+
+    @ExcelIgnore
+    private String inputJson;
+
+    @ExcelIgnore
+    private String isMultiline;
+
+    @ExcelIgnore
+    private int orderNo;
+
+    @ExcelIgnore
+    private String orgCode;
+
+    @ExcelIgnore
+    private String remark;
+
+    @ExcelIgnore
+    private String riskDesc;
+
+    /**
+     * 新加字段
+     */
+    //单位code
+    @ExcelIgnore
+    private String bizOrgCode;
+    //单位名称
+    @ExcelIgnore
+    private String bizOrgName;
+
+    public Integer getValidUp() {
+        return validUp;
+    }
+
+    public void setValidUp(Integer validUp) {
+        this.validUp = validUp;
+    }
+
+    public Integer getValidDown() {
+        return validDown;
+    }
+
+    public void setValidDown(Integer validDown) {
+        this.validDown = validDown;
+    }
+
+    public Integer getOkUp() {
+        return okUp;
+    }
+
+    public void setOkUp(Integer okUp) {
+        this.okUp = okUp;
+    }
+
+    public Integer getOkDown() {
+        return okDown;
+    }
+
+    public void setOkDown(Integer okDown) {
+        this.okDown = okDown;
+    }
+
+    public String getCheckValidUp() {
+        return checkValidUp;
+    }
+
+    public void setCheckValidUp(String checkValidUp) {
+        this.checkValidUp = checkValidUp;
+    }
+
+    public String getCheckValidDown() {
+        return checkValidDown;
+    }
+
+    public void setCheckValidDown(String checkValidDown) {
+        this.checkValidDown = checkValidDown;
+    }
+
+    public String getCheckOkUp() {
+        return checkOkUp;
+    }
+
+    public void setCheckOkUp(String checkOkUp) {
+        this.checkOkUp = checkOkUp;
+    }
+
+    public String getCheckOkDown() {
+        return checkOkDown;
+    }
+
+    public void setCheckOkDown(String checkOkDown) {
+        this.checkOkDown = checkOkDown;
+    }
+
+    public Integer getPrecision() {
+        return precision;
+    }
+
+    public void setPrecision(Integer precision) {
+        this.precision = precision;
+    }
+
+    public Integer getOkScore() {
+        return okScore;
+    }
+
+    public void setOkScore(Integer okScore) {
+        this.okScore = okScore;
+    }
+
+    public Integer getNoScore() {
+        return noScore;
+    }
+
+    public void setNoScore(Integer noScore) {
+        this.noScore = noScore;
+    }
+
+    public String getCheckType() {
+        return checkType;
+    }
+
+    public void setCheckType(String checkType) {
+        this.checkType = checkType;
+    }
+
+
+    public String getBizOrgCode() {
+        return bizOrgCode;
+    }
+
+    public void setBizOrgCode(String bizOrgCode) {
+        this.bizOrgCode = bizOrgCode;
+    }
+
+    public String getBizOrgName() {
+        return bizOrgName;
+    }
+
+    public void setBizOrgName(String bizOrgName) {
+        this.bizOrgName = bizOrgName;
+    }
+
+    public String getEquipmentType() {
+        return equipmentType;
+    }
+
+    public void setEquipmentType(String equipmentType) {
+        this.equipmentType = equipmentType;
+    }
+
+    public String getFacilitiesType() {
+        return facilitiesType;
+    }
+
+    public void setFacilitiesType(String facilitiesType) {
+        this.facilitiesType = facilitiesType;
+    }
+
+    public String getKeyPartsType() {
+        return keyPartsType.equals("是")?"0":"1";
+    }
+
+    public void setKeyPartsType(String keyPartsType) {
+        this.keyPartsType = StringUtils.isEmpty(keyPartsType) ? "1":keyPartsType;
+    }
+
+
+    public String getCustomType() {
+        return customType.equals("是")?"0":"1";
+    }
+
+    public void setCustomType(String customType) {
+        this.customType = StringUtils.isEmpty(customType) ? "1":customType;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getCheckMethod() {
+        return checkMethod;
+    }
+
+    public void setCheckMethod(String checkMethod) {
+        this.checkMethod = checkMethod;
+    }
+
+    public String getInputClassify() {
+        return inputClassify == null?null:PointCheckTypeEnum.getValue(inputClassify);
+    }
+
+    public void setInputClassify(String inputClassify) {
+        this.inputClassify = inputClassify;
+    }
+
+    public String getItemNo() {
+        return itemNo;
+    }
+
+    public void setItemNo(String itemNo) {
+        this.itemNo = itemNo;
+    }
+
+    public String getLevel() {
+        return  level == null? null :String.valueOf(PointLevelEnum.getValue(level));
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public long getCatalogId() {
+        return catalogId;
+    }
+
+    public void setCatalogId(long catalogId) {
+        this.catalogId = catalogId;
+    }
+
+    public String getDataJson() {
+        return dataJson;
+    }
+
+    public void setDataJson(String dataJson) {
+        this.dataJson = dataJson;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getInputJson() {
+        return inputJson;
+    }
+
+    public void setInputJson(String inputJson) {
+        this.inputJson = inputJson;
+    }
+
+    public String getIsMultiline() {
+        return isMultiline;
+    }
+
+    public void setIsMultiline(String isMultiline) {
+        this.isMultiline = isMultiline;
+    }
+
+    public String getIsMust() {
+        return isMust;
+    }
+
+    public void setIsMust(String isMust) {
+        this.isMust = isMust;
+    }
+
+    public String getIsScore() {
+        return isScore;
+    }
+
+    public void setIsScore(String isScore) {
+        this.isScore = isScore;
+    }
+
+    public String getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(String itemType) {
+        this.itemType = itemType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(int orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public Object getPictureJson() {
+        return pictureJson;
+    }
+
+    public void setPictureJson(Object pictureJson) {
+        this.pictureJson = pictureJson;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public InputItemExcelDto() {
+        super();
+    }
+
+    public String getRiskDesc() {
+        return riskDesc;
+    }
+
+    public void setRiskDesc(String riskDesc) {
+        this.riskDesc = riskDesc;
+    }
+
+
+}

amos-boot-system-equip/src/main/resources/mapper/VideoImportantEquipmentMapper.xml

@@ -31,7 +31,9 @@
         v.type,
         v.url,
         v.img,
-        v.address
+        v.address,
+        v.video_type as videoType,
+        v.token as token
         FROM
         wl_video v
         <where>

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -65,6 +65,8 @@
 		<result property="facilitiesType" column="facilities_type" />
 		<result property="equipmentType" column="equipment_type" />
     </resultMap>
+
+
 	<!--统计 -->
 	<select id="countInputItemInfoData" resultType="long">
 		SELECT
@@ -386,6 +388,104 @@
 		</choose>
 	</select>
 
+	<select id="getInputItemInfoExcelNew" resultType="com.yeejoin.amos.patrol.business.dto.InputItemExcelDto">
+		SELECT
+		a.id,
+		a.name,
+		a.item_no,
+		a.item_type,
+		a.is_must,
+		a.default_value,
+		a.is_score,
+		b.name as catalog_name,
+		a.remark,
+		a.input_classify,
+		a.check_method,
+		(CASE a.equipment_type
+		WHEN  a.equipment_type is not null and  a.equipment_type = '-1'
+		THEN '通用消防装备'
+		ELSE
+		(select name from  wl_equipment_category where code = a.equipment_type AND industry_code = 2)
+		END)   as  equipment_type,
+		(CASE a.facilities_type
+		WHEN  a.facilities_type is not null and  a.facilities_type = '-1'
+		THEN '通用消防设施'
+		ELSE (select name from  wl_equipment_category where code = a.facilities_type AND industry_code = 2)
+		END)   as  facilities_type,
+		(CASE a.level
+		WHEN 1 THEN
+		'1级'
+		WHEN 2 THEN
+		'2级'
+		WHEN 3 THEN
+		'3级'
+		WHEN 4 THEN
+		'4级'
+		ELSE
+		'5级'
+		END )AS level,
+		(CASE a.key_parts_type
+		WHEN 0 THEN
+		'是'
+		WHEN 1 THEN
+		'否'
+		END )AS keyPartsType,
+		(CASE a.custom_type
+		WHEN 0 THEN
+		'是'
+		WHEN 1 THEN
+		'否'
+		END )AS customType,
+		a.risk_desc,
+		a.data_json
+		from
+		p_input_item a left join p_catalog_tree b on a.catalog_id = b.id
+		where a.is_delete = '0'
+		and a.input_type!='1'
+		<if test="name!=null"> and a.name like concat(concat("%",#{name}),"%")</if>
+		<if test="itemNo!=null"> and a.item_no like concat(concat("%",#{itemNo}),"%")</if>
+		<if test="isScore!=null"> and a.is_Score = #{isScore}</if>
+		<if test="itemType!=null"> and a.item_Type = #{itemType} </if>
+		<if test="orgCode!=null"> and a.org_Code = #{orgCode}</if>
+		<if test="catalogIds !=null">
+			and a.catalog_id in <foreach collection="catalogIds" item="catalogId" index="index" open="(" separator="," close=")" >#{catalogId}</foreach>
+		</if>
+		<if test="bizOrgCode!=null and bizOrgCode!=''">
+			and a.biz_org_code LIKE CONCAT (#{bizOrgCode},'%')
+		</if>
+		<if test="treeId != null and treeId != '' and treeId == '-1'">
+			and a.facilities_type is not null
+		</if>
+		<if test="treeId != null and treeId != '' and treeId == '-2'">
+			and a.equipment_type is not null
+		</if>
+		<if test="treeId != null and treeId != '' and treeId == '-4'">
+			and a.key_parts_type is not null
+		</if>
+		<if test="treeId != null and treeId != '' and treeId == '-5'">
+			and a.custom_type is not null
+		</if>
+		<if test="subCode!=null and subCode!='' and subCode!=' ' and
+		 treeId != null and treeId != '' and treeId != '-3' and treeId != '-1' and
+		 treeId != '-2' and treeId != '-4' and treeId != '-5' and treeId.contains('@'.toString())">
+			and LEFT (a.facilities_type, #{inhierarchy}) = #{subCode}
+		</if>
+		<if test="subCode!=null and subCode!='' and subCode!=' ' and
+		 treeId != null and treeId != '' and treeId != '-3' and treeId != '-1' and
+		 treeId != '-2' and treeId != '-4' and treeId != '-5' and !treeId.contains('@'.toString())">
+			and LEFT (a.equipment_type, #{inhierarchy}) = #{subCode}
+		</if>
+		<choose>
+			<when test="level == '-0' ">and a.level is null</when>
+			<when test="level!=null and level != '-0'">and a.level = #{level}</when>
+		</choose>
+		order by a.id desc
+		<choose>
+			<when test="pageSize==-1"></when>
+			<when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
+		</choose>
+	</select>
+
 <select id="getEquipParentCode" resultType="map">
 	select * from  wl_equipment_category where code = #{code} and industry_code = '2'
 </select>