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

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

@@ -45,4 +45,22 @@ public interface IFusionService {
      * @return
      */
     Map<String, String> getCallRecordByCID(String cid);
+
+    /**
+     *
+     *
+     * 获取800m，400m 录音文件列表
+     *
+     * **/
+    JSONObject selectAudioVideoRecords(
+            Integer  curPage,
+            Integer  pageRows,
+            String  beginTime,
+            String endTime,
+            String beginLongTime,
+            String endLongTime,
+            String  number,
+            Integer callType
+    );
+
 }

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

@@ -11,7 +11,7 @@
         jc_alert_called a LEFT JOIN jc_power_transfer b on a.sequence_nbr=b.alert_called_id
         LEFT JOIN jc_power_transfer_company c on c.power_transfer_id=b.sequence_nbr
          LEFT JOIN   jc_power_transfer_company_resources d on  d.power_transfer_company_id=c.sequence_nbr where c.sequence_nbr=  #{id}
-
+        ORDER BY d.rec_date LIMIT 1
 
     </select>
 
@@ -51,7 +51,7 @@
         jc_alert_called a LEFT JOIN jc_power_transfer b on a.sequence_nbr=b.alert_called_id
         LEFT JOIN jc_power_transfer_company c on c.power_transfer_id=b.sequence_nbr
         LEFT JOIN   jc_power_transfer_company_resources d on  d.power_transfer_company_id=c.sequence_nbr where a.sequence_nbr=  #{alertCalledId}
-        and d.resources_id=#{carId}
+        and d.resources_id=#{carId}  ORDER BY d.rec_date LIMIT 1
 
 
     </select>

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

@@ -203,7 +203,7 @@
         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
         LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
     WHERE
-        a.alert_called_id = ${alertId} and c.resources_id = ${carId}
+        a.alert_called_id = ${alertId} and c.resources_id = ${carId}  ORDER BY c.rec_date LIMIT 1
     </select>
 
     <select id="getPowerDataCar" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerData">

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FusionController.java

@@ -57,6 +57,44 @@ public class FusionController extends BaseController {
 	}
 
 	/**
+	 *
+	 *
+	 * 800M40M	录音文件
+	 *
+	 * */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST",value = "800M40M录音文件",   notes = "800M40M录音文件")
+	@PostMapping (value = "/getCarList")
+	public ResponseModel<JSONObject> getCarList(
+
+			@RequestParam(value = "curPage", required = false) Integer  curPage,
+			@RequestParam(value = "pageRows", required = false) Integer  pageRows,
+			@RequestParam(value = "beginTime", required = false) String  beginTime,
+			@RequestParam(value = "endTime", required = false) String endTime,
+			@RequestParam(value = "beginLongTime", required = false) String beginLongTime,
+			@RequestParam(value = "endLongTime", required = false) String endLongTime,
+			@RequestParam(value = "number", required = false) String  number,
+			@RequestParam(value = "callType", required = false) Integer callType
+
+
+	) {
+		JSONObject carList = fusionService.selectAudioVideoRecords(    curPage,
+				  pageRows,
+				  beginTime,
+				 endTime,
+				 beginLongTime,
+				 endLongTime,
+				  number,
+				 callType);
+		return ResponseHelper.buildResponse(carList);
+	}
+
+
+
+
+
+
+	/**
 	 * 查询车辆
 	 *
 	 * @return

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FusionServiceImpl.java

@@ -94,6 +94,62 @@ public class FusionServiceImpl implements IFusionService {
         return getResult(jsonObject);
     }
 
+
+
+
+    @Override
+    public JSONObject selectAudioVideoRecords(
+          Integer  curPage,
+          Integer  pageRows,
+          String  beginTime,
+          String endTime,
+          String beginLongTime,
+          String endLongTime,
+          String  number,
+          Integer callType
+
+    ) {
+        MultiValueMap<String, Object> requestEntity = new LinkedMultiValueMap<String, Object>();
+
+
+        if(curPage!=null){
+            requestEntity.add("curPage", curPage);
+        };
+        if(pageRows!=null){
+            requestEntity.add("pageRows", pageRows);
+        };
+        if(beginTime!=null){
+            requestEntity.add("beginTime", beginTime);
+        };
+        if(endTime!=null){
+            requestEntity.add("endTime", endTime);
+        };
+        if(beginLongTime!=null){
+            requestEntity.add("beginLongTime", beginLongTime);
+        };
+        if(endLongTime!=null){
+            requestEntity.add("endLongTime", endLongTime);
+        };
+        if(number!=null){
+            requestEntity.add("number", number);
+        };
+        if(callType!=null){
+            requestEntity.add("callType", callType);
+        };
+
+        JSONObject jsonObject = null;
+        try {
+            jsonObject = RestTemplateUtil.getRestInstance().postForObject(String.format("%s/selectAudioVideoRecords", voiceURL), requestEntity, JSONObject.class);
+        } catch (RestClientException e) {
+            e.printStackTrace();
+            throw new BadRequest("访问融合终端失败");
+        }
+        return jsonObject;
+    }
+
+
+
+
     public Map<String, String> getResult(JSONObject jsonObject) {
         Map<String, String> map = new HashMap<>();
         if (ValidationUtil.isEmpty(jsonObject)) {