Commit 52122de4 authored by tianbo's avatar tianbo

1、tzs添加robot_admin机器人处理后端需要自动登录任务 配置文件有修改

2、accessapi 修改bug dev配置文件有修改
parent 25c6da54
......@@ -44,8 +44,8 @@ eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.90:1883
emqx.user-name=admin
emqx.password=public
emqx.client-user-name=admin
emqx.client-password=public
##biz custem properties
biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="log" />
<property name="LOG_HOME" value="/opt/log/qa" />
<!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符-->
<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
<!-- 按照每天生成日志文件 -->
......@@ -10,9 +10,9 @@
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/tzs.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<MaxHistory>7</MaxHistory>
<!--日志文件大小-->
<MaxFileSize>30mb</MaxFileSize>
<MaxFileSize>10mb</MaxFileSize>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
......@@ -46,7 +46,7 @@
<!-- 日志输出级别 -->
<root level="DEBUG">
<!-- <appender-ref ref="FILE" /> -->
<appender-ref ref="FILE" />
<appender-ref ref="STDOUT" />
</root>
</configuration>
\ No newline at end of file
......@@ -46,10 +46,10 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
@Value("${amos.secret.key}")
String secretKey;
@Value("${admin.product}")
@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
String product;
@Value("${admin.appkey}")
@Value("${amos.system.user.app-key:AMOS_STUDIO}")
String appkey;
@Autowired
RedisUtil redisUtil;
......
......@@ -39,10 +39,10 @@ public class CarcylUnitInspectMqTtlListener extends EmqxListener {
@Value("${amos.secret.key}")
String secretKey;
@Value("${admin.product}")
@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
String product;
@Value("${admin.appkey}")
@Value("${amos.system.user.app-key:AMOS_STUDIO}")
String appkey;
@Autowired
RedisUtil redisUtil;
......
......@@ -18,10 +18,10 @@ public class PrivilegeCompanyDeleteListener extends EmqxListener {
@Autowired
RedisUtil redisUtil;
@Value("${admin.product}")
@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
String product;
@Value("${admin.appkey}")
@Value("${amos.system.user.app-key:AMOS_STUDIO}")
String appkey;
......
......@@ -2,27 +2,19 @@ package com.yeejoin.amos.boot.module.tzs.biz.listener;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.injector.methods.Update;
import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
import com.yeejoin.amos.boot.module.tzs.biz.utils.DesUtil;
import com.yeejoin.amos.boot.module.tzs.biz.utils.RedisUtil;
import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.ApplicationModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import lombok.extern.slf4j.Slf4j;
import org.bouncycastle.pqc.math.linearalgebra.PolynomialRingGF2;
import org.eclipse.paho.client.mqttv3.MqttMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
......@@ -32,12 +24,13 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@Component
@Slf4j
public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
Logger logger = LoggerFactory.getLogger(PrivilegeCompanyUpdateAddListener.class);
@Autowired
TzBaseEnterpriseInfoServiceImpl tzBaseEnterpriseInfoService;
......@@ -47,15 +40,15 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
@Autowired
RedisUtil redisUtil;
@Value("${admin.product}")
@Value("${amos.system.user.product:AMOS_STUDIO_WEB}")
String product;
@Value("${admin.appkey}")
String appkey;
@Value("${amos.system.user.app-key:AMOS_STUDIO}")
String appKey;
@Override
public void processMessage(String s, MqttMessage message) throws Exception {
System.out.println(message);
logger.info("received mqtt message: " + message);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
......@@ -65,7 +58,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
} catch (Exception e) {
throw new Exception("公司同步消息解析失败");
}
RequestContext.setAppKey(appkey);
RequestContext.setAppKey(appKey);
RequestContext.setProduct(product);
RequestContext.setToken(String.valueOf(redisUtil.get("platform_token")));
......@@ -107,15 +100,13 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
//业务表更新条件构造器
UpdateWrapper<TzBaseEnterpriseInfo> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("Use_code",object.getString("unit_code"));
updateWrapper.eq("use_code",object.getString("unit_code"));
String regCode = object.getString("reg_code");
CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
CompanyModel supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode(regCode).getResult();
if(ValidationUtil.isEmpty(privilegeCompanyModel)){
privilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
if(ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)){
supervisePrivilegeCompanyModel = Privilege.companyClient.queryByCompanyCode("610000").getResult();
}
if(ValidationUtil.isEmpty(tzBaseEnterpriseInfo.getUnitType())){
tzBaseEnterpriseInfo.setUnitType("");
......@@ -125,19 +116,20 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
}
try {
tzBaseEnterpriseInfo.setSuperviseOrgCode(privilegeCompanyModel.getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(privilegeCompanyModel.getCompanyName());
companyModel.setParentId(privilegeCompanyModel.getSequenceNbr());
} catch (Exception e) {
System.out.println("名称为"+object.getString("unit_name")+"的许可企业同步企业信息时出错:"+e.getMessage());
if (ValidationUtil.isEmpty(supervisePrivilegeCompanyModel)) {
logger.error("【" + object.getString("unit_name") + "】对应监管企业为空");
return;
}
tzBaseEnterpriseInfo.setSuperviseOrgCode(supervisePrivilegeCompanyModel.getOrgCode());
tzBaseEnterpriseInfo.setSuperviseOrgName(supervisePrivilegeCompanyModel.getCompanyName());
companyModel.setParentId(supervisePrivilegeCompanyModel.getSequenceNbr());
try {
if (tzBaseEnterprisePrivilegeInfo == null && companyPrivilegeModel == null) {
//当企业表、平台表 中没有时
tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
Privilege.companyClient.create(companyModel);
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
logger.info("create/update unit license info: " + "企业表、平台表中没有该条数据");
} else if(tzBaseEnterprisePrivilegeInfo == null){
//企业表没有,平台表有
if(!ValidationUtil.isEmpty(companyPrivilegeModel.getCompanyType())){
......@@ -150,6 +142,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
tzBaseEnterpriseInfoService.save(tzBaseEnterpriseInfo);
Privilege.companyClient.update(companyModel, companyPrivilegeModel.getSequenceNbr());
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
logger.info("create/update unit license info: " + "企业表没有、平台表中有该条数据");
} else if(companyPrivilegeModel == null){
//平台表没有,企业表有
if(!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo.getUnitType())){
......@@ -163,6 +156,7 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
Privilege.companyClient.create(companyModel);
tzBaseEnterpriseInfoService.update(tzBaseEnterpriseInfo,updateWrapper);
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
logger.info("create/update unit license info: " + "企业表有、平台表中没有该条数据");
}
else {
//当企业表、平台表 中有时
......@@ -205,9 +199,10 @@ public class PrivilegeCompanyUpdateAddListener extends EmqxListener {
System.out.println("该数据不是最新的数据 不用更新");
accessFeignService.updateSyncCompanyState(object.getString("sequence_nbr"));
}
logger.info("create/update unit license info: " + "企业表有、平台表中有该条数据");
}
} catch(Exception e) {
System.out.println("名称为"+object.getString("unit_name")+"的公司:"+e.getMessage());
logger.error("【" + object.getString("unit_name") + "】许可信息同步【失败】:" + e.getMessage());
}
}
......
......@@ -141,8 +141,9 @@ spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.roles=SBA_ADMIN
amos.system.user.user-name=admin_tzs
amos.system.user.password=a1234560
## 后台执行机器人账号配置
amos.system.user.user-name=tzs_cti
amos.system.user.password=a1234567
amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=AMOS_STUDIO_WEB
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment