Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git

ebc-mock-service/src/main/java/com/ai/bss/mock/service/impl/MockProcessImpl.java

@@ -36,7 +36,8 @@ public class MockProcessImpl implements MockProcess {
    private static final int PORT = 8042;
//    private static String kafkaServers = "47.105.160.21:9090";
    private static String kafkaServers = "10.19.90.34:9090";
   // private static String kafkaServers = "10.19.90.34:9090";
    private static String kafkaServers = "10.1.194.17:9092";
    @Value("${kafka.producer.servers}")
    private static String servers;

ebc-mock-service/src/main/java/com/ai/bss/mock/utils/KafkaProducerConfig.java

@@ -26,7 +26,8 @@ public class KafkaProducerConfig {
    @Value("${kafka.producer.servers:Empty}")
//    private static String servers = "47.105.160.21:9090";
    private static String servers = "10.19.90.34:9090";
    //private static String servers = "10.19.90.34:9090";
    private static String servers = "10.1.194.17:9092";
    @Value("${kafka.producer.retries:0}")
    private  int retries;
    @Value("${kafka.producer.batch.size:4096}")
@@ -110,4 +111,4 @@ public class KafkaProducerConfig {
        }
        return true;
    }
}
}

ebc-mock-service/src/main/resources/application.properties

@@ -15,10 +15,10 @@ server.port=8086
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=cmp
#spring.datasource.password=cmp@123
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.url=jdbc:mysql://10.1.252.196:3306/energy?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=ebc
spring.datasource.password=ebc@123
spring.datasource.username=root
spring.datasource.password=asdsadadaUda4u!@
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
#spring.jpa.database=default
@@ -41,8 +41,12 @@ logging.level.org.springframework.data=info
#============== kafka ===================
kafka.consumer.zookeeper.connect=47.105.160.21:2100
kafka.consumer.servers=47.105.160.21:9090
#kafka.consumer.zookeeper.connect=47.105.160.21:2100
#kafka.consumer.servers=47.105.160.21:9090
kafka.consumer.zookeeper.connect=10.1.194.17:2181
kafka.consumer.servers=10.1.194.17:9092
kafka.consumer.enable.auto.commit=true
kafka.consumer.session.timeout=6000
kafka.consumer.auto.commit.interval=100
@@ -51,9 +55,11 @@ kafka.consumer.topic=productMessage
kafka.consumer.group.id=productMessage
kafka.consumer.concurrency=10
kafka.producer.servers=47.105.160.21:9090
#kafka.producer.servers=47.105.160.21:9090
kafka.producer.servers=10.1.194.17:9092
kafka.producer.retries=0
kafka.producer.batch.size=4096
kafka.producer.linger=1
kafka.producer.buffer.memory=40960
kafka.producer.topic=67message
kafka.producer.topic=67message

ebc-mock-service/src/test/resources/application.properties

@@ -11,10 +11,11 @@ server.port=8086
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=comon_frm
#spring.datasource.password=1qaz@WSX
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?useUnicode=true&ampcharacterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
#spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?useUnicode=true&ampcharacterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.url=jdbc:mysql://10.1.252.196:3306/energy?useUnicode=true&ampcharacterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=ebc
spring.datasource.password=ebc@123
spring.datasource.username=root
spring.datasource.password=asdsadadaUda4u!@
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
#spring.jpa.database=default
@@ -31,4 +32,4 @@ spring.main.allow-bean-definition-overriding=true
# LOGGING
logging.level.com.ai=info
logging.level.org.springframework.data=info
logging.level.org.springframework.data=info

location-rescue-service/src/main/java/com/ai/bss/location/rescue/config/MyCorsFilter.java

@@ -53,11 +53,12 @@ public class MyCorsFilter {
    public FilterRegistrationBean mySessionUserFilter(){
        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
        registrationBean.setFilter(new SessionUserFilter());
        registrationBean.setUrlPatterns(Arrays.asList("/*"));
        registrationBean.setUrlPatterns(Arrays.asList("/sfsdafsadf"));
        Map<String, String> initParameters = new HashMap<String,String>();
        initParameters.put("impl-classname","com.ai.sso.external.DefaultPopedomImpl");
        initParameters.put("ALLOWPATH","gif;jpg;jpeg;png;login;checkLogin;genVerificationCode;logout;stomp;");
        registrationBean.setInitParameters(initParameters);
        return registrationBean;
    }
}

location-rescue-service/src/main/java/com/ai/bss/location/rescue/util/NorthboundInterfaceUtil.java

