Merge branch 'dev' of depot-qinghai/depot-monitor-qinghai into dev-2.15.0

src/main/java/com/chinaitop/depot/basic/controller/MonitorCameraController.java

@@ -186,9 +186,16 @@ public class MonitorCameraController {
         }
         return list;
     }
+    /**
+     * 导入excel
+     * @param file 文件
+     * @param fileType 类型：如xlsx
+     * @return
+     */
 
-    @RequestMapping(value="/importFile")
-    public String importFile(MultipartFile file, String fileType, HttpServletRequest request,Integer orgId){
+    @RequestMapping(value="/importFile", method=RequestMethod.POST)
+    @ApiOperation(value="导入摄像头excel", notes = "导入摄像头excel")
+    public String importFile(MultipartFile file,String orgId, String fileType, HttpServletRequest request){
 
         String[] titleArr = {"摄像头名称", "摄像机别名", "所属厂商(200代表海康，300代表大华)", "账号", "密码", "硬盘录像机编号", "通道号", "IP地址",
         		"子网掩码", "网关", "设备类型(1代表球形摄像机,2代表枪式摄像机)", "设备端口", "设备型号", "所在位置(1代表仓内,2代表仓外)",
@@ -197,19 +204,19 @@ public class MonitorCameraController {
         boolean[] emptyArr = {false, false, false, false, false, false, false, false,
         		true, true, false, false, true, true,
         		true, true, true, true, true,true,false,true,true};//指定列可为空，不可为空值为false.
-
+        String orgId1=orgId.replaceAll("\\D+", "");
         List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
         String errormsg = null;
         try {
 
-        	errormsg = importService.importFile(uploadPath, file, fileType, request, titleArr, emptyArr, list);
+        	errormsg = importService.importFile(uploadPath, file, fileType,request,titleArr, emptyArr, list);
 
         	if (errormsg != null && !"".equals(errormsg)) {
         		return errormsg;
         	}
 
             if (list.size()>0) {
-            	errormsg = cameraService.importData(list, orgId);
+            	errormsg = cameraService.importData(list, Integer.parseInt(orgId1));
 
             	System.out.println(list);
             	System.out.println(errormsg);

src/main/java/com/chinaitop/depot/basic/controller/MonitorNvrController.java

@@ -229,7 +229,7 @@ public class MonitorNvrController {
      * @return
      */
     @RequestMapping(value="/importFile")
-    public String importFile(MultipartFile file, String fileType, HttpServletRequest request,Integer orgid){
+    public String importFile(MultipartFile file, String fileType, HttpServletRequest request,String orgid){
 
         String[] titleArr = {"NVR名称","NVR别名","所属厂商","NVR型号","NVR类型","NVRIP","NVR网关地址","NVR子网掩码","NVR账号","NVR密码","NVR端口","NVR管理员","安装位置","备注"};//第一行的title
         boolean[] emptyArr = {true   ,  false  ,  false , true  ,  false   ,  false   ,    true     ,    true   ,   false  , false   ,false   ,   true,   true ,   true};//指定列可为空，不可为空值为false.
@@ -248,7 +248,7 @@ public class MonitorNvrController {
 
             //这句返回后台判断
             if (list.size()>0) {
-            	errormsg = nvrService.importData(list,orgid);
+            	errormsg = nvrService.importData(list,Integer.parseInt(orgid));
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/chinaitop/depot/basic/mapper/CameraStorehouseMapper.java

@@ -32,4 +32,6 @@ public interface CameraStorehouseMapper {
     int updateByPrimaryKey(CameraStorehouse record);
 
     Map<String,Object> getStorehouseId(Map<String, Object> map);
+
+    Map<String, Object> getCameraIndexCode(Map<String, Object> map);
 }

src/main/java/com/chinaitop/depot/basic/mapper/CameraStorehouseMapper.xml

@@ -204,4 +204,9 @@
       AND org_id = #{orgId}
       AND storehouse_name = #{storehouseName}
   </select>
+  <select id="getCameraIndexCode" resultType="java.util.Map">
+    select id from monitor_camera
+    where camera_index_code =#{cameraIndexCode}
+
+  </select>
 </mapper>

src/main/java/com/chinaitop/depot/basic/mapper/MonitorCameraMapper.xml

@@ -30,6 +30,7 @@
     <result column="camera_index_code" property="cameraIndexCode" jdbcType="VARCHAR" />
     <result column="status" property="status" jdbcType="INTEGER" />
     <result column="status_name" property="statusName" jdbcType="VARCHAR" />
+    <result column="storehouse_id" property="storehouseId" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -117,7 +118,7 @@
   <select id="selectById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select mc.id, mc.org_id, mc.nvr_id, mc.name, mc.alias, mc.username, mc.password, mc.ip, mc.subnetmask, mc.gateway, mc.type, 
     mc.port, mc.factory, mc.live, mc.model_number, mc.serial_number, mc.installation_site, mc.installation_method, 
-    mc.Irradiated_area, mc.power_position, mc.remark, mc.channel_number, mc.isremove, mc.update_time, cs.storehouse_idmc,mc.camera_index_code
+    mc.Irradiated_area, mc.power_position, mc.remark, mc.channel_number, mc.isremove, mc.update_time, cs.storehouse_id,mc.camera_index_code
     from monitor_camera mc
     left join camera_storehouse cs on cs.camera_id = mc.id
     where mc.id = #{id,jdbcType=INTEGER}

src/main/java/com/chinaitop/depot/basic/service/impl/ImportServiceImpl.java

@@ -28,7 +28,7 @@ import java.util.List;
 @Service
 public class ImportServiceImpl {
 
-    public String importFile(String uploadPath, MultipartFile file, String fileType, HttpServletRequest request,String[] titleArr,boolean[] emptyArr,List<List<String>> lists) throws Exception{
+    public String importFile(String uploadPath, MultipartFile file, String fileType,HttpServletRequest request,String[] titleArr,boolean[] emptyArr,List<List<String>> lists) throws Exception{
 
         // 服务器路径
 //        String rootPath = request.getSession().getServletContext().getRealPath("");
@@ -47,7 +47,6 @@ public class ImportServiceImpl {
     /**
      * 创建临时文件
      * @param file 上传过来的文件流
-     * @param request 请求
      * @param uploadPath 根目录
      * @param relativePath 相对路径
      * @throws Exception
@@ -79,9 +78,9 @@ public class ImportServiceImpl {
         //循环每一个sheet
         for (int i = 0; i < sheetNum; i++) {
             String err = everySheet(getWorkbook(tempFile,fileName).getSheetAt(i),titleArr,emptyArr,list);
-            if(ParameterUtil.isnotnull(err)){
-                errorMSG.append("第"+(i+1)+"个sheet，名称为："+getWorkbook(tempFile,fileName).getSheetName(i)+"，错误信息："+err);
-            }
+//            if(ParameterUtil.isnotnull(err)){
+//                errorMSG.append("第"+(i+1)+"个sheet，名称为："+getWorkbook(tempFile,fileName).getSheetName(i)+"，错误信息："+err);
+//            }
         }
 
         //删除临时文件
@@ -94,12 +93,14 @@ public class ImportServiceImpl {
     //获取workbook
     private Workbook getWorkbook(File file ,String FileName){
         Workbook wb = null;
-        try {
-            InputStream is = new FileInputStream(file);
-            if(ExcelImportUtils.isExcel2007(FileName))
+        try (InputStream is = new FileInputStream(file)){
+            if (file.getName().endsWith(".xlsx")) {
                 wb = new XSSFWorkbook(is);
-            else
+            } else if (file.getName().endsWith(".xls")) {
                 wb = new HSSFWorkbook(is);
+            } else {
+                throw new IllegalArgumentException("文件不符合规范");
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -121,7 +122,7 @@ public class ImportServiceImpl {
             return "请确认excel的数据";
         }
 
-        if (!ExcelImportUtils.isSame(sheet.getRow(0),totalCells,titleArr)){ return "导入excel和模板不一致"; }//判断标题是否正确
+        //if (!ExcelImportUtils.isSame(sheet.getRow(0),totalCells,titleArr)){ return "导入excel和模板不一致"; }//判断标题是否正确
 
         //开始处理数据，循环Excel行数,从第二行开始。标题不入库
         for(int r=1;r<totalRows;r++){

src/main/java/com/chinaitop/depot/basic/service/impl/MonitorCameraServiceImpl.java

@@ -310,6 +310,7 @@ public class MonitorCameraServiceImpl implements MonitorCameraService {
 								return msg;
 							}
 						}
+
 						if(ParameterUtil.isnotnull(revList.get(j)) && ParameterUtil.isequal(revList.get(13),"1")){
 							enumData.put("storehouseName", revList.get(j));
 							enumData.put("orgId", orgId);
@@ -323,6 +324,8 @@ public class MonitorCameraServiceImpl implements MonitorCameraService {
 							cameraStorehouse.setOrgId(orgId);
 							cameraStorehouse.setStorehouseId(Integer.parseInt(storehouseId.get("storehouseId").toString()));
 						}
+						camera.setPowerPosition(revList.get(j));
+						break;
 					case 20:
 						//摄像头唯一标识
 						if (revList.get(j) != null && !"".equals(revList.get(j))) {
@@ -332,34 +335,39 @@ public class MonitorCameraServiceImpl implements MonitorCameraService {
 								return msg;
 							}
 						}
+						if(ParameterUtil.isnotnull(revList.get(j))){
+							enumData.put("cameraIndexCode", revList.get(j));
+							Map<String,Object> ca = cameraStorehouseMapper.getCameraIndexCode(enumData);
+							if(!ParameterUtil.isnull(ca)){
+								msg = "第 "+(i+1)+" 行第 21 列的值的不正确，请查询后再添加！";
+								return msg;
+							}
+						}
+						camera.setCameraIndexCode(revList.get(j));
+						break;
+
 					case 21:
 						//在线状态（0-未知，1-在
 						//线，2-离线）
+						Integer status =0;
 						if (revList.get(j) != null && !"".equals(revList.get(j))) {
 							len = revList.get(j).length();
-							if (!"0".equals(revList.get(j)) &&!"1".equals(revList.get(j)) && !"2".equals(revList.get(j))) {
+							if (!"0".equals(revList.get(j)) && !"1".equals(revList.get(j)) && !"2".equals(revList.get(j))) {
 								msg = "第 "+(i+1)+" 行第 22 列的值必须是0或者1或者2！";
 								return msg;
 							}
-
-						}
-					case 22:
-						//状态说明
-						if (revList.get(j) != null && !"".equals(revList.get(j))) {
-							len = revList.get(j).length();
-							if (len > 255) {
-								msg = "第 "+(i+1)+" 行第 23 列的值的长度不能超过255！";
-								return msg;
-							}
+							 status=Integer.parseInt(revList.get(j));
 						}
-
+						camera.setStatus(status);
 						break;
             		default :
             			break;
             	}
             }
-
-			cameraMapper.insert(camera);
+			int a =cameraMapper.insert(camera);
+			if(a>0){
+				msg="导入成功";
+			}
 
             if(ParameterUtil.isnotnull(cameraStorehouse)){
 				cameraStorehouse.setCameraId(camera.getId());

src/main/java/com/chinaitop/depot/hk/dto/req/CaptureReqDTO.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2024/6/22
  **/
 @Data
-@AllArgsConstructor
+//@AllArgsConstructor
 public class CaptureReqDTO {
     /**
      * 监控点编号

src/main/java/com/chinaitop/depot/hk/dto/req/RecordStartReqDTO.java

@@ -1,6 +1,6 @@
 package com.chinaitop.depot.hk.dto.req;
 
-import lombok.AllArgsConstructor;
+
 import lombok.Data;
 
 /**
@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2024/6/20
  **/
 @Data
-@AllArgsConstructor
+//@AllArgsConstructor
 public class RecordStartReqDTO {
 
     /**
@@ -29,5 +29,7 @@ public class RecordStartReqDTO {
      * 存储类型，0-中心存储，1-设备存储，默认为0-中心存储，如果不指定则默认采用中心存储方式
      */
     private Integer type;
+
+    
 }
 

src/main/java/com/chinaitop/depot/monitor/controller/PreviewPlaybackController.java

@@ -15,25 +15,31 @@ import com.chinaitop.depot.monitor.model.CameraCapture;
 import com.chinaitop.depot.monitor.model.CameraRecord;
 import com.chinaitop.depot.monitor.service.CameraCaptureService;
 import com.chinaitop.depot.monitor.service.CameraRecordService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+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.RestController;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
+
 import javax.annotation.Resource;
 
 /**
  * 视频预览回放
+ * 
+ * 预览---开始手动录像---停止手动录像----回放--手动抓图--云台控制
  */
 @RestController
 @RequestMapping(value = "/previewPlayback")
@@ -62,9 +68,6 @@ public class PreviewPlaybackController {
      */
     @RequestMapping(value="/getPreview", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     @ApiOperation(value="预览", notes = "预览")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "{cameraIndexCode}", value = "监控点编号", paramType = "query")
-    })
     public PreviewResDTO getAlarmPhone(PreviewReqDTO previewReqDTO) {
         return hkService.previewURLs(previewReqDTO);
     }
@@ -75,23 +78,9 @@ public class PreviewPlaybackController {
      * @param playbackReqDTO
      * @return
      */
-    @RequestMapping(value="/getPlayback", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @RequestMapping(value="/getPlayback", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="回放", notes = "回放")
-    /*@ApiImplicitParams({
-            @ApiImplicitParam(name = "cameraIndexCode", value = "监控点唯一标识，分页获取监控点资源接口获取返回参数", paramType = "query"),
-            @ApiImplicitParam(name = "recordLocation", value = "存储类型, 0：中心存储, 1：设备存储 (默认为中心存储)", paramType = "query"),
-            @ApiImplicitParam(name = "protocol", value = "取流协议", paramType = "query"),
-            @ApiImplicitParam(name = "transmode", value = "传输协议，默认为TCP", paramType = "query"),
-            @ApiImplicitParam(name = "beginTime", value = "开始时间，ISO8601格式", paramType = "query"),
-            @ApiImplicitParam(name = "endTime", value = "结束时间，与开始时间相差不超过三天，ISO8601格式", paramType = "query"),
-            @ApiImplicitParam(name = "uuid", value = "分页查询id，用于继续查询剩余片段，默认为空字符串 (设备存储生效)", paramType = "query"),
-            @ApiImplicitParam(name = "uuid", value = "分页查询id，用于继续查询剩余片段，默认为空字符串 (设备存储生效)", paramType = "query"),
-            @ApiImplicitParam(name = "expand", value = "扩展内容，支持指定解码格式等，格式：key=value，多个以&隔开", paramType = "query"),
-            @ApiImplicitParam(name = "streamform", value = "输出码流转封装格式，默认为RTP ,ps", paramType = "query"),
-            @ApiImplicitParam(name = "lockType", value = "查询录像的锁定类型，默认查询全部录像 0  1未锁定 2锁定", paramType = "query")
-
-    })*/
-    public PlaybackResDTO getPlayback(PlaybackReqDTO playbackReqDTO) {
+    public PlaybackResDTO getPlayback(@RequestBody PlaybackReqDTO playbackReqDTO) {
         return hkService.playbackURLs(playbackReqDTO);
     }
 
@@ -100,10 +89,23 @@ public class PreviewPlaybackController {
      * 开始手动录像
      * @param recordStartReqDTO
      * @return
+     * @throws IOException 
+     * @throws JsonMappingException 
+     * @throws JsonParseException 
      */
-    @RequestMapping(value="/recordStart", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @RequestMapping(value="/recordStart", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="开始手动录像", notes = "开始手动录像")
-    public RecordStartResDTO recordStart(RecordStartReqDTO recordStartReqDTO,CameraRecord cameraRecord) {
+    public RecordStartResDTO recordStart(String recordStartReqDTOJson, String cameraRecordJson) throws Exception {
+    	
+        
+        // JSON字符串转对象
+        ObjectMapper mapper1 = new ObjectMapper();
+        CameraRecord cameraRecord = (CameraRecord)mapper1.readValue(cameraRecordJson, CameraRecord.class);
+        
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        RecordStartReqDTO recordStartReqDTO = (RecordStartReqDTO)mapper.readValue(recordStartReqDTOJson, RecordStartReqDTO.class);
+        
     	
     	RecordStartResDTO recordStartResDTO = hkService.recordStart(recordStartReqDTO);
     	
@@ -127,12 +129,26 @@ public class PreviewPlaybackController {
     /**
      * 手动抓图
      * @param captureReqDTO
+     * @throws IOException 
+     * @throws JsonMappingException 
+     * @throws JsonParseException 
      */
-    @RequestMapping(value="/manualCapture", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @RequestMapping(value="/manualCapture", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="手动抓图", notes = "手动抓图")
-    public String manualCapture(CaptureReqDTO captureReqDTO,CameraCapture cameraCapture) {
+    public String manualCapture(String captureReqDTOJson, String cameraCaptureJson) throws Exception {
+    	
+    	
+    	// JSON字符串转对象
+        ObjectMapper mapper1 = new ObjectMapper();
+        CaptureReqDTO captureReqDTO = (CaptureReqDTO)mapper1.readValue(captureReqDTOJson, CaptureReqDTO.class);
+        
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        CameraCapture cameraCapture = (CameraCapture)mapper.readValue(cameraCaptureJson, CameraCapture.class);
+        
     	CaptureResDTO captureResDTO = hkService.manualCapture(captureReqDTO);
          
+    	
          //加到表里
     	CameraCapture cameraCapture1 = cameraCaptureService.save(cameraCapture,captureResDTO.getPicUrl());
          if(cameraCapture1.getId()>0){

src/main/java/com/chinaitop/depot/monitor/service/impl/CameraCaptureServiceImpl.java

@@ -25,8 +25,9 @@ public class CameraCaptureServiceImpl implements CameraCaptureService{
 		//cameraCapture.setCameraId(cameraCapture.getCameraId());
 		//cameraCapture.setOrgId(cameraCapture.getOrgId()+"");
 		// 图片地址转 文件流  picUrl
-		String wjl = NetFileUtil.getBase64Content(picUrl);
-		cameraCapture.setCntxwjl(wjl);
+		//String wjl = NetFileUtil.getBase64Content(picUrl);
+		//System.out.println(wjl.length()+"*******************");
+		cameraCapture.setCntxwjl(picUrl);//文件地址
 		//cameraCapture.setStorehouseId(cameraCapture.getStorehouseId());
 		//cameraCapture.setTxwjhzm(txwjhzm);//图像文件后缀名
 		//cameraCapture.setWarehouseId(cameraCapture.getWarehouseId());//

src/main/java/com/chinaitop/depot/utils/CustomFilter.java

@@ -1,61 +0,0 @@
-package com.chinaitop.depot.utils;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import com.chinaitop.depot.utils.DataPolicyEngine;
-import com.chinaitop.depot.utils.ParameterRequestWrapper;
-
-public class CustomFilter implements Filter {
-
-	@Override
-    public void init(FilterConfig filterConfig) throws ServletException {
- 
-    }
-	
-	@Override
-	public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2)
-			throws IOException, ServletException {
-		ParameterRequestWrapper requestWrapper = new ParameterRequestWrapper((HttpServletRequest) arg0);
-		HttpServletRequest request = (HttpServletRequest) arg0;
-		HttpSession session = request.getSession();
-		String orgId = "";
-		if (session != null){
-			orgId = ObjectUtils.toString(session.getAttribute("orgId"), "");
-		}
-		if (StringUtils.isNotBlank(orgId)) {
-			DataPolicyEngine.set(orgId);
-		}
-
-		if (StringUtils.isNotBlank(orgId)) {
-			// 将参数追加到request url 之后
-			requestWrapper.addParameter("orgId", orgId);
-			requestWrapper.addParameter("unitid", orgId);
-			requestWrapper.addParameter("unitId", orgId);
-			// 将参数追加到request 的body 中
-			requestWrapper.addParameterToBody("orgId", orgId);
-			requestWrapper.addParameterToBody("unitid", orgId);
-			requestWrapper.addParameterToBody("unitId", orgId);
-		}
-
-		arg2.doFilter(requestWrapper, arg1);
-		DataPolicyEngine.remove();
-	}
-
-	@Override
-    public void destroy() {
- 
-    }
-
-}

src/main/java/com/chinaitop/depot/utils/ParameterRequestWrapper.java

@@ -1,233 +0,0 @@
-package com.chinaitop.depot.utils;
-
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.util.StringUtils;
-
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * request 请求参数添加
- *
- * @Description TODO
- * @Date 2022/12/13 09:41
- * @Author fxw
- * @Version 1.0
- */
-public class ParameterRequestWrapper extends HttpServletRequestWrapper {
-
-    private Map<String, String[]> params = new HashMap<String, String[]>();
-    private byte[] body;
-
-    public ParameterRequestWrapper(HttpServletRequest request) {
-        // 将request交给父类，以便于调用对应方法的时候，将其输出，
-        // 其实父亲类的实现方式和第一种new的方式类似
-        super(request);
-        //将参数表，赋予给当前的Map以便于持有request中的参数
-        //由于request并没有提供现成的获取json字符串的方法，所以我们需要将body中的流转为字符串
-        String json = getPostData(request);
-        if (!StringUtils.isEmpty(json)) {
-            // body 赋值
-            this.body = getData(json).getBytes();
-        }
-        // 请求参数赋值
-        this.params.putAll(request.getParameterMap());
-    }
-
-    /**
-     * 重载一个构造方法-- 扩展参数
-     *
-     * @param request
-     * @param extendParams
-     */
-    public ParameterRequestWrapper(HttpServletRequest request, Map<String, Object> extendParams) {
-        this(request);
-        //这里将扩展参数写入参数表
-        addAllParameters(extendParams);
-    }
-
-    /**
-     * 增加多个参数
-     *
-     * @param otherParams
-     */
-    public void addAllParameters(Map<String, Object> otherParams) {
-        for (Map.Entry<String, Object> entry : otherParams.entrySet()) {
-            addParameter(entry.getKey(), entry.getValue());
-        }
-    }
-
-    /**
-     * 增加参数
-     */
-    public void addParameter(String name, Object value) {
-        if (value != null) {
-            if (value instanceof String[]) {
-                params.put(name, (String[]) value);
-            } else if (value instanceof String) {
-                params.put(name, new String[]{(String) value});
-            } else {
-                params.put(name, new String[]{String.valueOf(value)});
-            }
-        }
-    }
-    
-    /**
-     * 删除参数
-     */
-    public void deleteParameter(String key) {
-    	params.remove(key);
-    }
-
-    /**
-     * 增加body 参数
-     *
-     * @param name
-     * @param value
-     */
-    public void addParameterToBody(String name, Object value) {
-        byte[] json = this.body;
-        if (null == json) {
-            return;
-        }
-        String jsonStr = new String(json);
-        try {
-            Map<String, Object> mapData = JSONObject.parseObject(jsonStr, Map.class);
-            if (value != null) {
-                mapData.put(name, value);
-                this.body = JSONObject.toJSONString(mapData).getBytes();
-            }
-        } catch (Exception ex) {
-            // 转换异常
-        }
-
-    }
-
-    /**
-     * 删除body 参数
-     *
-     * @param name
-     * @param value
-     */
-    public void deleteParameterToBody(String key) {
-        byte[] json = this.body;
-        if (null == json) {
-            return;
-        }
-        String jsonStr = new String(json);
-        try {
-            Map<String, Object> mapData = JSONObject.parseObject(jsonStr, Map.class);
-            mapData.remove(key);
-            this.body = JSONObject.toJSONString(mapData).getBytes();
-        } catch (Exception ex) {
-            // 转换异常
-        }
-
-    }
-
-
-    /**
-     * body中参数解密
-     *
-     * @param json
-     * @return
-     */
-    private String getData(String json) {
-        //加密，如果传过来的是加密数据，先解密，未加密直接返回原json
-//        if(StringUtils.isNotEmpty(json)){
-//            json = AES256Util.decode(json);
-//            if(StringUtils.isEmpty(json)){
-//                return "";
-//            }
-//            JSONObject object = JSONUtil.parseObj(json);
-//            return JSONUtil.toJsonStr(object);
-//        }
-        //不加密
-        return json;
-
-    }
-
-    /**
-     * 获取body 参数
-     *
-     * @param request
-     * @return
-     */
-    public static String getPostData(HttpServletRequest request) {
-        StringBuilder data = new StringBuilder();
-        String line;
-        BufferedReader reader;
-        try {
-            reader = request.getReader();
-            while (null != (line = reader.readLine())) {
-                data.append(line);
-            }
-        } catch (IOException e) {
-            return null;
-        }
-        return data.toString();
-    }
-
-    @Override
-    public String getParameter(String name) {//重写getParameter，代表参数从当前类中的map获取
-        String[] values = params.get(name);
-        if (values == null || values.length == 0) {
-            return null;
-        }
-        return values[0];
-    }
-
-    @Override
-    public String[] getParameterValues(String name) {//同上
-        return params.get(name);
-    }
-
-    @Override
-    public BufferedReader getReader() throws IOException {
-        return new BufferedReader(new InputStreamReader(getInputStream()));
-    }
-
-    /**
-     * 在使用@RequestBody注解的时候，其实框架是调用了getInputStream()方法，所以我们要重写这个方法
-     *
-     * @return
-     * @throws IOException
-     */
-    @Override
-    public ServletInputStream getInputStream() throws IOException {
-        if (body == null) {
-            body = new byte[0];
-        }
-        final ByteArrayInputStream bais = new ByteArrayInputStream(body);
-        return new ServletInputStream() {
-            @Override
-            public boolean isFinished() {
-                return false;
-            }
-
-            @Override
-            public boolean isReady() {
-                return false;
-            }
-
-            @Override
-            public void setReadListener(ReadListener readListener) {
-
-            }
-
-            @Override
-            public int read() throws IOException {
-                return bais.read();
-            }
-        };
-    }
-
-}

src/main/java/com/chinaitop/depot/utils/WebConfig.java

@@ -1,39 +0,0 @@
-package com.chinaitop.depot.utils;
-
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @desc 注册bean, 将自定义过滤器添加到过滤器链中
- * @Author fxw
- * @date 2019/3/11
- * @return
- */
-@Configuration
-public class WebConfig {
-
-   /**
-    * 注册过滤器,有两种方式：
-    * 1) 使用 @Component 注解<br>
-    * 2) 添加到过滤器链中，此方式适用于使用第三方的过滤器。将过滤器写到 WebConfig 类中，如下：
-    */
-   @Bean
-   public FilterRegistrationBean filterRegistrationBean() {
-
-      FilterRegistrationBean registrationBean = new FilterRegistrationBean();
-
-      CustomFilter filter = new CustomFilter();
-      registrationBean.setFilter(filter);
-
-      //设置过滤器拦截请求
-      List<String> urls = new ArrayList<>();
-      urls.add("/*");
-      registrationBean.setUrlPatterns(urls);
-
-      return registrationBean;
-   }
-
-}

src/main/resources/bootstrap-dev.yml

@@ -43,6 +43,8 @@ spring:
       max-request-size: 50MB
 web:
   upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
+
+
 # 视频监测记录保存位置
 monitor:
   monitoring-path: /home/monitorzd