tzs 录音列表及区域树

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/VoiceRecordFileMapper.java

@@ -24,4 +24,6 @@ public interface VoiceRecordFileMapper extends BaseMapper<VoiceRecordFile> {
                                                              @Param("workNum") String workNum,
                                                              @Param("sortParam") String sortParam,
                                                              @Param("sortRule") String sortRule);
+
+    VoiceRecordFileDto getRecordById(@Param("sequenceNbr") Long sequenceNbr);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IVoiceRecordFileService.java

@@ -15,4 +15,6 @@ public interface IVoiceRecordFileService {
     void publishRecord(VoiceRecordFileDto model);
 
     Page<VoiceRecordFileDto> queryRecordListByQueryDto(Page<VoiceRecordFileDto> page, String telEndTimeStr, String telEndTimeStr1, String fileType, String tel, String workNum, String sortParam, String sortRule);
+
+    VoiceRecordFileDto getRecordById(Long sequenceNbr);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -544,16 +544,16 @@
 				DATE_SUB(CURDATE(), INTERVAL 7 DAY) <![CDATA[ <= ]]> date(a.call_time)
 			</when>
 			<otherwise>
-				<if test="regionCodes != null">
-					AND a.alert_status = 0
-					AND
-					<foreach collection="regionCodes" index="index" item="item" open="(" separator=" OR " close=")">
-						a.region_code LIKE CONCAT('%', #{item}, '%')
-					</foreach>
-				</if>
+				AND a.alert_status = 0
 			</otherwise>
 
 		</choose>
+		<if test="regionCodes != null">
+			AND
+			<foreach collection="regionCodes" index="index" item="item" open="(" separator=" OR " close=")">
+				a.region_code LIKE CONCAT('%', #{item}, '%')
+			</foreach>
+		</if>
 	</select>
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/VoiceRecordFileMapper.xml

@@ -44,4 +44,27 @@
         </if>
 
     </select>
+
+
+
+    <select id="getRecordById" resultType="com.yeejoin.amos.boot.module.tzs.api.dto.VoiceRecordFileDto">
+        SELECT
+        r.sequence_nbr AS sequenceNbr,
+        r.file_path AS filePath,
+        r.file_type AS fileType,
+        r.tel AS tel,
+        r.tel_start_time AS telStartTime,
+        r.tel_end_time AS telEndTime,
+        r.alert_id AS alertId,
+        r.alert_stage AS alertStage,
+        r.alert_stage_code AS alertStageCode,
+        r.tel_time AS telTime,
+        a.work_order_number AS workNum
+        FROM
+        tz_voice_record_file r
+        LEFT JOIN tz_alert_called a ON a.sequence_nbr =
+        r.alert_id
+        WHERE r.sequence_nbr = #{sequenceNbr}
+
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

@@ -76,6 +76,7 @@ import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -673,12 +674,36 @@ public class AlertCalledController extends BaseController {
 	 *  根据regionCode 获取区域内实时警情
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/getActualAlert")
-	@ApiOperation(httpMethod = "POST", value = "根据regionCode 获取区域内实时警情", notes = "根据regionCode 获取区域内实时警情")
+	@GetMapping(value = "/getActualAlert")
+	@ApiOperation(httpMethod = "GET", value = "根据regionCode 获取区域内实时警情", notes = "根据regionCode 获取区域内实时警情")
 	public ResponseModel<List<AlertPaperInfoDto>> getActualAlert(@RequestParam(name = "regionCodes", required = false) List<String> regionCodes) {
 		 // 警情id 警情地址 警情状态 警情类型 警情发生时间
+		List<String> useRegionCode = tzsAuthService.getUserRegionCode();
 		if(regionCodes == null) {
-			regionCodes = tzsAuthService.getUserRegionCode();
+			regionCodes = useRegionCode;
+		} else {
+			// 判断传入regionCodes 是否越权
+			List<String> tempList = new ArrayList<>();
+			Iterator<String> regionIt =  regionCodes.iterator();
+			while(regionIt.hasNext()) {
+				String tempCode = regionIt.next();
+				String districtCode = tempCode.substring(4,6);
+				if("00".equals(districtCode)) { // 为市
+					if(!useRegionCode.contains(tempCode)) { // 不包含该市权限 需要移除市搜索条件 添加 该市下区搜索条件
+						for(String tempUsercode : useRegionCode) {
+							if(tempUsercode.indexOf(tempCode.substring(0,4)) != -1) {
+								tempList.add(tempUsercode);
+							}
+						}
+						regionIt.remove();
+					}
+				} else { // 为区 不会出现越权情况
+
+				}
+			}
+			for (String t : tempList) {
+				regionCodes.add(t);
+			}
 		}
 		return ResponseHelper.buildResponse(iAlertCalledService.getAlertPaperInfoList(regionCodes,false));
 	}
@@ -687,12 +712,37 @@ public class AlertCalledController extends BaseController {
 	 *  根据regionCode 获取区域内历史警情 七日内
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/getHistoryAlert")
-	@ApiOperation(httpMethod = "POST", value = "根据regionCode 获取区域内七日内历史警情", notes = "根据regionCode 获取区域内七日内历史警情")
+	@GetMapping(value = "/getHistoryAlert")
+	@ApiOperation(httpMethod = "GET", value = "根据regionCode 获取区域内七日内历史警情", notes = "根据regionCode 获取区域内七日内历史警情")
 	public ResponseModel<List<AlertPaperInfoDto>> getHistoryAlert(@RequestParam(name = "regionCodes", required = false) List<String> regionCodes) {
 		// 警情id 警情地址 警情状态 警情类型 警情发生时间
+		// 获取自己的regionCode
+		List<String> useRegionCode = tzsAuthService.getUserRegionCode();
 		if(regionCodes == null) {
-			regionCodes = tzsAuthService.getUserRegionCode();
+			regionCodes = useRegionCode;
+		} else {
+			// 判断传入regionCodes 是否越权
+			List<String> tempList = new ArrayList<>();
+			Iterator<String> regionIt =  regionCodes.iterator();
+			while(regionIt.hasNext()) {
+				String tempCode = regionIt.next();
+				String districtCode = tempCode.substring(4,6);
+				if("00".equals(districtCode)) { // 为市
+					if(!useRegionCode.contains(tempCode)) { // 不包含该市权限 需要移除市搜索条件 添加 该市下区搜索条件
+						for(String tempUsercode : useRegionCode) {
+							if(tempUsercode.indexOf(tempCode.substring(0,4)) != -1) {
+								tempList.add(tempUsercode);
+							}
+						}
+						regionIt.remove();
+					}
+				} else { // 为区 不会出现越权情况
+
+				}
+			}
+			for (String t : tempList) {
+				regionCodes.add(t);
+			}
 		}
 		return ResponseHelper.buildResponse(iAlertCalledService.getAlertPaperInfoList(regionCodes,true));
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java

@@ -259,8 +259,7 @@ public class ElevatorController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/query_elevator_list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "分页查询电梯信息", notes = "分页查询电梯信息")
-    public ResponseModel<IPage<ElevatorDto>> queryElevatorList(String pageNum, String pageSize,
-                                                               com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto elevatorDto) {
+    public ResponseModel<IPage<ElevatorDto>> queryElevatorList(String pageNum, String pageSize,com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto elevatorDto) {
         Elevator elevator = BeanDtoVoUtils.convert(elevatorDto, Elevator.class);
         Page<Elevator> pageBean;
         QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzsAuthController.java

@@ -4,6 +4,8 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.tzs.api.service.TzsAuthService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +18,13 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 特种设备权限controller
@@ -53,7 +61,7 @@ public class TzsAuthController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getUserRegincode")
 	@ApiOperation(httpMethod = "GET", value = "获取用户regionCode", notes = "获取用户regionCode")
-	public ResponseModel<List<String>> getHistoryAlert() {
+	public ResponseModel<List<String>> getUserRegincode() {
 		List<String> regionList = new ArrayList<>();
 		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
 		regionList.add("610100");
@@ -61,4 +69,86 @@ public class TzsAuthController extends BaseController {
 		return ResponseHelper.buildResponse(regionList);
 	}
 
+	/**
+	 *  获取用户组织机构树
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getUserReginTree")
+	@ApiOperation(httpMethod = "GET", value = "获取用户组织机构树", notes = "获取用户组织机构树")
+	public ResponseModel<Collection<RegionModel>> getUserReginTree() {
+		List<String> regionList = new ArrayList<>();
+		regionList.add("610100");
+		regionList.add("610300");
+		regionList.add("610725");
+		regionList.add("610822");
+		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
+		List<RegionModel> tree = (List<RegionModel>) Systemctl.regionClient.queryForTree(null).getResult();
+		// 循环list 将List 封装为 省市区 SET
+		Set<String> city = new HashSet<>();
+		Set<String> district = new HashSet<>();
+		for(String regionCode : regionList) {
+			// 判断是否是某个县
+			String districtCode = regionCode.substring(4,6);
+			if("00".equals(districtCode)) { // 为市
+				city.add(regionCode);
+			} else { // 为区
+				district.add(regionCode);
+			}
+		}
+		// 判断市区是否存在区域码的市，如果存在则移除区
+		Iterator<String> disIt = district.iterator();
+		while(disIt.hasNext()) {
+			String regionCode = disIt.next();
+			String tempCity = regionCode.substring(0,4) + "00";
+			if(city.contains(tempCity)) {
+				disIt.remove();
+			}
+		}
+		// 将tree 转换为K-V形式便于处理
+		Map<Integer, RegionModel> tempMap = new HashMap<Integer, RegionModel>();
+		RegionModel start = tree.get(0); // 省
+		setMap(tempMap,start);
+		List<RegionModel> newTree = new ArrayList<RegionModel>();
+		List<RegionModel> newCity = new ArrayList<RegionModel>();
+		// 如果管理市 取得整个市的数据 如果管理某个县 取得某市某县数据
+		Map<String, RegionModel> tempCityMap = new HashMap<String, RegionModel>();
+		for(String regionCode : district) {
+			// 先拿市 再封装新的城市
+			String cityCode = regionCode.substring(0,4) + "00";
+			RegionModel tempCity = tempCityMap.get(cityCode);
+			if(tempCity == null) {
+				List<RegionModel> tempDisList = new ArrayList<RegionModel>();
+				tempDisList.add(tempMap.get(Integer.parseInt(regionCode)));
+				tempCity = tempMap.get(Integer.parseInt(cityCode));
+				tempCity.setChildren(tempDisList);
+				tempCityMap.put(cityCode,tempCity);
+			} else {
+				List<RegionModel> tempDisList = (List<RegionModel>) tempCity.getChildren();
+				tempDisList.add(tempMap.get(Integer.parseInt(regionCode)));
+			}
+		}
+		for(String regionCode : city) {// 获取城市
+			newCity.add(tempMap.get(Integer.parseInt(regionCode)));
+		}
+		// 拼接城市
+		for(Map.Entry<String, RegionModel> entries : tempCityMap.entrySet()) {
+			newCity.add(entries.getValue());
+		}
+		start.setChildren(newCity);
+		newTree.add(start);
+		return ResponseHelper.buildResponse(newTree);
+	}
+
+	private void setMap(Map<Integer, RegionModel> tempMap, RegionModel start) {
+		tempMap.put(start.getRegionCode(),start);
+		if(start.getChildren() != null) {
+			List<RegionModel> children = (List<RegionModel>) start.getChildren();
+			for (RegionModel temp : children) {
+				setMap(tempMap,temp);
+			}
+		}
+
+	}
+
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/VoiceRecordFileController.java

@@ -58,36 +58,6 @@ public class VoiceRecordFileController extends BaseController {
 	@Autowired
 	AlertCalledServiceImpl iAlertCalledService;
 
-    /**
-     * 新增通话记录附件
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增通话记录附件", notes = "新增通话记录附件")
-	public ResponseModel<VoiceRecordFileDto> save(@RequestBody VoiceRecordFileDto model) {
-		if (ValidationUtil.isEmpty(model.getAlertId())
-				|| ValidationUtil.isEmpty(model.getTel())){
-			throw new BadRequest("参数校验失败.");
-		}
-		Calendar startTime = Calendar.getInstance();
-		Calendar endTime = Calendar.getInstance();
-		endTime.add(Calendar.MINUTE, 6);
-		model.setTelStartTime(startTime.getTime());
-		model.setTelEndTime(endTime.getTime());
-		model.setFilePath(UUID.randomUUID().toString().replace("-",""));
-		model.setFileType("");
-		model.setSourceId(-1l);
-		AlertCalledFormDto alertDto = iAlertCalledService.selectAlertCalledByIdNoCache(model.getAlertId());
-		if(alertDto == null || alertDto.getAlertCalledDto() == null) {
-			throw new BadRequest("未找到相关警情");
-		}
-		model.setAlertStage(alertDto.getAlertCalledDto().getAlertStage());
-		model.setAlertStageCode(alertDto.getAlertCalledDto().getAlertStageCode());
-		model = voiceRecordFileServiceImpl.createWithModel(model);
-		return ResponseHelper.buildResponse(model);
-	}
 
 	/**
 	 * 根据警情id 查找通话记录信息
@@ -112,6 +82,20 @@ public class VoiceRecordFileController extends BaseController {
 		return ResponseHelper.buildResponse(dtoList);
 	}
 
+	/**
+	 * 根据警情id 查找通话记录信息
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "根据id获取通话记录信息",   notes = "根据id获取通话记录信息")
+	@GetMapping(value = "/{sequenceNbr}")
+	public ResponseModel<VoiceRecordFileDto> getRecordById(@PathVariable Long sequenceNbr) {
+
+		VoiceRecordFileDto record = voiceRecordFileServiceImpl.getRecordById(sequenceNbr);
+		return ResponseHelper.buildResponse(record);
+	}
+
 
 	/**
 	 * 新增-通话记录

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsAuthServiceImpl.java

@@ -71,6 +71,7 @@ public class TzsAuthServiceImpl implements TzsAuthService {
         List<String> regionList = new ArrayList<>();
         AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
         regionList.add("610100");
+        regionList.add("610822");
         return regionList;
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/VoiceRecordFileServiceImpl.java

@@ -145,4 +145,10 @@ public class VoiceRecordFileServiceImpl extends BaseService<VoiceRecordFileDto,V
         page1.setRecords(resultDtoList);
         return page1;
     }
+
+    @Override
+    public VoiceRecordFileDto getRecordById(Long sequenceNbr) {
+        VoiceRecordFileDto record = baseMapper.getRecordById(sequenceNbr);
+        return record;
+    }
 }
\ No newline at end of file