item：重点设备分页及启动预案接口新增

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/common/constant/Constant.java

+package com.yeejoin.amos.fas.common.constant;
+
+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
+
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/util/CommonResponseUtil2.java

+package com.yeejoin.amos.fas.core.util;
+
+import com.yeejoin.amos.fas.common.constant.Constant;
+import org.springframework.http.HttpStatus;
+
+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;
+    }
+}

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/core/util/ResponseModel.java

+package com.yeejoin.amos.fas.core.util;
+
+import java.io.Serializable;
+
+/**
+ * @ProjectName: YeeAmosFireAutoSysRoot
+ * @Package: com.yeejoin.amos.fas.core.util
+ * @ClassName: ResponseModel
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2021/1/7 15:00
+ * @Version: 1.0
+ */
+public class ResponseModel<T> implements Serializable {
+    private static final long serialVersionUID = -1241360949457314497L;
+    private int status;
+    private T result;
+    private String traceId;
+    private String devMessage = "";
+    private String message = "";
+    private String path;
+
+    public ResponseModel() {
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getPath() {
+        return this.path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public String getDevMessage() {
+        return this.devMessage;
+    }
+
+    public void setDevMessage(String devMessage) {
+        this.devMessage = devMessage;
+    }
+
+    public String getTraceId() {
+        return this.traceId;
+    }
+
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
+    public int getStatus() {
+        return this.status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public T getResult() {
+        return this.result;
+    }
+
+    public void setResult(T result) {
+        this.result = result;
+    }
+
+    public String toString() {
+        return "ResponseModel [status=" + this.status + ", result=" + this.result + ", traceId=" + this.traceId + ", message=" + this.devMessage + "]";
+    }
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/dto/EquipmentDTO.java

+package com.yeejoin.amos.fas.dao.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @ProjectName: YeeAmosFireAutoSysRoot
+ * @Package: com.yeejoin.amos.fas.dao.dto
+ * @ClassName: EquipmentDTO
+ * @Author: Jianqiang Gao
+ * @Description:
+ * @Date: 2021/1/7 10:23
+ * @Version: 1.0
+ */
+@Data
+@ApiModel(value = "重点设备DTO")
+public class EquipmentDTO {
+
+    @ApiModelProperty(value = "设备ID")
+    private Long id;
+
+    @ApiModelProperty(value = "设备名称")
+    private String name;
+
+    @ApiModelProperty(value = "状态：1-启动，0-未启动")
+    private Integer status;
+
+    @ApiModelProperty(value = "重点设备类型")
+    private String type;
+
+}
\ No newline at end of file

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/Equipment.java

@@ -120,6 +120,8 @@ public class Equipment extends BasicEntity  {
 	@Lob
 	private String ue4Rotation;
 
+	private Integer status;
+
 	public Equipment() {
 	}
 
@@ -245,4 +247,12 @@ public class Equipment extends BasicEntity  {
 	public void setUe4Rotation(String ue4Rotation) {
 		this.ue4Rotation = ue4Rotation;
 	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
 }
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/CommonController.java

@@ -10,7 +10,6 @@ import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
-import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EquipmentController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.yeejoin.amos.fas.core.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.util.CollectionUtils;
@@ -22,10 +23,6 @@ import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
-import com.yeejoin.amos.fas.core.util.CommonResponse;
-import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
-import com.yeejoin.amos.fas.core.util.DaoCriteria;
-import com.yeejoin.amos.fas.core.util.StringUtil;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
 import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
@@ -127,8 +124,6 @@ public class EquipmentController extends BaseController {
 
     /**
      * 保护对象查询查询，不分页
-     *
-     * @param id
      * @return
      */
     @Permission
@@ -142,8 +137,10 @@ public class EquipmentController extends BaseController {
 
     /**
      * 绑定消防设备
-     *
+     * @param equipmentId
+     * @param equipmentFireEquipment
      * @return
+     * @throws Exception
      */
     @Permission
     //@Authorization(ingore = true)
@@ -195,6 +192,22 @@ public class EquipmentController extends BaseController {
         return CommonResponseUtil.success(iEquipService.queryBindFirEqumtList(commonPageable, equipmentId));
     }
 
+    @Permission
+    @ApiOperation(httpMethod = "GET", value = "查询有预案的重点设备分页", notes = "查询有预案的重点设备分页")
+    @RequestMapping(value = "/reservePage", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public ResponseModel reservePage(
+            @ApiParam(value = "当前页码", required = false) @RequestParam int pageNum,
+            @ApiParam(value = "页面大小", required = false) @RequestParam int pageSize) {
+
+        CommonPageable commonPageable = null;
+        if (pageNum > -1 && pageSize > -1) {
+            commonPageable = new CommonPageable(pageNum, pageSize);
+        }
+        ResponseModel<Equipment> responseModel = new ResponseModel<>();
+        Page page = iEquipService.reservePage(commonPageable);
+        return CommonResponseUtil2.success(page);
+    }
+
 
     /**
      * 新增、编辑装备及上传现场图
@@ -242,8 +255,6 @@ public class EquipmentController extends BaseController {
 
     /**
      * 查询指定重点设备已经绑定的消防设备
-     *
-     * @param equipmentId
      * @return
      */
     @Permission
@@ -270,8 +281,6 @@ public class EquipmentController extends BaseController {
 
     /**
      * 获取所有重点装备
-     *
-     * @param equipmentId
      * @return
      */
     @Permission

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/EquipmentSpecificController.java

@@ -3,17 +3,13 @@ package com.yeejoin.amos.fas.business.controller;
 import com.yeejoin.amos.fas.business.param.FmeaBindParam;
 import com.yeejoin.amos.fas.business.service.intfc.EquipmentSpecificService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentCategoryService;
-import com.yeejoin.amos.fas.config.Permission;
-import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.EquipmentCategory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FileController.java

@@ -12,14 +12,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireCarController.java

@@ -18,7 +18,6 @@ import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.FireCar;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/FireEquimtPointController.java

 package com.yeejoin.amos.fas.business.controller;
 
 import com.google.common.collect.Maps;
-import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipPointMapper;
 import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipPontService;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/RiskSourceController.java

@@ -6,6 +6,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.yeejoin.amos.fas.core.enums.ReserveEnum;
+import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
+import com.yeejoin.amos.fas.core.util.ResponseModel;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -629,6 +632,19 @@ public class RiskSourceController extends BaseController {
         return CommonResponseUtil.success();
     }
 
+    @ApiOperation(httpMethod = "GET", value = "重点设备启动预案", notes = "重点设备启动预案")
+    @RequestMapping(value = "/startEquipReserve", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public ResponseModel startEquipReserve(@RequestParam Long id, @RequestParam String typeCode) {
+        ReserveEnum reserveEnum = riskSourceService.startEquipReserve(id, typeCode);
+        Integer status = reserveEnum.getStatus();
+        String text = reserveEnum.getText();
+        if (status == 1) {
+            return CommonResponseUtil2.success(text);
+        } else {
+            return CommonResponseUtil2.failure(text);
+        }
+    }
+
     @ApiOperation(httpMethod = "POST", value = "上传消防设备数据", notes = "上传消防设备数据")
     @RequestMapping(value = "/data/fireqeuiment/all", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse postFireEqumentData(@RequestBody List<AlarmParam> deviceDatas) throws Exception {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/SafetyController.java

@@ -16,7 +16,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.fas.business.action.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.vo.ReginParams;
-import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/TopographyController.java

 package com.yeejoin.amos.fas.business.controller;
 
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -19,7 +17,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.fas.business.service.intfc.ITopographyLineService;
-import com.yeejoin.amos.fas.business.service.intfc.ITopographyNodeDetailService;
 import com.yeejoin.amos.fas.business.service.intfc.ITopographyNodeService;
 import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.util.CommonResponse;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java

 package com.yeejoin.amos.fas.business.controller;
 
 import java.util.List;
-import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/WaterResourceController.java

@@ -22,7 +22,6 @@ import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
 import com.yeejoin.amos.fas.dao.entity.WaterResource;
 import com.yeejoin.amos.fas.dao.entity.WaterResourceEquipment;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/WeatherController.java

 package com.yeejoin.amos.fas.business.controller;
 
 import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.List;
-import java.util.Map;
 import java.util.zip.GZIPInputStream;
 
 import org.springframework.beans.factory.annotation.Value;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ImpEquipMapper.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.fas.business.dao.mapper;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
+import com.yeejoin.amos.fas.dao.entity.Equipment;
+import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import org.apache.ibatis.annotations.Param;
 
 public interface ImpEquipMapper extends BaseMapper {
@@ -16,4 +19,8 @@ public interface ImpEquipMapper extends BaseMapper {
             @Param("pageSize") Integer pageSize);
     
     Long getEquipPageCount(@Param("name") String name, @Param("id") String id);
+
+    Long reservePageCount();
+
+    List<EquipmentDTO> reservePage(long start, int length);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IEquipmentDao.java

 package com.yeejoin.amos.fas.business.dao.repository;
 
+import java.util.List;
 import java.util.Optional;
 
+import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
@@ -16,4 +18,9 @@ public interface IEquipmentDao extends BaseDao<Equipment, Long> {
 	@Query(value = "SELECT count(1) FROM `f_fmea_equipment_point` WHERE important_equipment_id in ?1", nativeQuery = true)
 	int countFemaRelation(String[] idArray);
 
+	@Query(value = "SELECT COUNT(1) FROM f_equipment WHERE `status` = ?1", nativeQuery = true)
+    int countByStatus(int status);
+
+	@Query(value = "SELECT ss.equipment_specific_id FROM(SELECT si.equipment_specific_id, si.equipment_index_id FROM wl_equipment_specific_index si WHERE si.equipment_specific_id IN ( SELECT fe.fire_equipment_id FROM f_equipment_fire_equipment fe WHERE fe.equipment_id = ?1 )  ) ss LEFT JOIN wl_equipment_index ei ON ss.equipment_index_id = ei.id WHERE ei.type_code = ?2", nativeQuery = true)
+	List<EquipmentSpecificIndexVo> getReserveEquipById(Long id, String typeCode);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentServiceImpl.java

@@ -13,8 +13,10 @@ import java.util.Optional;
 import javax.annotation.PostConstruct;
 
 import com.yeejoin.amos.fas.business.dao.mapper.EquipmentSpecificMapper;
+import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
 import com.yeejoin.amos.fas.business.vo.EquipmentSpecificVo;
 import com.yeejoin.amos.fas.core.util.StringUtil;
+import com.yeejoin.amos.fas.dao.dto.EquipmentDTO;
 import com.yeejoin.amos.fas.dao.entity.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -267,6 +269,23 @@ public class EquipmentServiceImpl implements IEquipmentService {
         return result;
     }
 
+    @Override
+    public Page reservePage(CommonPageable commonPageable) {
+        long start = -1;
+        int length = -1;
+        if (null != commonPageable) {
+            start = commonPageable.getOffset();
+            length = commonPageable.getPageSize();
+        }
+        long total = this.impEquipMapper.reservePageCount();
+        List<EquipmentDTO> list = this.impEquipMapper.reservePage(start, length);
+        if(commonPageable==null)
+        {
+            commonPageable = new CommonPageable();
+        }
+        Page result = new PageImpl(list, commonPageable, total);
+        return result;
+    }
 
     @Override
     public Equipment saveImg(MultipartFile file, Equipment equipment, int type, Long userId) {
@@ -491,4 +510,14 @@ public class EquipmentServiceImpl implements IEquipmentService {
 		return iEquipmentDao.countFemaRelation(idArray);
 	}
 
+    @Override
+    public int countByStatus(int status) {
+        return iEquipmentDao.countByStatus(status);
+    }
+
+    @Override
+    public List<EquipmentSpecificIndexVo> getReserveEquipById(Long id, String typeCode) {
+        return iEquipmentDao.getReserveEquipById(id, typeCode);
+    }
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/View3dServiceImpl.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.fas.business.service.impl;
 
 
 import java.math.BigDecimal;
-import java.net.InetAddress;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,14 +28,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
-import com.yeejoin.amos.fas.business.action.ContingencyAction;
 import com.yeejoin.amos.fas.business.bo.BindPointBo;
 import com.yeejoin.amos.fas.business.bo.CheckErrorBo;
 import com.yeejoin.amos.fas.business.bo.RiskPointRpnChangeBo;
@@ -59,7 +55,6 @@ import com.yeejoin.amos.fas.business.service.intfc.IDataRefreshService;
 import com.yeejoin.amos.fas.business.service.intfc.IView3dService;
 import com.yeejoin.amos.fas.business.vo.ErrorContentVo;
 import com.yeejoin.amos.fas.business.vo.ExceptionRegionVo;
-import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.business.vo.SafetyIndexDetailVo;
 import com.yeejoin.amos.fas.business.vo.TodaySafetyIndexVo;
 import com.yeejoin.amos.fas.business.vo.View3dNodeVo;
@@ -71,7 +66,6 @@ import com.yeejoin.amos.fas.common.enums.RiskSourceLevelEum;
 import com.yeejoin.amos.fas.common.enums.RiskSourceRegionEum;
 import com.yeejoin.amos.fas.common.enums.RpnChangeTypeEum;
 import com.yeejoin.amos.fas.common.enums.StatisticsErrorTypeEum;
-import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.DateUtil;
 import com.yeejoin.amos.fas.core.common.response.CoordDTO;
@@ -90,8 +84,6 @@ import com.yeejoin.amos.fas.dao.entity.SafetyIndexChangeLog;
 import com.yeejoin.amos.fas.dao.entity.WaterResource;
 import com.yeejoin.amos.fas.exception.YeeException;
 
-import io.swagger.annotations.ApiOperation;
-
 /**
  * @author DELL
  */

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IEquipmentService.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.fas.business.param.ImgParam;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
+import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse;
 import com.yeejoin.amos.fas.core.util.DaoCriteria;
@@ -104,4 +106,15 @@ public interface IEquipmentService {
 
 	int countFemaRelation(String[] idArray);
 
+    Page reservePage(CommonPageable commonPageable);
+
+    int countByStatus(int status);
+
+    /**
+     * 获取重点设备绑定设备
+     * @param id
+     * @param firealarm
+     * @return
+     */
+    List<EquipmentSpecificIndexVo> getReserveEquipById(Long id, String typeCode);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IRiskSourceService.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
+import com.yeejoin.amos.fas.core.enums.ReserveEnum;
 import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
 import com.yeejoin.amos.fas.dao.entity.FmeaPointInputitem;
 import com.yeejoin.amos.fas.dao.entity.RiskSource;
@@ -194,4 +195,6 @@ public interface IRiskSourceService {
      * @date 2020-9-9 11:53:36
      */
     void deleteById(Long id);
+
+    ReserveEnum startEquipReserve(Long id, String typeCode);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/config/ExceptionHandler.java

 package com.yeejoin.amos.fas.config;
 
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/core/enums/ReserveEnum.java

+package com.yeejoin.amos.fas.core.enums;
+
+/**
+ * @ProjectName: YeeAmosFireAutoSysRoot
+ * @Package: com.yeejoin.amos.fas.core.enums
+ * @ClassName: ReserveEnum
+ * @Author: Jianqiang Gao
+ * @Description: 预案启动状态
+ * @Date: 2021/1/7 18:23
+ * @Version: 1.0
+ */
+public enum ReserveEnum {
+    RUN(1, "启动成功"),
+    RUNNING(2, "已有预案正在启动"),
+    NOEQUIP(3, " 该电力设备未安装火灾探测器");
+
+    private Integer status;
+    private String text;
+
+    ReserveEnum(Integer status, String text) {
+        this.status = status;
+        this.text = text;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}
\ No newline at end of file

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/core/util/FileUtil.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.fas.core.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -13,7 +13,7 @@ eureka.instance.prefer-ip-address=true
 spring.datasource.url=jdbc:mysql://172.16.11.33:3306/safety-business-2.0-36?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
 spring.datasource.username=root
 spring.datasource.password=admin_1234
-spring.datasource.driver-class-name = com.mysql.jdbc.Driver
+spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
 spring.datasource.hikari.maxLifetime = 1765000
 spring.datasource.hikari.maximum-pool-size = 10
 spring.datasource.testWhileIdle = true

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -567,5 +567,15 @@
             ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_user_id` varchar(20) NULL COMMENT '驻站消防队队长';
         </sql>
     </changeSet>
-    
+    <changeSet author="gaojianqiang" id="1609989450-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_equipment" columnName="status" />
+            </not>
+        </preConditions>
+        <comment>修改f_equipment表结构</comment>
+        <sql>
+            ALTER TABLE `f_equipment` ADD COLUMN `status` tinyint(4) NULL DEFAULT NULL COMMENT '预案状态：1-启动，0-未启动';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_impt_equip.xml

@@ -2,9 +2,12 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.fas.business.dao.mapper.ImpEquipMapper">
-
-
-
+	<resultMap id="resultMap" type="com.yeejoin.amos.fas.dao.dto.EquipmentDTO">
+		<id column="id" property="id"/>
+		<result column="name" property="name"/>
+		<result column="status" property="status"/>
+		<result column="type" property="type"/>
+	</resultMap>
 
     <select id="queryProtectObjNames" resultType="string" >
 
@@ -59,5 +62,31 @@
 		</trim>
 	</select>
 
+	<select id="reservePage" resultMap="resultMap">
+		SELECT
+			a.id,
+			a.`name`,
+			a.`status`,
+			'重点设备' AS type
+		FROM
+			`f_equipment` a
+		WHERE
+			a.reserve_plan IS NOT NULL
+			AND a.reserve_plan != ''
+		ORDER BY
+			a.id
+		<if test="start != -1 and length != -1">
+			LIMIT ${start},${length} ;
+		</if>
+	</select>
 
+	<select id="reservePageCount" resultType="long">
+		SELECT
+			COUNT(1)
+		FROM
+			`f_equipment` a
+		WHERE
+			a.reserve_plan IS NOT NULL
+			AND a.reserve_plan != ''
+	</select>
 </mapper>
\ No newline at end of file