新增设备管理接口，新增文件上传相关配置

security-protection-service/pom.xml

@@ -126,6 +126,12 @@
                </exclusion>
            </exclusions>
        </dependency>
        
        <dependency>
			<groupId>com.ai.bss</groupId>
			<version>2.1.5-SNAPSHOT</version>
			<artifactId>components-minio</artifactId>
		</dependency>
        <!-- uspa登录拦截效验-->

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/MonitorSceneManagementController.java

@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.MonitorSceneManagementService;
import com.ai.bss.work.safety.model.MonitorScene;
@@ -42,17 +41,17 @@ public class MonitorSceneManagementController {
	public CommonResponse<List<Map<String, Object>>> queryPageMonitorScene(
			@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		// 当前页数
		//int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// 每页条数
		//int pageSize = attendanceReport.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE: attendanceReport.getPageSize();
		// int pageSize = attendanceReport.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE: attendanceReport.getPageSize();
		int pageNumber = 1;
		int pageSize = 1000;
		
		Map<String, Object> params = new HashMap<>();
		params.put("workOrgId",attendanceReport.getOrgId());
		params.put("monitorSceneType",attendanceReport.getMonitorSceneType());
		
		params.put("workOrgId", attendanceReport.getOrgId());
		// params.put("monitorSceneType",attendanceReport.getMonitorSceneType());
		CommonResponse<List<Map<String, Object>>> commonResponse = monitorSceneManagementService
				.queryPageMonitorScene(params, pageNumber, pageSize);
@@ -66,8 +65,8 @@ public class MonitorSceneManagementController {
	 */
	@ResponseBody
	@RequestMapping("/queryMonitorSceneLayoutList")
	public CommonResponse<List<CharacteristicSpecValue>> queryMonitorSceneLayoutList() {
		List<CharacteristicSpecValue> resultList = monitorSceneManagementService.queryMonitorSceneLayoutList();
	public CommonResponse<List<Map<String, String>>> queryMonitorSceneLayoutList() {
		List<Map<String, String>> resultList = monitorSceneManagementService.queryMonitorSceneLayoutList();
		return CommonResponse.ok(resultList);
	}
@@ -80,8 +79,7 @@ public class MonitorSceneManagementController {
	 */
	@ResponseBody
	@RequestMapping("/queryOneMonitorScene")
	public CommonResponse<MonitorScene> queryOneMonitorScene(@RequestParam String monitorSceneId)
			throws Exception {
	public CommonResponse<MonitorScene> queryOneMonitorScene(@RequestParam String monitorSceneId) throws Exception {
		if (StringUtils.isEmpty(monitorSceneId)) {
			return CommonResponse.fail("500", "操作失败");
		}
@@ -98,7 +96,7 @@ public class MonitorSceneManagementController {
	 */
	@ResponseBody
	@RequestMapping("/createMonitorScene")
	public CommonResponse<Void> createMonitorScene(@RequestBody MonitorScene monitorScene) throws Throwable {
	public CommonResponse<MonitorScene> createMonitorScene(@RequestBody MonitorScene monitorScene) throws Throwable {
		if (monitorScene == null || StringUtils.isEmpty(monitorScene.getMonitorSceneName())) {
			return CommonResponse.fail("500", "新增失败");
		}
@@ -115,8 +113,9 @@ public class MonitorSceneManagementController {
	 */
	@ResponseBody
	@RequestMapping("/modifyMonitorScene")
	public CommonResponse<Void> modifyMonitorScene(@RequestBody MonitorScene monitorScene) throws Throwable {
		if (monitorScene == null || monitorScene.getMonitorSceneId() == null|| StringUtils.isEmpty(monitorScene.getMonitorSceneName())) {
	public CommonResponse<MonitorScene> modifyMonitorScene(@RequestBody MonitorScene monitorScene) throws Throwable {
		if (monitorScene == null || monitorScene.getMonitorSceneId() == null
				|| StringUtils.isEmpty(monitorScene.getMonitorSceneName())) {
			return CommonResponse.fail("500", "修改失败");
		}

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/ResourceToolManageController.java

@@ -0,0 +1,142 @@
package com.ai.bss.security.protection.controller;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.model.AttendanceReport;
import com.ai.bss.security.protection.service.interfaces.ResourceToolManageService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.tool.model.ResourceTool;
/**
 * 设备管理
 * @author konghl@asiainfo.com
 * 2020-12-10
 */
@Controller
@RequestMapping("/resourceTool")
public class ResourceToolManageController {
	@Autowired
	private ResourceToolManageService ResourceToolManageService;
	/**
	 * 分页查询设备信息
	 * @param attendanceReport
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryPageResourceTool")
	public CommonResponse<PageBean<Map<String, Object>>> queryPageResourceTool(
			@ModelAttribute AttendanceReport attendanceReport) throws Exception {
		// 当前页数
		int pageNumber = attendanceReport.getPageNumber() < 1 ? 1 : attendanceReport.getPageNumber();
		// 每页条数
		int pageSize = attendanceReport.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE
				: attendanceReport.getPageSize();
		HashMap<String, Object> params = new HashMap<>();
		params.put("resourceToolType", attendanceReport.getTypeId());
		params.put("resourceToolNameAsLike", attendanceReport.getNameAsLike());
		params.put("resourceToolCodeAsLike", attendanceReport.getCode());
		return ResourceToolManageService.queryPageResourceTool(params, pageNumber, pageSize);
	}
	/**
	 * 获取监控设备的类型
	 * @return
	 */
	@ResponseBody
	@RequestMapping("/queryResourceToolType")
	public CommonResponse<List<Map<String, String>>> queryResourceToolType() {
		List<Map<String, String>> resultList = ResourceToolManageService.queryResourceToolType();
		return CommonResponse.ok(resultList);
	}
	/**
	 * 查询单个设备
	 * @param resourceToolId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryOneResourceTool")
	public CommonResponse<Map<String, Object>> queryOneResourceTool(@RequestParam String resourceToolId)
			throws Exception {
		if (StringUtils.isEmpty(resourceToolId)) {
			return CommonResponse.fail("500", "操作失败");
		}
		return ResourceToolManageService.queryOneResourceTool(resourceToolId);
	}
	/**
	 * 创建设备
	 * @param resourceTool
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/createResourceTool")
	public CommonResponse<ResourceTool> createResourceTool(@RequestParam(value="file",required=false) MultipartFile meFile, ResourceTool resourceTool) throws Exception {
		if (resourceTool == null || StringUtils.isEmpty(resourceTool.getResourceToolCode())
				|| StringUtils.isEmpty(resourceTool.getResourceToolName())) {
			return CommonResponse.fail("500", "新增失败");
		}
		return ResourceToolManageService.createResourceTool(meFile,resourceTool);
	}
	/**
	 * 修改设备
	 * @param resourceTool
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/modifyResourceTool")
	public CommonResponse<ResourceTool> modifyResourceTool(@RequestParam(value="file",required=false) MultipartFile meFile, ResourceTool resourceTool) throws Exception {
		if (resourceTool == null || resourceTool.getResourceToolId() == null
				|| StringUtils.isEmpty(resourceTool.getResourceToolCode())
				|| StringUtils.isEmpty(resourceTool.getResourceToolName())) {
			return CommonResponse.fail("500", "修改失败");
		}
		return ResourceToolManageService.modifyResourceTool(meFile,resourceTool);
	}
	/**
	 * 删除设备
	 * @param resourceToolId
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/deleteResourceTool")
	public CommonResponse<Void> deleteResourceTool(@RequestParam String resourceToolId) throws Exception {
		if (StringUtils.isEmpty(resourceToolId)) {
			return CommonResponse.fail("500", "删除失败");
		}
		String[] resourceToolIdArray = resourceToolId.split(",");
		List<String> resourceToolIds = Arrays.asList(resourceToolIdArray);
		return ResourceToolManageService.deleteResourceTool(resourceToolIds);
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/model/AttendanceReport.java

@@ -9,16 +9,20 @@ import lombok.Data;
@Data
public class AttendanceReport implements Serializable {
    private  String orgId; //组织id
    private  String id; //主键ID(人员id 个人编码 员工编码)
    private  String orgCode; //组织编码
    private  String code; //编号
    
    private  String nameAsLike; //姓名（模糊）
    private  String id; //人员id 个人编码 员工编码
    private  String orgId; //组织id
    private  String orgCode; //组织编码
    
    private  String mainJobPositionId;  //职位id
    private  String nameAsLike; //姓名（模糊）
    
    private String typeId; //类型
    
    private String workDay; //当前日期
    private String month; //月份
@@ -28,7 +32,7 @@ public class AttendanceReport implements Serializable {
    private String endDay; //结束日期
    
    private String monitorSceneType; //场景大类
    
    int pageNumber = 0; // 当前页数
    int pageSize = 0; // 每页条数

security-protection-service/src/main/java/com/ai/bss/security/protection/model/SecurityProtectionMinioConfig.java

@@ -0,0 +1,24 @@
package com.ai.bss.security.protection.model;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import lombok.Data;
/**
  * @className: MinioConfig
  * @author zengtao
  * @date 2020/12/08 13:43 
  * @description: MinioConfig
  */
@Data
@Component
@ConfigurationProperties(prefix = "myminio")
public class SecurityProtectionMinioConfig {
	private String bucketWorkToolImage;
	private String bucketWorkToolView;
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/CharSpecServiceImpl.java

@@ -55,6 +55,19 @@ public class CharSpecServiceImpl implements CharSpecService {
	}
	@Override
	public String getCharSpecCodeStr(String charSpecCode) {
		List<CharacteristicSpecValue> list = getCharSpecList(charSpecCode);
		StringBuilder resultStr = new StringBuilder();
		for (CharacteristicSpecValue characteristicSpecValue : list) {
			resultStr.append("'").append(characteristicSpecValue.getCode()).append("',");
		}
		resultStr.deleteCharAt(resultStr.length() - 1);
		return resultStr.toString();
	}
	@Override
	public boolean saveCharSpecList(String charSpecCode, Map<String, String> dataMap) {
		List<CharacteristicSpecValue> characteristicSpecList = getCharSpecList(charSpecCode);
@@ -77,4 +90,5 @@ public class CharSpecServiceImpl implements CharSpecService {
				.saveCharacteristicSpecValue(characteristicSpecList);
		return resultList.size() > 0;
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/MonitorSceneManagementServiceImpl.java

@@ -1,6 +1,7 @@
package com.ai.bss.security.protection.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -14,6 +15,7 @@ import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.MonitorSceneManagementService;
import com.ai.bss.security.protection.utils.DateUtil;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.safety.model.MonitorScene;
import com.ai.bss.work.safety.service.api.MonitorSceneCommand;
@@ -43,18 +45,32 @@ public class MonitorSceneManagementServiceImpl implements MonitorSceneManagement
			return CommonResponse.ok(new ArrayList<Map<String, Object>>());
		}
		Map<String, String> allLayoutMap = charSpecService
				.getCharSpecMap(EbcConstant.BUSINESS_SPEC_MONITOR_VIEW_LAYOUT);
		Map<String, String> allSceneTypeMap = charSpecService
				.getCharSpecMap(EbcConstant.BUSINESS_SPEC_MONITOR_SCENE_TYPE);
		for (Map<String, Object> map : list) {
			map.put("monitorViewLayoutName", allLayoutMap.get(map.get("monitorViewLayout")));
			map.put("monitorSceneTypeName", allSceneTypeMap.get(map.get("monitorSceneType")));
			map.put("createDate", DateUtil.formatObjectToDate(map.get("createDate")));
			map.put("doneDate", DateUtil.formatObjectToDate(map.get("doneDate")));
		}
		return CommonResponse.ok(list);
	}
	@Override
	public List<CharacteristicSpecValue> queryMonitorSceneLayoutList() {
		return charSpecService.getCharSpecList(EbcConstant.BUSINESS_SPEC_MONITOR_VIEW_LAYOUT);
	public List<Map<String, String>> queryMonitorSceneLayoutList() {
		List<CharacteristicSpecValue> characteristicSpecList = charSpecService
				.getCharSpecList(EbcConstant.BUSINESS_SPEC_MONITOR_VIEW_LAYOUT);
		List<Map<String, String>> resultList = new ArrayList<Map<String, String>>();
		for (CharacteristicSpecValue characteristicSpecValue : characteristicSpecList) {
			Map<String, String> map = new HashMap<String, String>();
			map.put("layoutCode", characteristicSpecValue.getCode());
			map.put("layoutName", characteristicSpecValue.getValue());
			resultList.add(map);
		}
		return resultList;
	}
	@Override
@@ -64,27 +80,17 @@ public class MonitorSceneManagementServiceImpl implements MonitorSceneManagement
	}
	@Override
	public CommonResponse<Void> createMonitorScene(MonitorScene monitorScene) {
	public CommonResponse<MonitorScene> createMonitorScene(MonitorScene monitorScene) {
		monitorScene.setMonitorSceneType(MonitorScene.MONITOR_SCENE_TYPE_MONITOR);
		CommonRequest<MonitorScene> request = new CommonRequest<MonitorScene>(monitorScene);
		CommonResponse<MonitorScene> response = monitorSceneCommand.createMonitorScene(request);
		if (response.isSuccess()) {
			return CommonResponse.ok(null);
		} else {
			return CommonResponse.fail(response.getFail());
		}
		return monitorSceneCommand.createMonitorScene(request);
	}
	@Override
	public CommonResponse<Void> modifyMonitorScene(MonitorScene monitorScene) {
	public CommonResponse<MonitorScene> modifyMonitorScene(MonitorScene monitorScene) {
		monitorScene.setMonitorSceneType(MonitorScene.MONITOR_SCENE_TYPE_MONITOR);
		CommonRequest<MonitorScene> request = new CommonRequest<MonitorScene>(monitorScene);
		CommonResponse<MonitorScene> response = monitorSceneCommand.modifyMonitorScene(request);
		if (response.isSuccess()) {
			return CommonResponse.ok(null);
		} else {
			return CommonResponse.fail(response.getFail());
		}
		return monitorSceneCommand.modifyMonitorScene(request);
	}
	@Override

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/ResourceToolManageServiceImpl.java

@@ -0,0 +1,176 @@
package com.ai.bss.security.protection.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.minio.service.MinioService;
import com.ai.bss.security.protection.model.SecurityProtectionMinioConfig;
import com.ai.bss.security.protection.service.interfaces.CharSpecService;
import com.ai.bss.security.protection.service.interfaces.ResourceToolManageService;
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.service.api.ResourceToolCommand;
import com.ai.bss.work.tool.service.api.ResourceToolQuery;
import cn.hutool.core.lang.UUID;
@Service
public class ResourceToolManageServiceImpl implements ResourceToolManageService {
	@Autowired
	private ResourceToolCommand resourceToolCommand;
	@Autowired
	private ResourceToolQuery resourceToolQuery;
	@Autowired
	private MinioService minioService;
	@Autowired
	private SecurityProtectionMinioConfig minioConfig;
	@Autowired
	private CharSpecService charSpecService;
	@Override
	public CommonResponse<PageBean<Map<String, Object>>> queryPageResourceTool(HashMap<String, Object> params,
			int pageNumber, int pageSize) throws Exception {
		// 查询监控设备
		params.put("isMonitorSceneTool", "1");
		if (params.get("resourceToolType") == null || StringUtils.isBlank(params.get("resourceToolType").toString())) {
			String resourceToolTypeListStr = charSpecService
					.getCharSpecCodeStr(EbcConstant.BUSINESS_SPEC_MONITOR_SCENE_TYPE);
			params.put("resourceToolTypeListStr", resourceToolTypeListStr);
		}
		CommonRequest<HashMap<String, Object>> conditionMap = new CommonRequest<HashMap<String, Object>>(params,
				pageNumber, pageSize);
		CommonResponse<PageBean<Map<String, Object>>> response = resourceToolQuery
				.queryWorkToolByConditions(conditionMap);
		List<Map<String, Object>> list = response.getData().getData();
		if (CollectionUtils.isEmpty(list)) {
			return response;
		}
		Map<String, String> allresourceToolTypeMap = charSpecService
				.getCharSpecMap(EbcConstant.BUSINESS_SPEC_MONITOR_SCENE_TYPE);
		for (Map<String, Object> map : list) {
			map.put("resourceToolTypeName", allresourceToolTypeMap.get(map.get("resourceToolType")));
		}
		return response;
	}
	@Override
	public List<Map<String, String>> queryResourceToolType() {
		List<CharacteristicSpecValue> characteristicSpecList = charSpecService
				.getCharSpecList(EbcConstant.BUSINESS_SPEC_MONITOR_SCENE_TYPE);
		List<Map<String, String>> resultList = new ArrayList<Map<String, String>>();
		for (CharacteristicSpecValue characteristicSpecValue : characteristicSpecList) {
			Map<String, String> map = new HashMap<String, String>();
			map.put("id", characteristicSpecValue.getCode());
			map.put("name", characteristicSpecValue.getValue());
			resultList.add(map);
		}
		return resultList;
	}
	@Override
	public CommonResponse<Map<String, Object>> queryOneResourceTool(String resourceToolId) throws Exception {
		HashMap<String, Object> params = new HashMap<String, Object>();
		// 查询监控设备
		params.put("isMonitorSceneTool", "1");
		params.put("resourceToolId", resourceToolId);
		CommonRequest<HashMap<String, Object>> conditionMap = new CommonRequest<HashMap<String, Object>>(params, 1, 10);
		CommonResponse<PageBean<Map<String, Object>>> response = resourceToolQuery
				.queryWorkToolByConditions(conditionMap);
		if (CollectionUtils.isEmpty(response.getData().getData())
				|| CollectionUtils.isEmpty(response.getData().getData().get(0))) {
			return response.fail("504", "获取设备信息失败");
		}
		Map<String, Object> resultMap = response.getData().getData().get(0);
		List<CharacteristicSpecValue> characteristicSpecList = charSpecService
				.getCharSpecList(EbcConstant.BUSINESS_SPEC_MONITOR_SCENE_TYPE);
		for (CharacteristicSpecValue characteristicSpecValue : characteristicSpecList) {
			if (characteristicSpecValue.getCode().equals(String.valueOf(resultMap.get("resourceToolType")))) {
				resultMap.put("resourceToolTypeName", characteristicSpecValue.getValue());
			}
		}
		if (resultMap.get("pictureUrl") == null || "#".equals(resultMap.get("pictureUrl").toString())) {
			resultMap.put("toolPictureUrl", "");
		} else {
			String pictureUrl = minioService.getObjectUrl(minioConfig.getBucketWorkToolImage(),
					resultMap.get("pictureUrl").toString());
			resultMap.put("toolPictureUrl", pictureUrl);
		}
		return CommonResponse.ok(resultMap);
	}
	@Override
	public CommonResponse<ResourceTool> createResourceTool(MultipartFile meFile, ResourceTool resourceTool) {
		if (meFile != null) {
			String fileName = meFile.getOriginalFilename();
			String fileType = fileName.substring(fileName.lastIndexOf("."), fileName.length());
			String minioFileName = UUID.fastUUID().toString() + fileType;
			minioService.putObject(minioConfig.getBucketWorkToolImage(), meFile, minioFileName);
			resourceTool.setPictureUrl(minioFileName);
		} else {
			resourceTool.setPictureUrl("#");
		}
		resourceTool.setVideoUrl("#");
		CommonRequest<ResourceTool> request = new CommonRequest<ResourceTool>(resourceTool);
		return resourceToolCommand.saveWorkToolWithNoMapArea(request);
	}
	@Override
	public CommonResponse<ResourceTool> modifyResourceTool(MultipartFile meFile, ResourceTool resourceTool) {
		if (meFile != null) {
			String fileName = meFile.getOriginalFilename();
			String fileType = fileName.substring(fileName.lastIndexOf("."), fileName.length());
			String minioFileName = UUID.fastUUID().toString() + fileType;
			minioService.putObject(minioConfig.getBucketWorkToolImage(), meFile, minioFileName);
			/*if (StringUtils.isNotBlank(resourceTool.getPictureUrl()) && !"#".equals(resourceTool.getPictureUrl())) {
				minioService.removeObject(minioConfig.getBucketWorkToolImage(), resourceTool.getPictureUrl());
			}*/
			resourceTool.setPictureUrl(minioFileName);
		}
		CommonRequest<ResourceTool> request = new CommonRequest<ResourceTool>(resourceTool);
		return resourceToolCommand.saveWorkToolWithNoMapArea(request);
	}
	@Override
	public CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds) {
		CommonRequest<List<String>> request = new CommonRequest<List<String>>(resourceToolIds);
		CommonResponse<ResourceTool> response = resourceToolCommand.deleteWorkTool(request);
		if (response.isSuccess()) {
			return CommonResponse.ok(null);
		} else {
			return CommonResponse.fail(response.getFail());
		}
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/CharSpecService.java

@@ -24,6 +24,13 @@ public interface CharSpecService {
	Map<String, String> getCharSpecMap(String charSpecCode);
	/**
	 * 根据特征属性编码获取对应的属性值，并以'code1','code2'的形式拼接为字符串，用于in查询
	 * @param charSpecCode
	 * @return
	 */
	String getCharSpecCodeStr(String charSpecCode);
	
	/**
	 * 批量修改属性值
	 * @param charSpecCode 特征属性编码
	 * @param dataMap 需修改的数据(code—>value)

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/MonitorSceneManagementService.java

@@ -4,7 +4,6 @@ import java.util.List;
import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.characteristic.spec.model.CharacteristicSpecValue;
import com.ai.bss.work.safety.model.MonitorScene;
public interface MonitorSceneManagementService {
@@ -24,7 +23,7 @@ public interface MonitorSceneManagementService {
	 * 获取所有布局
	 * @return
	 */
	List<CharacteristicSpecValue> queryMonitorSceneLayoutList();
	List<Map<String, String>> queryMonitorSceneLayoutList();
	/**
	 * 查询单个监控场景
@@ -38,14 +37,14 @@ public interface MonitorSceneManagementService {
	 * @param monitorScene
	 * @return
	 */
	CommonResponse<Void> createMonitorScene(MonitorScene monitorScene);
	CommonResponse<MonitorScene> createMonitorScene(MonitorScene monitorScene);
	/**
	 * 修改监控场景
	 * @param monitorScene
	 * @return
	 */
	CommonResponse<Void> modifyMonitorScene(MonitorScene monitorScene);
	CommonResponse<MonitorScene> modifyMonitorScene(MonitorScene monitorScene);
	/**
	 * 删除监控场景

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/ResourceToolManageService.java

@@ -0,0 +1,66 @@
package com.ai.bss.security.protection.service.interfaces;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.web.multipart.MultipartFile;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.work.tool.model.ResourceTool;
/**
 * 设备管理
 * @author konghl@asiainfo.com
 * 2020-12-10
 */
public interface ResourceToolManageService {
	/**
	 * 分页查询设备信息
	 * @param params
	 * @param pageNumber
	 * @param pageSize
	 * @return
	 * @throws Exception
	 */
	CommonResponse<PageBean<Map<String, Object>>> queryPageResourceTool(HashMap<String, Object> params, int pageNumber,
			int pageSize) throws Exception;
	/**
	    * 获取所有设备类型
	 * @return
	 * @throws Exception
	 */
	List<Map<String, String>> queryResourceToolType();
	/**
	 * 查询单个设备
	 * @param resourceToolId
	 * @return
	 */
	CommonResponse<Map<String, Object>> queryOneResourceTool(String resourceToolId) throws Exception;
	/**
	 * 创建设备信息
	 * @param resourceTool
	 * @return
	 */
	CommonResponse<ResourceTool> createResourceTool(MultipartFile meFile,ResourceTool resourceTool);
	/**
	 * 修改设备信息
	 * @param resourceTool
	 * @return
	 */
	CommonResponse<ResourceTool> modifyResourceTool(MultipartFile meFile,ResourceTool resourceTool);
	/**
	 * 删除设备信息
	 * @param resourceToolIds
	 * @return
	 */
	CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds);
}

security-protection-service/src/main/java/com/ai/bss/security/protection/utils/EbcConstant.java

@@ -24,9 +24,9 @@ public class EbcConstant {
	// 特征表获得职务打卡状态code
	public static final String CLOCKING_STATUS = "CLOCKING_STATUS";
	// 轨迹回放单次查询条数
	public static final int TRACK_PLAYBACK_SIZE = 100;
	// 工单审批的角色CODE
	public static final String WORK_ORDER_CHECK_ROLE_CODE = "approval";
	
	// 考勤查询：日
	public static final String AREA_IN_OUT_RECORD_DAY = "day";
@@ -41,9 +41,9 @@ public class EbcConstant {
	
	// 静态常量: 监控视频布局
	public static final String BUSINESS_SPEC_MONITOR_VIEW_LAYOUT = "MONITOR_VIEW_LAYOUT";
	// 工单审批的角色CODE
	public static final String WORK_ORDER_CHECK_ROLE_CODE = "approval";
	
	// 静态常量: 监控场景类型
	public static final String BUSINESS_SPEC_MONITOR_SCENE_TYPE = "MONITOR_SCENE_TYPE";
	
	// 当前登录者的STAFF_ID
@@ -55,4 +55,5 @@ public class EbcConstant {
	// 当前登录者部门
	public static String USPA_USER_ORG_CODE = "0000";
	
}

security-protection-service/src/main/resources/application.properties

@@ -57,6 +57,9 @@ minio.faceAddServiceUrl=http://10.21.10.28:9018/api/face/add
minio.face-del-service-url=http://10.21.10.28:9018/api/face/del
minio.face-recog-service-url=http://10.21.10.28:9018/api/face/recog
myminio.bucketWorkToolImage=tool-image
myminio.bucketWorkToolView=tool-view
# CACHE
#spring.cache.type=ehcache
#spring.cache.ehcache.config=ehcache.xml