@@ -29,7 +29,7 @@ public class NorthboundInterfaceUtil {
    @Value("${aap.iot.passWord:123456}")
    private String passWord;
    @Value("${url.iot.login:http://60.205.219.67:80/sso/login}")
    @Value("${url.iot.login:http://60.205.219.67:80/sso}")
    private String iotLoginUrl;
    @Value("${url.iot.service:http://60.205.219.67:80/dmp/terminalNorthApi/}")

location-rescue-service/src/main/resources/application.properties

@@ -7,10 +7,14 @@ server.servlet.context-path=/lr
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
#spring.datasource.url=jdbc:mysql://localhost:3306/cmp
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
#spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=ebc
#spring.datasource.password=ebc@123
spring.datasource.url=jdbc:mysql://10.1.252.196:3306/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=ebc
spring.datasource.password=ebc@123
spring.datasource.username=root
spring.datasource.password=asdsadadaUda4u!@
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
#spring.jpa.database=default
@@ -24,9 +28,10 @@ spring.main.allow-bean-definition-overriding=true
#kafka
#kafka.bootstrap-servers=47.105.160.21:9090
#http://10.19.90.34:8187/mock/startMackData?sId=26&f=5&topic0=DeviceLocationA&topic1=IndividualAlarmA
kafka.bootstrap-servers=10.19.90.34:9090
kafka.topic.deviceLocation=Topic_IoT_DeviceLocation_1
kafka.topic.alarm=Topic_IoT_IndividualAlarm_1
#kafka.bootstrap-servers=10.19.90.34:9090
kafka.bootstrap-servers=10.1.194.17:9092
kafka.topic.deviceLocation=Topic_IoT_DeviceLocation
kafka.topic.alarm=Topic_IoT_IndividualAlarm
#kafka.topic.deviceLocation=DeviceLocationA
#kafka.topic.alarm=IndividualAlarmA
kafka.producer.batch-size=16785
@@ -45,8 +50,8 @@ kafka.listener.concurrencys=3,6
kafka.listener.poll-timeout=1500
#minio
minio.endpoint=http://10.19.90.34
minio.port=19000
minio.endpoint=http://10.1.194.18
minio.port=9000
minio.accessKey=minioadmin
minio.secretKey=minioadmin
minio.secure=false
@@ -67,7 +72,7 @@ logging.level.org.springframework.data=debug
# \u5f15\u5165gis\u548ciot\u7684\u914d\u7f6e\u6587\u4ef6
spring.profiles.active=iot,gis
uspa.login.url=http://10.19.90.34:20000/usermng/login
uspa.login.url=http://10.1.194.17:20000/usermng/login
uspa.login.vercode=Hiz#8uAqkjhoPmXu8%aaa
uspa.login.menuUrl=http://10.19.90.34:20000/usermng/process/com.wframe.usermanager.services.impl.QueryMenuByUser
uspa.login.menuUrl=http://10.1.194.17:20000/usermng/process/com.wframe.usermanager.services.impl.QueryMenuByUser

location-rescue-service/src/main/resources/ipu-cache.xml

@@ -9,12 +9,13 @@
	       <!-- <server ip="121.42.183.206" port="7104" /> -->
	       <!-- <server ip="121.42.183.206" port="7105" /> -->
	       <!-- <server ip="121.42.183.206" port="7106" /> -->
			<server ip="10.19.90.34" port="6379" />
<!--			<server ip="10.19.90.34" port="6379" />-->
			<server ip="10.1.194.17" port="6379" />
	    </servers>
		<!-- 客户端类型:Jedis,JedisCluster -->
	    <config name="clientType" value="Jedis"/>
	    <!-- 访问redis的密码，可以为空 -->
	    <config name="auth" value="Ipu@321!"/>
	    <config name="auth" value="ebc@redis"/>
	    <!-- redis池的可用连接实例的最大数目，缺省为8 -->
	    <config name="poolSize" value="10"/>
	    <!-- redis池最多有多少个状态为idle(空闲的)的jedis实例，缺省为8,空闲连接大于这个数会进行回收 -->
@@ -28,7 +29,7 @@
	    <!-- 出现异常最大重试次数 -->
	    <config name="maxAttempts"/>
	</cache>
	
	<cache name="SSN_CACHE" type="redis">
		<servers>
	        <!-- 如果不是cluster，则只使用第一个redis -->
@@ -56,7 +57,7 @@
	    <!-- 出现异常最大重试次数 -->
	    <config name="maxAttempts"/>
	</cache>
	
	<cache name="client_route" type="redis">
		<servers>
	        <!-- 如果不是cluster，则只使用第一个redis -->
@@ -84,7 +85,7 @@
	    <!-- 出现异常最大重试次数 -->
	    <config name="maxAttempts"/>
	</cache>
	
	<cache name="pushServer_route" type="redis">
		<servers>
	        <!-- 如果不是cluster，则只使用第一个redis -->
@@ -112,4 +113,4 @@
	    <!-- 出现异常最大重试次数 -->
	    <config name="maxAttempts"/>
	</cache>
</caches>
</caches>

location-rescue-service/src/main/resources/sso.properties

@@ -15,7 +15,7 @@ COOKIE_MAXAGE=-1
TENANT_REGISTER_CLASS=com.ai.customermanager.services.impl.CustRegisterVercodeImpl
##\u8fdc\u7a0b\u7f13\u5b58\u8c03\u7528\u7c7b\uff0c\u8fd9\u4e2a\u7c7b\u5fc5\u987b\u6709\u4e09\u4e2a\u51fd\u6570 
##\u8fdc\u7a0b\u7f13\u5b58\u8c03\u7528\u7c7b\uff0c\u8fd9\u4e2a\u7c7b\u5fc5\u987b\u6709\u4e09\u4e2a\u51fd\u6570
##    public boolean set(String key,String value)
##    public String get(String key)
##    public boolean del(String key);
@@ -53,8 +53,8 @@ RETURN_TAG={"MESSAGE":"NOLOGIN","CODE":999999,"FLAG":"FAIL","RESULT":{"URL":"htt
#redis.single=10.11.20.117:6379
#redis.password=luMZulgbotmo71aa
redis.single=10.19.90.34:6379
redis.password=Ipu@321!
redis.single=10.1.194.17:6379
redis.password=ebc@redis
redis.pool.maxTotal=1000
redis.pool.minIdle=5
@@ -68,7 +68,7 @@ redis.pool.timeBetweenEvictionRunsMillis=10000
SESSION_DEFAULT_VERCODE=Hiz#8uAqkjhoPmXu8%aaa
#\u662f\u5426\u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236 1 \u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236 
#\u662f\u5426\u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236 1 \u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236
is_check_interface=0
@@ -78,4 +78,4 @@ is_check_interface=0
USER_LOGIN_AUTH_CLASS=com.wframe.usermanager.services.impl.UserLoginAuthImpl
#USER_LOGIN_AUTH_CLASS=com.wframe.msgmanager.services.impl.UserLoginByTokenImpl
#USER_LOGIN_AUTH_CLASS=com.wframe.msgmanager.services.impl.UserLoginByToken4XblImpl
SIGN_KEY_CODE=TENANT_CODE
SIGN_KEY_CODE=TENANT_CODE

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/model/AlarmIdenResultDto.java

@@ -11,6 +11,6 @@ public class AlarmIdenResultDto implements Serializable {
    private String alarmType;
    private String alarmMemo;
    private String alarmEmployeeRoleId;
    private int[] box;
    private double[] box;
}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/model/FaceIdenResultDto.java

@@ -14,6 +14,6 @@ public class FaceIdenResultDto implements Serializable {
    private int isMatch;
    private int[] box;
    private double[] box;
}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/aiIden/ClothingCodeAiIden.java

@@ -86,7 +86,7 @@ public class ClothingCodeAiIden implements AiIdenInterfaces {
					idenResultDto.setAlarmType("");
					idenResultDto.setAlarmMemo("已穿工作服");
					int[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					double[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					idenResultDto.setBox(boxIntArr);
					successList.add(idenResultDto);
@@ -99,7 +99,7 @@ public class ClothingCodeAiIden implements AiIdenInterfaces {
					idenResultDto.setAlarmType(MonitorManageConsts.AI_ALARM_TYPE_WEA);
					idenResultDto.setAlarmMemo("未穿工作服");
					int[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					double[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					idenResultDto.setBox(boxIntArr);
					alarmIdenResultDtosList.add(idenResultDto);

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/aiIden/FaceAiIden.java

@@ -82,7 +82,7 @@ public class FaceAiIden implements AiIdenInterfaces {
					BigDecimal score = resultObject.getBigDecimal("score");
					resultDto.setSimi(score.setScale(4, BigDecimal.ROUND_HALF_UP).floatValue());
					int[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					double[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					resultDto.setBox(boxIntArr);
					aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT);
@@ -97,7 +97,7 @@ public class FaceAiIden implements AiIdenInterfaces {
					BigDecimal score = resultObject.getBigDecimal("score");
					resultDto.setSimi(score.setScale(4, BigDecimal.ROUND_HALF_UP).floatValue());
					int[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					double[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					resultDto.setBox(boxIntArr);
					aiIdenLogDto.setRelateEmployeeRoleId(faceId);

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/aiIden/SafetyHelmetAiIden.java

@@ -89,7 +89,7 @@ public class SafetyHelmetAiIden implements AiIdenInterfaces {
					idenResultDto.setAlarmType("");
					idenResultDto.setAlarmMemo("已戴安全帽");
					int[] boxIntArr = AiIdenUtils.getBoxArray(resultObj.getJSONArray("box"), imageParam);
					double[] boxIntArr = AiIdenUtils.getBoxArray(resultObj.getJSONArray("box"), imageParam);
					idenResultDto.setBox(boxIntArr);
					successList.add(idenResultDto);
@@ -102,7 +102,7 @@ public class SafetyHelmetAiIden implements AiIdenInterfaces {
					idenResultDto.setAlarmType(MonitorManageConsts.AI_ALARM_TYPE_WEA);
					idenResultDto.setAlarmMemo("未戴安全帽");
					int[] boxIntArr = AiIdenUtils.getBoxArray(resultObj.getJSONArray("box"), imageParam);
					double[] boxIntArr = AiIdenUtils.getBoxArray(resultObj.getJSONArray("box"), imageParam);
					idenResultDto.setBox(boxIntArr);
					alarmIdenResultDtosList.add(idenResultDto);

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/aiIden/SmokeAiIden.java

@@ -77,7 +77,7 @@ public class SmokeAiIden implements AiIdenInterfaces {
				idenResultDto.setAlarmMemo("违规吸烟");
				JSONObject resultObj = JSONObject.parseObject(jsonArray.get(i).toString());
				int[] boxIntArr = AiIdenUtils.getBoxArray(resultObj.getJSONArray("box"), imageParam);
				double[] boxIntArr = AiIdenUtils.getBoxArray(resultObj.getJSONArray("box"), imageParam);
				idenResultDto.setBox(boxIntArr);
				alarmIdenResultDtosList.add(idenResultDto);

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/aiIden/StrangerAiIden.java

@@ -31,13 +31,13 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Component
public class StrangerAiIden implements AiIdenInterfaces {
	
	@Autowired
	private EbcAiService ebcAiService;
	
    @Autowired
    private KafkaProcess kafkaProcess;
    
	@Override
	public List<AlarmIdenResultDto> executeAiIden(AiIdenLogDto aiIdenLogDto, String filePath,
			Map<String, Integer> imageParam, boolean isHuman) {
@@ -46,9 +46,9 @@ public class StrangerAiIden implements AiIdenInterfaces {
			log.info("陌生人识别：没有识别到人......");
			return null;
		}
		
		List<AlarmIdenResultDto> alarmIdenResultDtosList = new ArrayList<AlarmIdenResultDto>();
		
		try {
			log.info("开始AI陌生人识别处理......");
			String aiResponseData = ebcAiService.faceAiRecog(ImageBase64Converter.convertFileToBase64(filePath));
@@ -75,35 +75,35 @@ public class StrangerAiIden implements AiIdenInterfaces {
				idenResultDto = new AlarmIdenResultDto();
				JSONObject resultObject = JSONObject.parseObject(resultList.get(i).toString());
				String faceId = resultObject.getString("faceid");
				
				if (StringUtils.isBlank(faceId) || "null".equals(faceId) || "Unknow".equals(faceId)) {
					// 陌生人
					log.debug("陌生人");
					
					idenResultDto.setAlarmEmployeeRoleId(MonitorManageConsts.alarmEmployeeRoleId);
					idenResultDto.setAlarmType(MonitorManageConsts.AI_ALARM_TYPE_STA);
					idenResultDto.setAlarmMemo("陌生人");
					int[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					double[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					idenResultDto.setBox(boxIntArr);
					alarmIdenResultDtosList.add(idenResultDto);
					
				}else {
					// 非陌生人
					log.debug("不是陌生人");
					
					idenResultDto.setAlarmEmployeeRoleId(faceId);
					idenResultDto.setAlarmType("");
					idenResultDto.setAlarmMemo("不是陌生人");
					int[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					double[] boxIntArr = AiIdenUtils.getBoxArray(resultObject.getJSONArray("box"), imageParam);
					idenResultDto.setBox(boxIntArr);
					successList.add(idenResultDto);
				}
			}
			
			if (CollectionUtils.isEmpty(alarmIdenResultDtosList)) {
				aiIdenLogDto.setIdenResult(JSON.toJSONString(successList));
				aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT);
@@ -117,7 +117,7 @@ public class StrangerAiIden implements AiIdenInterfaces {
		} catch (Exception e) {
			log.error("陌生人识别AI处理异常:"+e.getMessage());
		}
		
		return alarmIdenResultDtosList;
	}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/service/impl/KafkaProcessImpl.java

@@ -7,6 +7,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
public class KafkaProcessImpl implements KafkaProcess {
	
	private static final Logger logger = LoggerFactory.getLogger(KafkaProcessImpl.class);
//    EBC设备tcp连接服务地址
@@ -51,7 +52,8 @@ public class KafkaProcessImpl implements KafkaProcess {
	// private static final int PORT = 8042;
//    private static String kafkaServers = "47.105.160.21:9090";
	private static String kafkaServers = "10.19.90.34:9090";
	//private static String kafkaServers = "10.19.90.34:9090";
	private static String kafkaServers = "10.1.194.17:9092";
	@Value("${kafka.producer.servers}")
	private static String servers;
@@ -167,18 +169,18 @@ public class KafkaProcessImpl implements KafkaProcess {
					: resourceToolInfoMap.get("resourceToolName").toString());
			aiIdenLogDto.setTopic(topicAiTask);
			
			// 代理实现接口
			String className = getClassByAiIdenModel(aiIdenModel);
			Class<?> myClass = Class.forName(className);
			//AiIdenInterfaces proxy = (AiIdenInterfaces) new ProxyFactory(myClass).getProxyInstance();
			
			ProxyFactory proxy = new ProxyFactory(myClass.newInstance());
			//ProxyFactory proxy = new ProxyFactory(SpringApplicationContext.getBean(myClass));
			AiIdenInterfaces aiIdenInterfaces =(AiIdenInterfaces) proxy.Instance();   //获得代理对象
			List<AlarmIdenResultDto> alarmResult = aiIdenInterfaces.executeAiIden(aiIdenLogDto, filePath, imageParam, isHuman);
			
			if (!CollectionUtils.isEmpty(alarmResult)) {
				alarmIdenResultDtosList.addAll(alarmResult);
			}
@@ -187,33 +189,33 @@ public class KafkaProcessImpl implements KafkaProcess {
				if (isHuman){
					aiIdenLogDto = faceAiRecog(aiIdenLogDto, filePath,imageParam);
				}
			
			} else if (MonitorManageConsts.AI_MODEL_SAFETY_HELMET.equals(aiIdenModel)) {
				if (isHuman) {
					aiIdenLogDto = aiHelmetDetect(aiIdenLogDto, filePath,imageParam);
				}
			
			}else if (MonitorManageConsts.AI_MODEL_SMOKE.equals(aiIdenModel)) {
					if (isHuman){
						aiIdenLogDto = smokingDetect(aiIdenLogDto, filePath,imageParam);//吸烟识别
				}
			
			}else if (MonitorManageConsts.AI_MODEL_CLOTHING_CODE.equals(aiIdenModel)) {
					if (isHuman){
						aiIdenLogDto=workClothesDetect(aiIdenLogDto, filePath,imageParam);//工作服识别
					}
				}
			
			else if (MonitorManageConsts.AI_MODEL_INSTRUMENT.equals(aiIdenModel)) {
				aiIdenLogDto=instrumentDetect(aiIdenLogDto,filePath);//仪表识别
			
			} else if (MonitorManageConsts.AI_MODEL_STRANGER.equals(aiIdenModel)){
				if (isHuman) {
					aiIdenLogDto = strangerDetect(aiIdenLogDto, filePath, imageParam);//陌生人识别
				}
			
			} else {
			
			}*/
		}
@@ -222,7 +224,7 @@ public class KafkaProcessImpl implements KafkaProcess {
			aiIdenLogDto.setIdenResultType(MonitorManageConsts.AI_IDENTIFY_RESULT_ALARM);
			aiIdenLogDto.setIdenResult(JSON.toJSONString(alarmIdenResultDtosList));
			aiIdenLogDto.setRelateEmployeeRoleId(MonitorManageConsts.alarmEmployeeRoleId);
			
			log.info("AI识别结果为报警，推送KAFKA消息："+JSONObject.toJSONString(aiIdenLogDto));
			processKafka(aiIdenLogDto.getTopic(), JSONObject.toJSONString(aiIdenLogDto));
			log.info("消息推送完成");
@@ -343,7 +345,7 @@ public class KafkaProcessImpl implements KafkaProcess {
			/*// 安全帽识别
			String aiResponseData = ebcAiService.workClothesDetect(ImageBase64Converter.convertFileToBase64(aifilePath),
					true, true, 0.9f);
			
			JSONObject jsonObject = JSONObject.parseObject(aiResponseData);// JSONUtil.formatJsonStr(aiResponseData);
			if (jsonObject.getString("Status").equals("Ok")) {
				JSONArray jsonoArray = JSONArray.parseArray(jsonObject.getString("Result"));
@@ -358,8 +360,12 @@ public class KafkaProcessImpl implements KafkaProcess {
			}*/
			log.info("开始AI人数识别处理...");
			String aiResponseData = ebcAiService.headDetect(ImageBase64Converter.convertFileToBase64(aifilePath), true,
					0.9f);
			//暂时用安全帽识别判断是否有人
			String aiResponseData = ebcAiService.helmetDetect(ImageBase64Converter.convertFileToBase64(aifilePath),
					Strings.EMPTY, Strings.EMPTY);
			/*String aiResponseData = ebcAiService.headDetect(ImageBase64Converter.convertFileToBase64(aifilePath), true,
					0.9f);*/
			JSONObject jsonObject = JSONObject.parseObject(aiResponseData);
			JSONArray jsonArray = jsonObject.getJSONArray("Result");
			if (!CollectionUtils.isEmpty(jsonArray)) {
@@ -389,4 +395,6 @@ public class KafkaProcessImpl implements KafkaProcess {
		return result.toString();
	}
}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/utils/AiIdenUtils.java

@@ -31,9 +31,9 @@ public class AiIdenUtils {
	 *
	 * @return boxIntArr
	 */
	public static int[] getBoxArray(JSONArray jsonArray, Map<String, Integer> getImageParam) {
	public static double[] getBoxArray(JSONArray jsonArray, Map<String, Integer> getImageParam) {
		if (CollectionUtils.isEmpty(jsonArray) || jsonArray.size() != 4 || CollectionUtils.isEmpty(getImageParam)) {
			return new int[4];
			return new double[4];
		}
		/*int[] boxIntArr=new int[jsonArray.size()];
@@ -42,24 +42,25 @@ public class AiIdenUtils {
		    boxIntArr[i] =boxValue.intValue();
		}*/
		int[] boxIntArr = new int[4];
		double[] boxLongArr = new double[4];
		try {
			BigDecimal boxValue = (BigDecimal) jsonArray.get(0);
			boxIntArr[0] = boxValue.divide(new BigDecimal(getImageParam.get("width")), 0, BigDecimal.ROUND_FLOOR)
					.intValue();
			boxLongArr[0] = boxValue.divide(new BigDecimal(getImageParam.get("width")), 4, BigDecimal.ROUND_HALF_UP).doubleValue();
			boxValue = (BigDecimal) jsonArray.get(1);
			boxIntArr[1] = boxValue.divide(new BigDecimal(getImageParam.get("height")), 0, BigDecimal.ROUND_FLOOR)
					.intValue();
			boxLongArr[1] = boxValue.divide(new BigDecimal(getImageParam.get("height")), 4, BigDecimal.ROUND_HALF_UP)
					.doubleValue();
			boxValue = (BigDecimal) jsonArray.get(2);
			boxIntArr[2] = boxValue.divide(new BigDecimal(getImageParam.get("width")), 0, BigDecimal.ROUND_CEILING)
					.intValue();
			boxLongArr[2] = boxValue.divide(new BigDecimal(getImageParam.get("width")), 4, BigDecimal.ROUND_HALF_UP)
					.doubleValue();
			boxValue = (BigDecimal) jsonArray.get(3);
			boxIntArr[3] = boxValue.divide(new BigDecimal(getImageParam.get("height")), 0, BigDecimal.ROUND_CEILING)
					.intValue();
			boxLongArr[3] = boxValue.divide(new BigDecimal(getImageParam.get("height")), 4, BigDecimal.ROUND_HALF_UP)
					.doubleValue();
		} catch (Exception e) {
			log.error("getBoxArray is error: errorMsg=" + e.getMessage() + ", jsonArray=" + jsonArray);
		}
		return boxIntArr;
		return boxLongArr;
	}
	/**
@@ -132,5 +133,4 @@ public class AiIdenUtils {
		return result.toString();
	}
}
}

monitor-manage-service/src/main/java/com/ai/bss/monitorManage/utils/KafkaProducerConfig.java

@@ -26,7 +26,7 @@ public class KafkaProducerConfig {
    @Value("${kafka.producer.servers:Empty}")
//    private static String servers = "47.105.160.21:9090";
    private static String servers = "10.19.90.34:9090";
    private static String servers = "10.1.194.17:9092";
    @Value("${kafka.producer.retries:0}")
    private  int retries;
    @Value("${kafka.producer.batch.size:4096}")
@@ -110,4 +110,4 @@ public class KafkaProducerConfig {
        }
        return true;
    }
}
}

monitor-manage-service/src/main/resources/application.properties

@@ -10,10 +10,10 @@ server.servlet.context-path=/sp
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=comon_frm
#spring.datasource.password=1qaz@WSX
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
spring.datasource.url=jdbc:mysql://10.1.252.196:3306/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=ebc
spring.datasource.password=ebc@123
spring.datasource.username=root
spring.datasource.password=asdsadadaUda4u!@
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
#spring.jpa.database=default
@@ -26,7 +26,7 @@ spring.main.allow-bean-definition-overriding=true
#kafka
#kafka.bootstrap-servers=47.105.160.21:9090
kafka.bootstrap-servers=10.19.90.34:9090
kafka.bootstrap-servers=10.1.194.17:9092
#kafka.topic.deviceLocation=Topic_IoT_DeviceLocation_111
#kafka.topic.alarm=Topic_IoT_IndividualAlarm_111
#kafka.topic.deviceLocation=DeviceLocationA
@@ -47,8 +47,8 @@ kafka.listener.concurrencys=3,6
kafka.listener.poll-timeout=1500
#minio
minio.endpoint=http://10.19.90.34
minio.port=19000
minio.endpoint=http://10.1.194.18
minio.port=9000
minio.accessKey=minioadmin
minio.secretKey=minioadmin
minio.secure=false
@@ -73,8 +73,8 @@ logging.level.com.ai=debug
logging.level.org.springframework.data=debug
#\u76d1\u63a7\u6587\u4ef6\u5939
camera.filePath=/home/puaiuc/data/DAHUA
#camera.filePath=E:\\data\\DAHUA
camera.filePath=/root/ebc/data/DAHUA
#camera.filePath=D:\\data\\DAHUA
#AI\u05b4\u56fe\u7247
#kafka.topic.aitask=topicTaskTest
@@ -85,8 +85,8 @@ kafka.topic.aivideo=topic_ai_video
#AI\u5931\u8d25\u8bf7\u6c42\u5730\u5740
#ebc.ai.head-det-url=http://10.1.251.211:7001/todo/api/v1.4/control/online/IMAGE/HEAD/PREDICT
ebc.ai.head-det-url=http://10.1.251.211:7001/todo/api/v1.4/control/online/IMAGE/HUMAN/PREDICT
ebc.ai.head-det-url=http://10.1.251.211:7001/todo/api/v1.4/control/online/IMAGE/HEAD/PREDICT
#ebc.ai.head-det-url=http://10.1.251.211:7003/todo/api/v1.4/control/online/IMAGE/HUMAN/PREDICT
ebc.ai.helmet-det-url=http://10.1.251.211:7003/todo/api/v1.4/control/online/IMAGE/HELMET/PREDICT
ebc.ai.smokingdet-url=http://10.1.251.213:5125/smokingdet
ebc.ai.instrument-det-url=http://10.1.251.213:19100/predict
@@ -95,5 +95,6 @@ ebc.ai.work-clothes-det-url=http://10.1.251.211:7003/todo/api/v1.4/control/onlin
#ebc.ai.face-recog-service-url=http://10.21.10.28:9018/api/face/recog
ebc.ai.face-recog-service-url=http://10.1.251.211:7002/todo/api/v1.4/control/online/IMAGE/FACE/PREDICT
#AI\u4efb\u52a1\u8bf7\u6c42\u5730\u5740
ebc.protection.resource-url=http://10.19.90.34:8018/sp/resourceTool/getResourceToolAllInfo
ebc.protection.resource-url=http://10.1.252.196:8018/sp/resourceTool/getResourceToolAllInfo

monitor-manage-service/src/test/java/com/ai/bss/monitorManage/PictureProcessServiceTest.java

@@ -1,8 +1,11 @@
package com.ai.bss.monitorManage;
import com.ai.bss.components.common.util.ImageBase64Converter;
import com.ai.bss.components.ebcai.service.EbcAiService;
import com.ai.bss.monitorManage.service.interfaces.MonitorManageService;
import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,9 +19,33 @@ public class PictureProcessServiceTest {
    @Autowired
    MonitorManageService pictureProcessService;
    @Autowired
    EbcAiService ebcAiService;
    @Test
    public void loadPictureFromDirectory() throws InterruptedException {
        pictureProcessService.loadPictureFromDirectory();
    }
    @Test
    public void setPictureProcessService11()  {
/*
        String aiResponseData = ebcAiService.workClothesDetect(ImageBase64Converter.convertFileToBase64("D:\\data\\DAHUA\\6L04C6FPAGFD039\\images\\12120210203112625221.jpg"),
                true, true, 0.9f);*/
        String aiResponseData = ebcAiService.faceAiRecog(ImageBase64Converter.convertFileToBase64("D:\\data\\DAHUA\\6L04C6FPAGFD039\\images\\12120210203112625221.jpg"));
        log.info("AI人脸识别结果： " + aiResponseData);
      /* String aiResponseData = ebcAiService.helmetDetect(ImageBase64Converter.convertFileToBase64("D:\\data\\DAHUA\\6L04C6FPAGFD039\\images\\12120210203112625221.jpg"),
                Strings.EMPTY, Strings.EMPTY);*/
      /*String aiResponseData = ebcAiService.headDetect(ImageBase64Converter.convertFileToBase64("D:\\data\\DAHUA\\6L04C6FPAGFD039\\images\\12120210203112625221.jpg"), true,
                0.9f);
*/
     /*   String aiResponseData = ebcAiService.instrumentDetect(ImageBase64Converter.convertFileToBase64("D:\\data\\DAHUA\\6L04C6FPAGFD039\\images\\12120210203112625221111222.jpg"),
                Strings.EMPTY, Strings.EMPTY, Strings.EMPTY);*/
        System.out.println(aiResponseData);
    }
}

monitor-manage-service/src/test/resources/application.properties

@@ -1,8 +1,8 @@
spring.application.name=WorkTaskSpec
server.port=8018
server.port=8028
server.servlet.context-path=/sp
server.servlet.context-path=/
# DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
#spring.datasource.url=jdbc:mysql://localhost:3306/cmp
@@ -10,10 +10,10 @@ server.servlet.context-path=/sp
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=comon_frm
#spring.datasource.password=1qaz@WSX
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
spring.datasource.url=jdbc:mysql://10.1.252.196:3306/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=ebc
spring.datasource.password=ebc@123
spring.datasource.username=root
spring.datasource.password=asdsadadaUda4u!@
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
#spring.jpa.database=default
@@ -26,9 +26,9 @@ spring.main.allow-bean-definition-overriding=true
#kafka
#kafka.bootstrap-servers=47.105.160.21:9090
kafka.bootstrap-servers=10.19.90.34:9090
kafka.topic.deviceLocation=Topic_IoT_DeviceLocation_111
kafka.topic.alarm=Topic_IoT_IndividualAlarm_111
kafka.bootstrap-servers=10.1.194.17:9092
#kafka.topic.deviceLocation=Topic_IoT_DeviceLocation_111
#kafka.topic.alarm=Topic_IoT_IndividualAlarm_111
#kafka.topic.deviceLocation=DeviceLocationA
#kafka.topic.alarm=IndividualAlarmA
kafka.producer.batch-size=16785
@@ -47,18 +47,22 @@ kafka.listener.concurrencys=3,6
kafka.listener.poll-timeout=1500
#minio
minio.endpoint=http://10.19.90.34
minio.port=19000
minio.endpoint=http://10.1.194.18
minio.port=9000
minio.accessKey=minioadmin
minio.secretKey=minioadmin
minio.secure=false
minio.bucketHeaderImage=prod-dev
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
#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
minio.faceAddServiceUrl=http://10.1.251.211:7002/todo/api/v1.4/control/online/IMAGE/FACE/PREDICT
minio.face-del-service-url=http://10.1.251.211:7002/todo/api/v1.4/control/online/IMAGE/FACE/PREDICT
minio.face-recog-service-url=http://10.1.251.211:7002/todo/api/v1.4/control/online/IMAGE/FACE/PREDICT
minio.face-recog-mincosin-value=0.5
myminio.bucketWorkToolImage=tool-image
myminio.bucketWorkToolView=tool-view
myminio.bucketAiImage=ai-image
myminio.bucketAiVideo=ai-video
# CACHE
#spring.cache.type=ehcache
@@ -68,5 +72,29 @@ myminio.bucketWorkToolView=tool-view
logging.level.com.ai=debug
logging.level.org.springframework.data=debug
#\u76d1\u63a7\u6587\u4ef6\u5939
camera.filePath=/root/ebc/data/DAHUA
#camera.filePath=D:\\data\\DAHUA
camera.filePath=D:\\resource\\upload\\file\\20200107
#AI\u05b4\u56fe\u7247
#kafka.topic.aitask=topicTaskTest
kafka.topic.aitask=topic_ai_task
#AI\u89c6\u9891
#kafka.topic.aivideo=topicVideoTest
kafka.topic.aivideo=topic_ai_video
#AI\u5931\u8d25\u8bf7\u6c42\u5730\u5740
#ebc.ai.head-det-url=http://10.1.251.211:7001/todo/api/v1.4/control/online/IMAGE/HEAD/PREDICT
ebc.ai.head-det-url=http://10.1.251.211:7001/todo/api/v1.4/control/online/IMAGE/HUMAN/PREDICT
ebc.ai.helmet-det-url=http://10.1.251.211:7003/todo/api/v1.4/control/online/IMAGE/HELMET/PREDICT
ebc.ai.smokingdet-url=http://10.1.251.213:5125/smokingdet
ebc.ai.instrument-det-url=http://10.1.251.213:19100/predict
ebc.ai.work-clothes-det-url=http://10.1.251.211:7003/todo/api/v1.4/control/online/IMAGE/HUMAN/PREDICT
#ebc.ai.face-recog-service-url=http://10.21.10.28:9018/api/face/recog
ebc.ai.face-recog-service-url=http://10.1.251.211:7002/todo/api/v1.4/control/online/IMAGE/FACE/PREDICT
#AI\u4efb\u52a1\u8bf7\u6c42\u5730\u5740
ebc.protection.resource-url=http://localhost:8018/sp/resourceTool/getResourceToolAllInfo

security-protection-platform/.aid/aid.js

@@ -61,11 +61,12 @@ module.exports = {
    {
      url: '/sp',
      options: {
        target: 'http://10.19.90.34:8018',
        target: 'http://10.1.252.196:8018',
        // target: 'http://10.1.74.27:8018',
        changeOrigin: true,
        pathRewrite: {
          '^/sp': '/'
        }
        // pathRewrite: {
        //   '^/sp': '/'
        // }
      }
    },
  ]

security-protection-platform/src/conf/axios.config.js

@@ -44,7 +44,7 @@ const conf = {
        baseURL: '/sp'
    },
    picurl: {
      baseURL: 'http://10.19.90.34:19000/tool-image/'
      baseURL: 'http://10.1.194.18:9000/tool-image/'
    }
  }

security-protection-platform/src/layout/index.vue

@@ -46,12 +46,12 @@ export default {
  },
  mounted() {
    // 镜屏调用
    // this.connect()
    this.connect()
  },
  methods: {
    connect() {
      if (this.stompClient == null || !this.stompClient.connected()) {
        this.stompClient = new StompClient('ws://10.19.90.34:7200/stomp')
        this.stompClient = new StompClient('ws://10.1.252.196:7200/stomp')
        this.stompClient.connect('zhangsan', '123456', () => { this.connectCallback() }, () => { this.errorCallback() })
      } else {
        console.log('当前处于连接状态')

security-protection-platform/src/modules/access/component/instrumentRecord/index.vue

@@ -19,7 +19,7 @@
        <t-button color="primary" @click="btnsearch">查询</t-button>
        <t-button @click="reset">重置</t-button>
      </div>
       <t-button  icon="upload" style="width:128px;height:32px" class="upload">导出至Excel</t-button>
      <t-button color="primary" icon="upload" style="width:128px;height:32px" class="upload">导出至Excel</t-button>
    </div> -->
    <div class="track-container">
@@ -36,9 +36,9 @@
            </div>
          </div>
          <div class="btns">
            <t-button icon="upload" style="width:128px;height:32px" class="upload">导出至Excel</t-button>
            <t-button color="primary" icon="upload" style="width:128px;height:32px" class="upload">导出至Excel</t-button>
            <t-dropdown :visibled="customVisibled" trigger-mode="custom">
              <t-button slot="trigger" color="secondary" icon="tile-four-outline" class="trigger-button" @click="onTriggerClick"></t-button>
              <t-button slot="trigger" color="secondary" icon="tile-four-outline" @click="onTriggerClick"></t-button>
              <div slot="popper">
                <div style="border-radius: 5px;padding: 20px 20px 20px 20px;background-color: white;">
                  <t-checkbox-group v-model="social" vertical @change="checkAllGroupChange">
@@ -54,6 +54,7 @@
                </div>
              </div>
            </t-dropdown>
            <t-button color="secondary" icon="loading" class="reset-btn" @click="reset"></t-button>
          </div>
        </div>
        <div class="animate-demo-wrapper">
@@ -61,13 +62,12 @@
            <div v-show="slideVisible" class="transition-box allCondition">
              <div class="input-rule">
                <span>开始时间：</span>
                <t-date-picker :confirm="false" v-model="searchdata.beginDay" placeholder="请选择开始时间" style="width:320px;height:32px"></t-date-picker>
                <t-date-picker :confirm="false" v-model="searchdata.beginDay" placeholder="请选择开始时间" style="width:200px;height:32px"></t-date-picker>
              </div>
              <div class="input-rule">
                <span>结束时间：</span>
                <t-date-picker :confirm="false" v-model="searchdata.endDay" placeholder="请选择结束时间" style="width:320px;height:32px"></t-date-picker>
              </div>
              <a style="float:right;color:#0089d4;" @click="reset" href="javascript:;">重置</a>
            </div>
          </transition>
        </div>
@@ -462,6 +462,11 @@ export default {
            onImgLoaded()
          }, 3)
        } else {
          debugger
          e.box[0] = imgObject.width * e.box[0]
          e.box[1] = imgObject.height * e.box[1]
          e.box[2] = imgObject.width * e.box[2]
          e.box[3] = imgObject.height * e.box[3]
          that.newimage = getImagePortion(imgObject, e.box[2] - e.box[0], e.box[3] - e.box[1], e.box[0], e.box[1])
        }
      }
@@ -590,12 +595,14 @@ export default {
      justify-content: space-between;
      border: 1px solid rgba(0, 0, 0, 0.09);
      background-color: #f8f9fa;
      flex-wrap: nowrap;
      flex-wrap: wrap;
      padding: 20px;
      margin: 5px auto;
      align-items: center;
      .input-rule {
        flex: 1;
        width: 50%;
        min-width: 50%;
        max-width: 50%;
        padding: 10px 0 10px 20px;
      }
    }

security-protection-platform/src/modules/access/component/io-record/index.vue

@@ -20,7 +20,7 @@
        <t-button @click="reset">重置</t-button>
      </div>
       <t-button  icon="upload" style="width:128px;height:32px" class="upload">导出至Excel</t-button>
      <t-button color="primary" icon="upload" style="width:128px;height:32px" class="upload">导出至Excel</t-button>
    </div> -->
    <div class="track-container">
@@ -37,9 +37,9 @@
            </div>
          </div>
          <div class="btns">
            <t-button icon="upload" style="width:128px;height:32px" class="upload">导出至Excel</t-button>
            <t-button color="primary" icon="upload" style="width:128px;height:32px" class="upload">导出至Excel</t-button>
            <t-dropdown :visibled="customVisibled" trigger-mode="custom">
              <t-button slot="trigger" color="secondary" icon="tile-four-outline" class="trigger-button" @click="onTriggerClick"></t-button>
              <t-button slot="trigger" color="secondary" icon="tile-four-outline" @click="onTriggerClick"></t-button>
              <div slot="popper">
                <div style="border-radius: 5px;padding: 20px 20px 20px 20px;background-color: white;">
                  <t-checkbox-group v-model="social" vertical @change="checkAllGroupChange">
@@ -55,6 +55,7 @@
                </div>
              </div>
            </t-dropdown>
            <t-button color="secondary" icon="loading" class="reset-btn" @click="reset"></t-button>
          </div>
        </div>
        <div class="animate-demo-wrapper">
@@ -62,13 +63,12 @@
            <div v-show="slideVisible" class="transition-box allCondition">
              <div class="input-rule">
                <span>开始时间：</span>
                <t-date-picker :confirm="false" v-model="searchdata.beginDay" placeholder="请选择开始时间" style="width:320px;height:32px"></t-date-picker>
                <t-date-picker :confirm="false" v-model="searchdata.beginDay" placeholder="请选择开始时间" style="width:200px;height:32px"></t-date-picker>
              </div>
              <div class="input-rule">
                <span>结束时间：</span>
                <t-date-picker :confirm="false" v-model="searchdata.endDay" placeholder="请选择结束时间" style="width:320px;height:32px"></t-date-picker>
              </div>
              <a style="float:right;color:#0089d4;" @click="reset" href="javascript:;">重置</a>
            </div>
          </transition>
        </div>
@@ -87,9 +87,6 @@
      <t-table-column v-if="columns[4].show" :formatter="date_formatter" label="职务" prop="employeePositionZh" width="80px">
      </t-table-column>
      <t-table-column v-if="columns[5].show" :formatter="date_formatter" prop="simi" label="相似度" width="75px">
        <template v-slot="{row}">
          {{ getSimi(row) }}
        </template>
      </t-table-column>
      <t-table-column v-if="columns[6].show" :formatter="date_formatter" label="进出时间" prop="taskExecuteTime" width="160px">
      </t-table-column>
@@ -504,6 +501,10 @@ export default {
            onImgLoaded()
          }, 3)
        } else {
          e.box[0] = imgObject.width * e.box[0]
          e.box[1] = imgObject.height * e.box[1]
          e.box[2] = imgObject.width * e.box[2]
          e.box[3] = imgObject.height * e.box[3]
          that.newimage = getImagePortion(imgObject, e.box[2] - e.box[0], e.box[3] - e.box[1], e.box[0], e.box[1])
        }
      }
@@ -571,9 +572,6 @@ export default {
      } else {
        return cellValue
      }
    },
    getSimi (row) {
      return (row.simi.split('%')[0] - 0).toFixed(2) + '%'
    }
    // //将分数转换为小数
    // toPoint (percent) {
@@ -635,12 +633,14 @@ export default {
      justify-content: space-between;
      border: 1px solid rgba(0, 0, 0, 0.09);
      background-color: #f8f9fa;
      flex-wrap: nowrap;
      align-items: center;
      flex-wrap: wrap;
      padding: 20px;
      margin: 5px auto;
      .input-rule {
        flex: 1;
        width: 50%;
        min-width: 50%;
        max-width: 50%;
        padding: 10px 0 10px 20px;
      }
    }

security-protection-platform/src/modules/dashboard/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="index" style="overflow:hidden;">
    <div :style="`background-image: url(${imgBg})`" class="top">
    <div :style="`background-image: url(${imgBg})`" class="top" >
      <img src="@/assets/images/AsiainfoLogo.png" class="top-logo">
      <div style="position: absolute;top:50%;left:54%;transform: translate(-50%,-50%);vertical-align: middle; color: white; font-size: 14px">
        <b> | AISI安防一体化平台</b>
@@ -21,7 +21,7 @@
          <div id="doughnut" style="height: 100%;width: 100%"></div>
        </div>
        <div :style="`height:34%;margin-top: 3%;`" class="body-left-item">
          <div id="div1" :style="`background-image: url(${titleImgBg})`" class="title">
          <div :style="`background-image: url(${titleImgBg})`" class="title" id="div1">
            <span class="title-span">告警分析</span>
          </div>
          <div id="bar" style="height: 100%;width: 100%"></div>
@@ -46,8 +46,8 @@
          <span class="title-span">重点区域监控</span>
        </div>
        <!--        <video-player ref="videoPlayer" :options="videoOptions" :playsinline="true" class="vjs-custom-skin videoPlayer"></video-player>-->
        <div id="div11">
          <video-player v-if="videoOptions !== {}" id="div111" ref="videoPlayer" :options="videoOptions" :playsinline="true" class="vjs-custom-skin videoPlayer">
        <div id="div11" style="padding-right: 7%;padding-left: 7%">
          <video-player v-if="videoOptions !== {}" ref="videoPlayer" :options="videoOptions" :playsinline="true"  id="div111" class="vjs-custom-skin videoPlayer">
          </video-player>
        </div>
@@ -102,7 +102,7 @@ import 'video.js/dist/video-js.css'
import 'vue-video-player/src/custom-theme.css'
import 'videojs-flash'
import videojs from 'video.js'
import EventBus from '../../bus'
import EventBus from "../../bus";
window.videojs = videojs
require('video.js/dist/lang/zh-CN.js')
@@ -116,27 +116,27 @@ export default {
      month >= 10 ? month : '0' + month
      var day = value.getDate() >= 10 ? value.getDate() : '0' + value.getDate()
      var hours =
        value.getHours() >= 10 ? value.getHours() : '0' + value.getHours()
          value.getHours() >= 10 ? value.getHours() : '0' + value.getHours()
      var minutes =
        value.getMinutes() >= 10
          ? value.getMinutes()
          : '0' + value.getMinutes()
          value.getMinutes() >= 10
              ? value.getMinutes()
              : '0' + value.getMinutes()
      var seconds =
        value.getSeconds() >= 10
          ? value.getSeconds()
          : '0' + value.getSeconds()
          value.getSeconds() >= 10
              ? value.getSeconds()
              : '0' + value.getSeconds()
      return (
        year +
        '年' +
        month +
        '月' +
        day +
        '日 ' +
        hours +
        ':' +
        minutes +
        ':' +
        seconds
          year +
          '年' +
          month +
          '月' +
          day +
          '日 ' +
          hours +
          ':' +
          minutes +
          ':' +
          seconds
      )
    }
  },
@@ -180,8 +180,6 @@ export default {
    setInterval(() => { // 识别记录
      this.initRecognition()
    }, 5000)
    // console.log(textDom.nextSibling)
    // textDom.nextSibling.nodeValue = ''
    // EventBus.$on('sendAiData', (msg) => { // 获取镜屏推送消息
    //   console.log('已接收镜屏消息...')
    //   var oDiv = document.getElementById("div111");
@@ -199,44 +197,45 @@ export default {
    // })
  },
  methods: {
    testHKK (box, alarmMemo) {
    testHKK(box, alarmMemo) {
      var width = box[2] - box[0]
      var height = box[3] - box[1]
      var oDiv = document.getElementById('div111')
      var oDiv = document.getElementById("div111");
      // var aBox = this.getByClass(oDiv,"vjs-tech");
      // alert(aBox.length);
      var e = oDiv
      var div = document.createElement('div')
      var e = oDiv;
      var div = document.createElement("div");
      // div.className = "form-group";
      var del = document.createElement('p')
      var x = 10 + this.hkk
      this.hkk++
      del.innerHTML = '<div class="hkk" style="color: white;border: 2px solid #00d8f3;position: absolute;top: ' + box[1] + 'px;left: ' + box[0] + 'px;width: ' + width + 'px;height: ' + height + 'px;"> ' + alarmMemo + ' </div>'
      div.appendChild(del)
      e.appendChild(div)
      setTimeout(function () {
        del.remove()
      this.hkk ++
      del.innerHTML = '<div class="hkk" style="color: white;border: 2px solid #00d8f3;position: absolute;top: ' + box[1] + 'px;left: ' + box[0] + 'px;width: ' + width + 'px;height: ' + height + 'px;"> ' + alarmMemo + ' </div>';
      div.appendChild(del);
      e.appendChild(div);
      setTimeout(function() {
        del.remove();
      }, 3000)
    },
    findInArr (arr, n) {
      for (var i = 0; i < arr.length; i++) {
        if (arr[i] == n) {
          return true
    findInArr(arr,n){
      for(var i=0;i<arr.length;i++){
        if(arr[i] == n){
          return true;
        }
      }
      return false
      return false;
    },
    getByClass (oParent, sClass) {
      var ret = []
      var aEle = oParent.getElementsByTagName('*')
      for (var i = 0; i < aEle.length; i++) {
        var _aTmp = aEle[i].className.split(' ')
        if (this.findInArr(_aTmp, sClass)) {
          ret.push(aEle[i])
    getByClass(oParent,sClass){
      var ret = [];
      var aEle = oParent.getElementsByTagName("*");
      for(var i = 0; i < aEle.length; i++){
        var _aTmp = aEle[i].className.split(" ");
        if(this.findInArr(_aTmp,sClass)){
          ret.push(aEle[i]);
        }
      }
      return ret
      return ret;
    },
    async createMyButton () {
      this.$nextTick(() => {
@@ -245,13 +244,6 @@ export default {
        let start = document.getElementsByClassName('vjs-play-control vjs-control vjs-button')
        let volume = document.getElementsByClassName('vjs-volume-panel vjs-control vjs-volume-panel-horizontal')
        let text = document.getElementsByClassName('vjs-live-control vjs-control')
        // 删除直播文本节点
        let textDoms = document.querySelectorAll('.vjs-live-control .vjs-live-display .vjs-control-text')
        textDoms.forEach(item => {
          // 这样设置没用 不知道为啥 明明在nextTick中 真正的“直播”文本节点还是没选到
          item.nextSibling.nodeValue = ''
          // item.nextSibling.data = ''
        })
        bars.forEach((item, index) => {
          time.forEach(item => {
            item.remove()
@@ -281,7 +273,7 @@ export default {
          loop: false, // 导致视频一结束就重新开始。
          preload: 'auto', // 建议浏览器在<video>加载元素后是否应该开始下载视频数据。auto浏览器选择最佳行为,立即开始加载视频（如果浏览器支持）
          language: 'zh-CN',
          aspectRatio: '16:10', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
          aspectRatio: '4:3', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
          // fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
          // 是否流体自适应容器宽高
          fluid: true,
@@ -394,16 +386,20 @@ export default {
          data = data.slice(0, 4)
        }
        data.forEach(e => {
          if (e.employeeName == null || e.employeeName == '') {
          if (e.employeeName == null || e.employeeName == ''){
            e.employeeCode = '未识别成功'
          }
          e.simi = e.simi.split('.')[0] + '%'
          if (e.simi){
            e.simi = e.simi.split('.')[0] + '%'
          }else {
            e.simi = '0%'
          }
          e.newImg = e.idenPictureUrl
          var loadTimer
          var imgObject = new Image()
          imgObject.setAttribute('crossOrigin', 'anonymous')
          imgObject.src = e.idenPictureUrl
          imgObject.onLoad = onImgLoaded()
          imgObject.onload = onImgLoaded()
          function onImgLoaded () {
            if (loadTimer != null) clearTimeout(loadTimer)
            if (!imgObject.complete) {
@@ -411,6 +407,10 @@ export default {
                onImgLoaded()
              }, 3)
            } else {
              e.box[0] = imgObject.width * e.box[0]
              e.box[1] = imgObject.height * e.box[1]
              e.box[2] = imgObject.width * e.box[2]
              e.box[3] = imgObject.height * e.box[3]
              e.newImg = getImagePortion(imgObject, e.box[2] - e.box[0], e.box[3] - e.box[1], e.box[0], e.box[1])
            }
          }
@@ -575,11 +575,11 @@ export default {
            itemStyle: {
              normal: {
                color: new echarts.graphic.LinearGradient(
                  0, 0, 0, 1,
                  [
                    { offset: 0, color: '#00FEFF' },
                    { offset: 1, color: '#0C7EFC' }
                  ]
                    0, 0, 0, 1,
                    [
                      { offset: 0, color: '#00FEFF' },
                      { offset: 1, color: '#0C7EFC' }
                    ]
                ),
                label: {
                  show: true, // 是否展示
@@ -865,7 +865,7 @@ export default {
.vjs-tech {
  pointer-events: none;
}
.checkedIndex {
.checkedIndex{
  border: 1px solid #009bf3;
}
</style>

security-protection-platform/src/modules/system/devicemana/components/modal/addDeviceModal.vue

@@ -92,7 +92,7 @@ export default {
      },
      // 提交表单是否显示loading
      loadingSubmit: false,
      action: 'http://10.19.90.34:8018/sp/resourceTool/uploadResourceToolPicture',
      action: 'http://10.1.252.196:8018/sp/resourceTool/uploadResourceToolPicture',
      uploadList: () => []
    }
  },

security-protection-platform/src/modules/usermana/components/modal/addUser.vue

@@ -40,7 +40,7 @@
            multiple
            style="width:120px;height:160px;background-color:#FFFFFF;"
            type="drag"
            action="http://10.19.90.34:8018/sp/employeeManagement/uploadEmployeePicture"
            action="http://10.1.252.196:8018/sp/employeeManagement/uploadEmployeePicture"
            class="demo-upload-list"
            @success = "$_onUploadSuccess"
          >
@@ -61,7 +61,7 @@
            :before-upload="$_onUploadBeforeUpload"
            multiple
            type="drag"
            action="http://10.19.90.34:8018/sp/employeeManagement/uploadEmployeePicture"
            action="http://10.1.252.196:8018/sp/employeeManagement/uploadEmployeePicture"
            class="upload-edit"
            @success = "$_onUploadSuccess"
          >

security-protection-platform/src/modules/videoSurveillance/components/ReplayDialog/index.vue

@@ -223,33 +223,33 @@ export default {
    /*
   * 获取真实视频地址
   */
    // async getOriVideoUrl (fileId) {
    //   const res = await sysapi.getFileUrl(fileId)
    //   // fake
    //   return new Promise((resolve, reject) => {
    //     setTimeout(() => {
    //       const url = res.data.data.fileUrl
    //       resolve({
    //         url
    //       })
    //     }, 1000)
    //   })
    // },
    async getOriVideoUrl (fileId) {
      const res = await sysapi.getFileUrl(fileId)
      // fake
      return new Promise((resolve, reject) => {
        setTimeout(() => {
          const url = res.data.data.fileUrl
          resolve({
            url
          })
        }, 1000)
      })
    },
    getData () {
      this.$emit('get-list', { beginDay: this.beginDay, endDay: this.endDay })
    },
    resetData () {
      this.beginDay = formatDateTime(new Date(+new Date() - 10 * 60 * 1000), 'yyyy-MM-dd hh:mm:ss')
      this.endDay = formatDateTime(new Date(), 'yyyy-MM-dd hh:mm:ss')
      // this.getData()
    }
      this.getData()
    },
    // 刷新组件
    // reload () {
    //   this.isShow = false
    //   this.$nextTick(() => {
    //     this.isShow = true
    //   })
    // }
    reload () {
      this.isShow = false
      this.$nextTick(() => {
        this.isShow = true
      })
    }
  }
}
</script>

security-protection-platform/src/modules/videoSurveillance/distinguishRecord/index.vue

@@ -47,7 +47,7 @@
        <t-carousel dots="none" :speed="10000000000" arrow="always" style="width: 100%">
          <t-carousel-item v-for="(item1,index1) in dataImgList" :key="index1" style="width: 100%;padding-left: 10%">
            <div v-for="(item, index) in item1" :key="index" :src="item.idenPictureUrl" class="image-carousel">
              <img :src="'http://10.19.90.34:19000/ai-image/'+item.idenPictureUrl" class="img-viewer-size" @click="getParticularsData(item.aiIdenLogId,index)">
              <img :src="'http://10.1.194.18:9000/ai-image/'+item.idenPictureUrl" class="img-viewer-size" @click="getParticularsData(item.aiIdenLogId,index)">
              <span :class="{'fileName' : index === fileNameIndex}" style="width: 132px;margin-right: 14px;text-align:center">{{ item.fileName }}</span>
            </div>
          </t-carousel-item>
@@ -81,17 +81,17 @@ export default {
        aspectRatio: '13:10', // 将播放器置于流畅模式，并在计算播放器的动态大小时使用该值。值应该代表一个比例 - 用冒号分隔的两个数字（例如"16:9"或"4:3"）
        // fluid: true, // 当true时，Video.js player将拥有流体大小。换句话说，它将按比例缩放以适应其容器。
        // 是否流体自适应容器宽高
        fluid: false,
        fluid: true,
        // // 设置视频播放器的显示宽度（以像素为单位）
        // width: '500px',
        // width: '100px',
        // // 设置视频播放器的显示高度（以像素为单位）
        height: 380,
        // height: '300px',
        sources: [{
          type: 'video/mp4', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
          type: 'application/x-mpegURL', // 这里的种类支持很多种：基本视频格式、直播、流媒体等，具体可以参看git网址项目
          src: '' // url地址
        }],
        notSupportedMessage: '暂无视频可播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
        notSupportedMessage: '此视频暂无法播放，请稍后再试', // 允许覆盖Video.js无法播放媒体源时显示的默认信息。
        controlBar: {
          timeDivider: true,
          // durationDisplay: true,
@@ -174,7 +174,7 @@ export default {
        this.defineResult = res.data.data.alarmInfo.alarmMemo
        this.captureTIme = res.data.data.pictureInfo.fileDateTimeStr
        this.distinguishUrl = res.data.data.pictureInfo.fileUrl
        this.playerOptions.sources[0].src = res.data.data.videoInfo.videoFileUrl
        this.playerOptions.sources[0].src = res.data.data.videoInfo
      })
    },
    // 重置数据

security-protection-platform/src/router.js

@@ -39,21 +39,21 @@ export default () => {
     * 单客户端判断。
     * 参见src/frame.vue和src/store.js文件中的逻辑。
     */
    let isLogged = router.app.$options.store.getters.getLogged || sessionStorage.getItem('isLogged')
    console.log(isLogged)
    if (to.meta.ignoreAuth === true) {
      if (isLogged === true && to.path === '/login') {
        router.replace({ name: 'dashboard' })
      } else {
    // let isLogged = router.app.$options.store.getters.getLogged || sessionStorage.getItem('isLogged')
    // console.log(isLogged)
    // if (to.meta.ignoreAuth === true) {
    //   if (isLogged === true && to.path === '/login') {
    //     router.replace({ name: 'dashboard' })
    //   } else {
    //     next()
    //   }
    // } else {
    //   if (isLogged === false) {
    //     router.replace({ name: 'login' })
    //   } else {
        next()
      }
    } else {
      if (isLogged === false) {
        router.replace({ name: 'login' })
      } else {
        next()
      }
    }
    //   }
    // }
  })
  router.afterEach(() => {

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

@@ -21,13 +21,13 @@ import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
public class SecurityProtectionApp {
    public static void main(String[] args) throws Exception {
        System.setProperty("websocket.port", "7200");
     /*   System.setProperty("websocket.port", "7200");
        //注册镜屏服务
        ConnectServerManager.registerServer("websocket.port", new WebSocketStompServer("/stomp"));
        //镜屏服务启动
        ConnectServerStart.start(args, false);
        ConnectServerStart.start(args, false);*/
        SpringApplication.run(SecurityProtectionApp.class, args);
    }
}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/config/MyCorsFilter.java

@@ -54,7 +54,7 @@ public class MyCorsFilter {
        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
        registrationBean.setFilter(new SessionUserFilter());
        //registrationBean.setUrlPatterns(Arrays.asList("/mySessionUserFilter"));
        registrationBean.setUrlPatterns(Arrays.asList("/login/*"));
        registrationBean.setUrlPatterns(Arrays.asList("/sdfsdafsafasf"));
        Map<String, String> initParameters = new HashMap<String,String>();
        initParameters.put("impl-classname","com.ai.sso.external.DefaultPopedomImpl");
        initParameters.put("ALLOWPATH","gif;jpg;jpeg;png;login;checkLogin;genVerificationCode;logout;");

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

@@ -48,7 +48,7 @@ public class AiAlarmManageController {
	*                            statusList: 处理状态列表
	* @return 结果集，具体如下：
	*                            状态、状态时间、处理详情、报警类型、报警描述、设备名称、设备编号、设备位置、报警时间、处理人、处理时间、图片url、视频url
	 * @throws Exception 
	 * @throws Exception
	*/
	@ResponseBody
	@RequestMapping("/queryPageAiAlarm")
@@ -65,7 +65,7 @@ public class AiAlarmManageController {
		params.put("workEmployeeRoleId", aiQuery.getWorkEmployeeRoleId());
		params.put("beginTime", aiQuery.getBeginTime());
		params.put("endTime", aiQuery.getEndTime());
		
		if (StringUtils.isNotBlank(aiQuery.getStatusList())) {
			ArrayList<Object> statusList = new ArrayList<>();
			statusList.add(aiQuery.getStatusList());
@@ -100,7 +100,7 @@ public class AiAlarmManageController {
		workTask.setStatus(aiQuery.getStatus());
		workTask.setWorkTaskId(aiQuery.getWorkTaskId());
		workTask.setProcessMemo(aiQuery.getProcessMemo());
		
		// 申请人ID和部门
		JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
		workTask.setOpId(userInfo.get("STAFF_ID").toString());
@@ -142,5 +142,5 @@ public class AiAlarmManageController {
		List<Map<String, Object>> resultList=aiAlarmManageService.queryAiAlarmCount(params);
		return CommonResponse.ok(resultList);
	}
	
}

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

@@ -98,20 +98,23 @@ public class LoginServiceImpl implements LoginService {
            String result = HttpServiceUtil.sendPost(menuUrl, paramsMap, charset,headerMap1 );
            //将返回结果转为map
            logger.error("返回结果json: " + result);
            resultMap = JSON.parseObject(result, Map.class);
            logger.error("返回结果resultMap: " + resultMap.toString());
            String result1 = (String)resultMap.get("RESULT");
            if(null!=result1&&!"".equals(result1)){
                //如果result有值返回正确，将返回结果转为List
                logger.error("返回结果result1: " + result1);
                List<Map<String,List<Map>>> list = JSON.parseObject(result1, List.class);
                logger.error("返回结果list: " + list.toString());
                resultMap.put("RESULT",list);
            }
        } catch (Exception e) {
            logger.error("调用uspa获取菜单接口失败: " + e.getMessage());
            return resultMap;
        }
        return resultMap;
    }
}
}

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

@@ -1,6 +1,6 @@
#minio
minio.endpoint=http://10.19.90.34
minio.port=19000
minio.endpoint=http://10.1.194.18
minio.port=9000
minio.accessKey=minioadmin
minio.secretKey=minioadmin
minio.secure=false
@@ -22,4 +22,4 @@ spminio.bucketAiVideo=ai-video
# \u76d1\u63a7\u89c6\u9891\u622a\u56fe
spminio.bucketAiImage=ai-image
# \u76d1\u63a7\u89c6\u9891\u622a\u56fe
spminio.bucketM3U8=m3u8-index
spminio.bucketM3U8=m3u8-index

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

@@ -10,10 +10,10 @@ server.servlet.context-path=/sp
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=comon_frm
#spring.datasource.password=1qaz@WSX
spring.datasource.url=jdbc:mysql://10.19.90.34:3307/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
spring.datasource.url=jdbc:mysql://10.1.252.196:3306/energy?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&verifyServerCertificate=false&useSSL=false&requireSSL=false
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=ebc
spring.datasource.password=ebc@123
spring.datasource.username=root
spring.datasource.password=asdsadadaUda4u!@
# JPA (JpaBaseConfiguration, HibernateJpaAutoConfiguration)
#spring.jpa.database=default
@@ -26,7 +26,7 @@ spring.main.allow-bean-definition-overriding=true
#kafka
#kafka.bootstrap-servers=47.105.160.21:9090
kafka.bootstrap-servers=10.19.90.34:9090
kafka.bootstrap-servers=10.1.194.17:9092
kafka.topic.aitask=topic_ai_task
kafka.topic.aivideo=topic_ai_video
#kafka.topic.aitask=topicTaskTest
@@ -68,11 +68,10 @@ spring.servlet.multipart.resolve-lazily=false
logging.level.com.ai=debug
logging.level.org.springframework.data=debug
uspa.login.url=http://10.19.90.34:20000/usermng/login
uspa.login.url=http://10.1.194.17:20000/usermng/login
uspa.login.vercode=Hiz#8uAqkjhoPmXu8%aaa
uspa.login.menuUrl=http://10.19.90.34:20000/usermng/process/com.wframe.usermanager.services.impl.QueryMenuByUser
uspa.login.menuUrl=http://10.1.194.17:20000/usermng/process/com.wframe.usermanager.services.impl.QueryMenuByUser
        
# \u5f15\u5165minio\u548ciot\u7684\u914d\u7f6e\u6587\u4ef6
spring.profiles.active=iot,minio

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

@@ -15,7 +15,7 @@ COOKIE_MAXAGE=-1
TENANT_REGISTER_CLASS=com.ai.customermanager.services.impl.CustRegisterVercodeImpl
##\u8fdc\u7a0b\u7f13\u5b58\u8c03\u7528\u7c7b\uff0c\u8fd9\u4e2a\u7c7b\u5fc5\u987b\u6709\u4e09\u4e2a\u51fd\u6570 
##\u8fdc\u7a0b\u7f13\u5b58\u8c03\u7528\u7c7b\uff0c\u8fd9\u4e2a\u7c7b\u5fc5\u987b\u6709\u4e09\u4e2a\u51fd\u6570
##    public boolean set(String key,String value)
##    public String get(String key)
##    public boolean del(String key);
@@ -53,8 +53,8 @@ RETURN_TAG={"MESSAGE":"NOLOGIN","CODE":999999,"FLAG":"FAIL","RESULT":{"URL":"htt
#redis.single=10.11.20.117:6379
#redis.password=luMZulgbotmo71aa
redis.single=10.19.90.34:6379
redis.password=Ipu@321!
redis.single=10.1.194.17:6379
redis.password=ebc@redis
redis.pool.maxTotal=1000
redis.pool.minIdle=5
@@ -68,7 +68,7 @@ redis.pool.timeBetweenEvictionRunsMillis=10000
SESSION_DEFAULT_VERCODE=Hiz#8uAqkjhoPmXu8%aaa
#\u662f\u5426\u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236 1 \u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236 
#\u662f\u5426\u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236 1 \u8fdb\u884c\u63a5\u53e3\u6743\u9650\u63a7\u5236
is_check_interface=0
@@ -78,4 +78,4 @@ is_check_interface=0
USER_LOGIN_AUTH_CLASS=com.wframe.usermanager.services.impl.UserLoginAuthImpl
#USER_LOGIN_AUTH_CLASS=com.wframe.msgmanager.services.impl.UserLoginByTokenImpl
#USER_LOGIN_AUTH_CLASS=com.wframe.msgmanager.services.impl.UserLoginByToken4XblImpl
SIGN_KEY_CODE=TENANT_CODE
SIGN_KEY_CODE=TENANT_CODE