Commit b3e41f59 authored by lisong's avatar lisong

Merge branch 'develop_tzs' into develop_tzs_96333

# Conflicts: # amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/DispatchTaskServiceImpl.java
parents 2a85544d f8cf0346
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
......@@ -13,8 +14,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<amos.version.tzs>1.8.5</amos.version.tzs>
</properties>
<dependencies>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
......@@ -29,9 +31,20 @@
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-foundation</artifactId>
<version>${tyboot-version}</version>
<exclusions>
<exclusion>
<artifactId>log4j-to-slf4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<artifactId>log4j-to-slf4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId>
<artifactId>tyboot-core-restful</artifactId>
<version>${tyboot-version}</version>
......@@ -157,13 +170,6 @@
<artifactId>vastbase</artifactId>
<version>1.0.0.1</version>
</dependency>
<!-- LOG4J -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
......@@ -175,7 +181,11 @@
<version>1.8.5-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yeejoin</groupId>
<artifactId>amos-component-security</artifactId>
<version>${amos.version.tzs}</version>
</dependency>
</dependencies>
<build>
<plugins>
......
spring.application.name=AMOS-API-ACCESSAPI
server.servlet.context-path=/accessapi
server.port=11005
# jdbc_config
#spring.datasource.url=jdbc:mysql://mysql:3306/${TZS_ACCESSAPI_DATABASE}?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&serverTimezone=GMT%2B8
#spring.datasource.username=${MYSQL_ROOT_USER}
#spring.datasource.password=${MYSQL_ROOT_PASSWORD}
spring.datasource.url=jdbc:postgresql://${POSTGRESQL_IP_port}/${POSTGRESQL_NAME}?currentSchema=${ACCESSAPI_DATABASE}&stringtype=unspecified
spring.datasource.username=${POSTGRESQL_USER}
spring.datasource.password=${POSTGRESQL_PASSWORD}
spring.datasource.driver-class-name=org.postgresql.Driver
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=5
spring.datasource.hikari.maximum-pool-size=15
spring.datasource.hikari.auto-commit=true
spring.datasource.hikari.idle-timeout=30000
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.max-lifetime=1800000
spring.datasource.hikari.connection-timeout=30000
spring.datasource.hikari.connection-test-query=SELECT 1
# REDIS (RedisProperties)
spring.redis.cluster.nodes=${REDIS_CLUSTER_NODES}
spring.redis.password=${REDIS_PASSWORD}
spring.redis.cluster.max-redirects=3
spring.redis.timeout=10000
spring.redis.lettuce.cluster.refresh.adaptive=true
spring.redis.lettuce.cluster.refresh.period=2000
#注册中心地址
eureka.client.service-url.defaultZone =http://admin:a1234560@192.168.249.13:10001/eureka/,http://admin:a1234560@192.168.249.139:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.health-check-url=http://accessapi:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://accessapi:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://accessapi:${server.port}${server.servlet.context-path}/swagger-ui.html
eureka.instance.ip-address = 192.168.249.13
##emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=${EMQX_BROKER}
emqx.client-user-name=${EMQX_USER}
emqx.client-password=${EMQX_PASSWORD}
##biz custem properties
biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
spring.redis.mode=cluster
spring.redis.cluster.scan-interval=1000
spring.redis.cluster.read-mode=SLAVE
spring.redis.cluster.retry-attempts=3
spring.redis.cluster.failed-attempts=3
spring.redis.cluster.slave-connection-pool-size=64
spring.redis.cluster.master-connection-pool-size=64
spring.redis.cluster.retry-interval=1500
\ No newline at end of file
......@@ -2,11 +2,11 @@ spring.application.name=AMOS-API-ACCESSAPI
server.servlet.context-path=/accessapi
server.port=11005
# jdbc_config
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://172.16.10.220:3306/amos_openapi?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.driver-class-name=org.postgresql.Driver
spring.datasource.url=jdbc:postgresql://36.46.137.116:5432/tzs_amos_tzs_biz_init?currentSchema=amos_data_accessapi&allowMultiQueries=true
#spring.datasource.url=jdbc:vastbase://36.46.151.113:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz
spring.datasource.username=admin
spring.datasource.password=Yeejoin@2023
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=5
spring.datasource.hikari.maximum-pool-size=15
......@@ -19,17 +19,16 @@ spring.datasource.hikari.connection-test-query=SELECT 1
# REDIS (RedisProperties)
spring.redis.database=1
spring.redis.host=172.16.10.220
spring.redis.port=6379
spring.redis.host=172.16.10.230
spring.redis.port=16379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
#注册中心地址
eureka.client.service-url.defaultZone =http://172.16.10.220:10001/eureka/
eureka.client.service-url.defaultZone =http://172.16.10.230:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
......@@ -43,9 +42,9 @@ eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
##emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.220:1883
emqx.client-user-name=admin
emqx.client-password=public
emqx.broker=tcp://172.16.10.230:2883
emqx.client-user-name=super
emqx.client-password=123456
##biz custem properties
biz.lxyd.lift.url=http://39.106.181.149:8088/elevatorapi
......@@ -60,3 +59,12 @@ spring.influx.retention_policy=default
spring.influx.retention_policy_time=30d
spring.influx.actions=10000
spring.influx.bufferLimit=20000
spring.redis.mode=cluster
spring.redis.cluster.scan-interval=1000
spring.redis.cluster.read-mode=SLAVE
spring.redis.cluster.retry-attempts=3
spring.redis.cluster.failed-attempts=3
spring.redis.cluster.slave-connection-pool-size=64
spring.redis.cluster.master-connection-pool-size=64
spring.redis.cluster.retry-interval=1500
......@@ -13,3 +13,6 @@ mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml
mybatis-plus.type-aliases-super-type=org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity
mybatis-plus.global-config.db-config.id-type=ID_WORKER
spring.security.user.name=admin
spring.security.user.password=a1234560
spring.security.user.roles=SBA_ADMIN
\ No newline at end of file
......@@ -29,6 +29,10 @@
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-provider-redis-spring</artifactId>
</dependency>
<dependency>
<artifactId>amos-component-rule</artifactId>
<groupId>com.yeejoin</groupId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
......@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.elevator.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.DateFormat;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
......@@ -15,7 +14,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
*/
@Data
@Accessors(chain = true)
@Document(indexName = "idx_biz_view_jg_all", type = "idx_biz_view_jg_all", shards = 1, replicas = 0)
@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
public class ESEquipmentCategoryDto {
@Id
......
......@@ -21,7 +21,7 @@ import java.util.Date;
*/
@Data
@Accessors(chain = true)
@Document(indexName = "tzs", type = "tzsAlertCalled", shards = 1, replicas = 0)
@Document(indexName = "tzs", shards = 6, replicas = 2)
public class ESAlertCalled {
/** 主键 */
......
......@@ -10,7 +10,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
@Data
@Accessors(chain = true)
@Document(indexName = "cylinder_filling", type = "tzs_cylinder_filling", shards = 1, replicas = 0)
@Document(indexName = "cylinder_filling", shards = 6, replicas = 2)
public class ESCylinderFillingRecordDto {
@Id
......
......@@ -10,7 +10,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
@Data
@Accessors(chain = true)
@Document(indexName = "cylinder_info", type = "tzs_cylinder_info", shards = 1, replicas = 0)
@Document(indexName = "cylinder_info", shards = 6, replicas = 2)
public class ESCylinderInfoDto {
@Id
......
......@@ -15,7 +15,7 @@ import org.springframework.data.elasticsearch.annotations.GeoPointField;
*/
@Data
@Accessors(chain = true)
@Document(indexName = "cylinder", replicas = 0)
@Document(indexName = "cylinder", shards = 6, replicas = 2)
public class EsCylinder {
/**
......
......@@ -15,7 +15,7 @@ import org.springframework.data.elasticsearch.annotations.GeoPointField;
*/
@Data
@Accessors(chain = true)
@Document(indexName = "elev", type = "tzsElevator", shards = 1, replicas = 0)
@Document(indexName = "elev", shards = 6, replicas = 2)
public class EsElevator {
......
......@@ -101,7 +101,8 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
String callTimeEnd,
String type,
String alertSource,
String alarmType);
String alarmType,
@Param("list") Set<String> userIds);
List<AlertPaperInfoDto> getAlertPaperInfoList(@Param("regionCodes") List<String> regionCodes, @Param("isHistory") Boolean isHistory);
......
......@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.elevator.api.enums.DispatchPaperEnums;
import com.yeejoin.amos.boot.module.elevator.api.dto.*;
import java.util.List;
import java.util.Set;
/**
* 警情接警填报记录接口类
......@@ -80,7 +81,7 @@ public interface IAlertCalledService {
* @param alarmType
* @return
*/
List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType);
List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType, Set<String> userIds);
/**
* 获取坐席信息
......
......@@ -518,7 +518,12 @@
<if test="alarmType != null and alarmType != ''">
AND a.alarm_type = #{alarmType}
</if>
<if test="list != null ">
and a.rec_user_id in
<foreach collection="list" item="id" separator="," open="(" close=")">
#{id}
</foreach>
</if>
</select>
......
package com.yeejoin.amos.boot.module.elevator.biz.config;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Arrays;
@Configuration
public class ElasticSearchClientConfig {
......@@ -27,35 +25,26 @@ public class ElasticSearchClientConfig {
@Value("${elasticsearch.password}")
private String password;
@Bean
@Qualifier("highLevelClient")
@Bean(destroyMethod = "close")
public RestHighLevelClient restHighLevelClient() {
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY,
new UsernamePasswordCredentials(username, password));
try {
String url = uris.replace("http://", "");
final String[] parts = StringUtils.split(url, ":");
HttpHost httpHost = new HttpHost(parts[0], Integer.parseInt(parts[1]), "http");
RestClientBuilder builder = RestClient.builder(httpHost);
builder.setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
@Override
public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
RestClientBuilder builder = RestClient.builder(httpHosts);
builder.setHttpClientConfigCallback(httpClientBuilder -> {
httpClientBuilder.disableAuthCaching();
return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
}
});
builder.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
// 该方法接收一个RequestConfig.Builder对象,对该对象进行修改后然后返回。
@Override
public RequestConfig.Builder customizeRequestConfig(
RequestConfig.Builder requestConfigBuilder) {
return requestConfigBuilder.setConnectTimeout(5000 * 1000) // 连接超时(默认为1秒)
.setSocketTimeout(6000 * 1000);// 套接字超时(默认为30秒)//更改客户端的超时限制默认30秒现在改为100*1000分钟
}
});// 调整最大重试超时时间(默认为30秒).setMaxRetryTimeoutMillis(60000);
builder.setRequestConfigCallback(requestConfigBuilder -> {
// 连接超时(默认为1秒)
return requestConfigBuilder.setConnectTimeout(5000 * 1000)
// 套接字超时(默认为30秒)//更改客户端的超时限制默认30秒现在改为100*1000分钟
.setSocketTimeout(6000 * 1000);
});
return new RestHighLevelClient(builder);
} catch (Exception e) {
......
......@@ -552,6 +552,15 @@ public class AlertCalledController extends BaseController {
@ApiOperation(value = "导出接警记录信息", notes = "导出接警记录信息")
@GetMapping("/exportAlertRecord")
public void exportAlertRecord(AlertCalledRecordDto alertCalledQueryDto, HttpServletResponse response) {
//根据当前登陆人的所在区域 找到该区域内的接警人id 再找到相关警情
Set<String> userIds = new HashSet<>();
String regionCode = this.getSelectedOrgInfo().getCompany().getRegionCode();
List<TzsCitInfo> citInfoList = citInfoService.list(new LambdaQueryWrapper<TzsCitInfo>().eq(TzsCitInfo::getRegionCode, regionCode));
if (!ValidationUtil.isEmpty(citInfoList)) {
for (TzsCitInfo citInfo : citInfoList) {
userIds.add(citInfo.getCtiUserId());
}
}
List<AlertCalledRecordDto> list = iAlertCalledService.queryAlertRecordListByQueryDto(
alertCalledQueryDto.getCallTimeStart() == null ? null
: DateUtils.date2LongStr(alertCalledQueryDto.getCallTimeStart()),
......@@ -559,7 +568,8 @@ public class AlertCalledController extends BaseController {
: DateUtils.date2LongStr(alertCalledQueryDto.getCallTimeEnd()),
alertCalledQueryDto.getType(),
alertCalledQueryDto.getAlertSource(),
alertCalledQueryDto.getAlarmType());
alertCalledQueryDto.getAlarmType(),
userIds);
String fileName = "接警记录" + System.currentTimeMillis();
ExcelUtil.createTemplate(response, fileName, "接警记录", list, AlertCalledRecordDto.class, null, false);
}
......
......@@ -166,12 +166,12 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
wrapper.eq(DataDictionary::getCode, alertCalledDto.getUseSiteCategory());
DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
if (!ValidationUtil.isEmpty(dataDictionary)) {
alertCalledDto.setUseUnit(dataDictionary.getName());
alertCalledDto.setUseSiteCategory(dataDictionary.getName());
} else {
alertCalledDto.setUseUnit("");
alertCalledDto.setUseSiteCategory("");
}
} else {
alertCalledDto.setUseUnit("");
alertCalledDto.setUseSiteCategory("");
}
String voiceRecord = "";
VoiceRecordFile temp = voiceRecordFileServiceImpl.getOne(new LambdaQueryWrapper<VoiceRecordFile>().eq(VoiceRecordFile::getAlertId,id).eq(VoiceRecordFile::getAlertStageCode,"860").orderByAsc(VoiceRecordFile::getRecDate));
......@@ -417,8 +417,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
}
@Override
public List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType) {
List<AlertCalledRecordDto> list = alertCalledMapper.queryAlertRecordListByQueryDto(callTimeStart,callTimeEnd,type,alertSource,alarmType);
public List<AlertCalledRecordDto> queryAlertRecordListByQueryDto(String callTimeStart, String callTimeEnd, String type, String alertSource, String alarmType, Set<String> userIds) {
List<AlertCalledRecordDto> list = alertCalledMapper.queryAlertRecordListByQueryDto(callTimeStart, callTimeEnd, type, alertSource, alarmType, userIds);
return list;
}
......
......@@ -17,6 +17,8 @@ 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.systemctl.Systemctl;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.mock.web.MockMultipartFile;
......@@ -38,6 +40,8 @@ import java.util.Map;
@Service
public class CtiServiceImpl implements ICtiService {
private static final Logger logger = LogManager.getLogger(CtiServiceImpl.class);
@Autowired
RedisUtils redisUtils;
......@@ -65,6 +69,9 @@ public class CtiServiceImpl implements ICtiService {
public String getAccessToken() {
if(redisUtils.hasKey(RedisKey.CTI_TOKEN)){
Object obj= redisUtils.get(RedisKey.CTI_TOKEN);
logger.info("getAccessToken redis cti_token============>" + RedisKey.CTI_TOKEN);
logger.info("getAccessToken redis obj============>" + obj);
logger.info("getAccessToken redis obj.toString()============>" + obj.toString());
return obj.toString();
} else {
String tokenAccessUrl = ctiUrl+ "/openauth/getAccessToken";
......@@ -85,6 +92,7 @@ public class CtiServiceImpl implements ICtiService {
if(response.getInteger("code") == 0) { // 获取token 成功
try {
String token = response.getJSONObject("data").getString("accessToken");
logger.info("getAccessToken response token============>" + token);
redisUtils.set(RedisKey.CTI_TOKEN, token,time);
return token;
} catch (Exception e) {
......@@ -143,6 +151,7 @@ public class CtiServiceImpl implements ICtiService {
public Map<Object, Object> getUserStatus(){
Map<Object, Object> map = new HashMap<>();
String token = this.getAccessToken();
logger.info("cti access token===========> " + token);
Map<String,Object> params = new HashMap<>();
params.put("accessToken",token);
String loginUrl = ctiUrl + "/cti/getagentinfomonitor" + "?accessToken=" + token;
......@@ -150,6 +159,7 @@ public class CtiServiceImpl implements ICtiService {
JSONObject response = null;
try {
response = JSONObject.parseObject(responseStr);
logger.info("cti response===========> " + response);
} catch (Exception e) {
throw new BadRequest("获取登录状态出错:" + e.getMessage());
}
......@@ -161,6 +171,7 @@ public class CtiServiceImpl implements ICtiService {
JSONObject jsonObject = JSON.parseObject(String.valueOf(object));
map.put(jsonObject.get("code"),jsonObject.get("state"));
}
logger.info("cti map===========> " + map);
return map;
}
......@@ -242,7 +253,6 @@ public class CtiServiceImpl implements ICtiService {
if (ValidationUtil.isEmpty(userId)) {
return ctiUserDto;
}
AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
LambdaQueryWrapper<TzsCitInfo> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TzsCitInfo::getCtiUserId, userId);
TzsCitInfo ctiInfo = ctiInfoService.getOne(wrapper);
......
......@@ -229,14 +229,14 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
break;
case "GZWX" : // 故障维修
dispatchTaskDto.setIsSaveTask(false);
desc = dynamicParms.get("desc") == null ? "" : dynamicParms.get("desc");
content = content.replace("$use_unit",useUnit).replace("$desc",desc);
desc = dynamicParms.get("fault_report") == null ? "" : dynamicParms.get("fault_report");
content = content.replace("$use_unit", useUnit).replace("$desc", desc);
break;
case "TSZX" : // 投诉咨询
dispatchTaskDto.setIsSaveTask(false);
desc = dynamicParms.get("desc") == null ? "" : dynamicParms.get("desc");
content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone",contactPhone);
content = content.replace("$use_unit",useUnit).replace("$desc",desc);
desc = dynamicParms.get("complaint_consulttation") == null ? "" : dynamicParms.get("complaint_consulttation");
content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone", contactPhone);
content = content.replace("$use_unit", useUnit).replace("$desc", desc);
break;
}
dispatchTaskDto.setDispatchContext(content);
......
......@@ -148,17 +148,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
//一码通复制功能url参数key
private static final String COPY_KEY = "stashType";
@Value("${biz.elasticsearch.address}")
private String esAddress;
@Value("${biz.elasticsearch.port}")
private Integer esPort;
@Value("${elasticsearch.username}")
private String esUserName;
@Value("${elasticsearch.password}")
private String esPwd;
@Autowired
RestHighLevelClient restHighLevelClient;
private static String USE_CODE = "use_code";
......@@ -1200,11 +1192,10 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
return save;
}
public Page<JSONObject> queryByKeys(JSONObject map) {
//根据当前登录人查询
// //根据当前登录人查询
if (!ValidationUtil.isEmpty(map.get(EQUSTATE))) {
map.put(EQUSTATE, EquimentEnum.getCode.get(map.get(EQUSTATE).toString()).toString());
}
ResponseModel<Page<Map<String, Object>>> model = new ResponseModel<>();
JSONObject object = getCompanyType().get(0);
String level = object.getString("level");
String code = object.getString("orgCode");
......@@ -1219,19 +1210,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
}
}
Page<JSONObject> result = new Page<>(map.getInteger("number"), map.getInteger("size"));
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY,
new UsernamePasswordCredentials(esUserName, esPwd)); //es账号密码
RestHighLevelClient esClient = new RestHighLevelClient(
RestClient.builder(
new HttpHost(esAddress, esPort)
).setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
httpClientBuilder.disableAuthCaching();
return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
}
})
);
SearchRequest request = new SearchRequest();
request.indices("idx_biz_view_jg_all");
SearchSourceBuilder builder = new SearchSourceBuilder();
......@@ -1329,7 +1307,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
List<JSONObject> list = new LinkedList<>();
long totle = 0;
try {
SearchResponse response = esClient.search(request, RequestOptions.DEFAULT);
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
for (org.elasticsearch.search.SearchHit hit : response.getHits().getHits()) {
System.out.println(hit);
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
......@@ -1346,12 +1324,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
result.setTotal(totle);
} catch (IOException e) {
throw new RuntimeException(e);
} finally {
try {
esClient.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
}
return result;
}
......
......@@ -95,8 +95,11 @@ public class RescueProcessServiceImpl extends BaseService<RescueProcessDto,Rescu
Date rescueTime = rescueProcessDto.getRescueTime();
if(arriveTime != null && dispatchTime != null) {
Long arriveTimes = arriveTime.getTime() - dispatchTime.getTime(); // 相差毫秒数
String hms = DateUtils.getTimestr(arriveTime,dispatchTime);
rescueProcessDto.setIsTimeout(arriveTimes < 1800000 ? false : true);
}
// 救援时长 用完成时间减去到达时间
if(rescueTime != null && dispatchTime != null) {
String hms = DateUtils.getTimestr(rescueTime,dispatchTime);
rescueProcessDto.setArriveUseTime(hms);
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
......
......@@ -72,8 +72,8 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
@Autowired
private TzsAuthServiceImpl tzsAuthServiceImpl;
@Scheduled(fixedDelay=ONE_Minute)
@SchedulerLock(name="voiceRecordLogTask",lockAtMostFor = "PT1H")
@Scheduled(cron = "${async.voice.record.log.cron:0 0/1 * * * ?}")
@SchedulerLock(name="voiceRecordLogTask",lockAtMostFor = "PT30H")
public void fixedDelayJob(){
// 设置token
tzsAuthServiceImpl.setRequestContext();
......@@ -118,7 +118,7 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
model.setTelStartTime(telStartTime);
model.setTelEndTime(telEndTime);
if(1 == recordInfo.getInteger("callType")) {
model.setFileType("客户呼入");
model.setFileType("呼入");
} else if(2 == recordInfo.getInteger("callType")) {
model.setFileType("坐席呼出");
}
......
......@@ -10,25 +10,15 @@ import com.yeejoin.amos.boot.module.elevator.flc.api.dto.CylinderFillingRecordDt
import com.yeejoin.amos.boot.module.elevator.flc.api.entity.CylinderFillingRecord;
import com.yeejoin.amos.boot.module.elevator.flc.api.mapper.CylinderFillingRecordMapper;
import com.yeejoin.amos.boot.module.elevator.flc.api.service.ICylinderFillingRecordService;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -55,17 +45,8 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
@Autowired
CylinderFillingRecordMapper cylinderFillingRecordMapper;
@Value("${biz.elasticsearch.address}")
private String esAddress;
@Value("${biz.elasticsearch.port}")
private Integer esPort;
@Value("${elasticsearch.username}")
private String esUserName;
@Value("${elasticsearch.password}")
private String esPwd;
@Autowired
RestHighLevelClient restHighLevelClient;
/**
* 分页查询
......@@ -127,7 +108,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
//@Scheduled(cron = "${tzs.cylinder.fill.cron}")
public void setTimeSaveCylinderInfoToES(){
public void setTimeSaveCylinderInfoToES() {
Page<ESCylinderFillingRecordDto> cylinderFillingRecordPage = new Page<>();
Page<ESCylinderFillingRecordDto> cyinderInfoList = cylinderFillingRecordMapper.getCyinderFillingRecord(cylinderFillingRecordPage);
Long count = cyinderInfoList.getCurrent();
......@@ -143,10 +124,10 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
cylinderFillingRecordPage.setCurrent(i);
cylinderFillingRecordPage.setSize(1000);
cylinderFillingRecordPage = cylinderFillingRecordMapper.getCyinderFillingRecord(cylinderFillingRecordPage);
if(!ObjectUtils.isEmpty(cylinderFillingRecordPage)){
cylinderFillingRecordPage.getRecords().stream().map(item->{
if(!ObjectUtils.isEmpty(item.getSequenceCode())){
ESCylinderFillingRecordDto cyinderFillingRecordInfo = cylinderFillingRecordMapper.getCyinderFillingRecordInfo(item.getAppId(),item.getSequenceCode());
if (!ObjectUtils.isEmpty(cylinderFillingRecordPage)) {
cylinderFillingRecordPage.getRecords().stream().map(item -> {
if (!ObjectUtils.isEmpty(item.getSequenceCode())) {
ESCylinderFillingRecordDto cyinderFillingRecordInfo = cylinderFillingRecordMapper.getCyinderFillingRecordInfo(item.getAppId(), item.getSequenceCode());
item.setUnitName(cyinderFillingRecordInfo.getUnitName());
item.setFactoryNum(cyinderFillingRecordInfo.getFactoryNum());
item.setCylinderVariety(cyinderFillingRecordInfo.getCylinderVariety());
......@@ -164,7 +145,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
// for (ESCylinderFillingRecordDto ci : cylinderFillingRecordPage.getRecords()) {
// saveCylinderFillingRecordToES(ci);
// }
if(!ObjectUtils.isEmpty(cylinderFillingRecordPage)){
if (!ObjectUtils.isEmpty(cylinderFillingRecordPage)) {
saveCylinderFillingRecord2ES(cylinderFillingRecordPage.getRecords());
}
}
......@@ -174,7 +155,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
@Override
public Page<ESCylinderFillingRecordDto> getCyinderFillingRecord(Page<ESCylinderFillingRecordDto> cylinderFillingRecordDto) {
Page<ESCylinderFillingRecordDto> cyinderFillingRecord = cylinderFillingRecordMapper.getCyinderFillingRecord(cylinderFillingRecordDto);
if(!ObjectUtils.isEmpty(cyinderFillingRecord)){
if (!ObjectUtils.isEmpty(cyinderFillingRecord)) {
cyinderFillingRecord.getRecords().stream().map(item -> {
if (!ObjectUtils.isEmpty(item.getSequenceCode())) {
ESCylinderFillingRecordDto cyinderFillingRecordInfo = cylinderFillingRecordMapper.getCyinderFillingRecordInfo(item.getAppId(), item.getSequenceCode());
......@@ -202,26 +183,6 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
public Page<ESCylinderFillingRecordDto> queryByKeys(ESCylinderFillingRecordDto esCylinderFillingRecordDto, int pageNum, int pageSize) {
Page<ESCylinderFillingRecordDto> result = new Page<ESCylinderFillingRecordDto>(pageNum, pageSize);
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY,
new UsernamePasswordCredentials(esUserName, esPwd)); //es账号密码
RestHighLevelClient esClient =new RestHighLevelClient(
RestClient.builder(
new HttpHost(esAddress,esPort)
).setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
httpClientBuilder.disableAuthCaching();
return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
}
})
);
// RestHighLevelClient esClient = new RestHighLevelClient(
// RestClient.builder(new HttpHost(esAddress, esPort, "http"))
// );
SearchRequest request = new SearchRequest();
request.indices("cylinder_filling");
......@@ -328,7 +289,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
boolMust.must(query);
}
if(flag) { // 搜索全部
if (flag) { // 搜索全部
boolMust.must(QueryBuilders.matchAllQuery());
}
......@@ -340,9 +301,8 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
List<ESCylinderFillingRecordDto> list = new LinkedList<>();
long totle = 0;
try {
SearchResponse response = esClient.search(request, RequestOptions.DEFAULT);
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
for (org.elasticsearch.search.SearchHit hit : response.getHits()) {
System.out.println(hit);
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
ESCylinderFillingRecordDto esCylinderFillingRecordDto1 = JSONObject.toJavaObject(jsonObject.getJSONObject("sourceAsMap"), ESCylinderFillingRecordDto.class);
list.add(esCylinderFillingRecordDto1);
......@@ -362,7 +322,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
List<CylinderFillingRecord> cylinderFillingRecordList = new ArrayList<>();
for (ESCylinderFillingRecordDto record : records) {
CylinderFillingRecord cylinderFillingRecord = new CylinderFillingRecord();
BeanUtils.copyProperties(record,cylinderFillingRecord);
BeanUtils.copyProperties(record, cylinderFillingRecord);
cylinderFillingRecord.setIsNotEs("1");
cylinderFillingRecord.setSequenceNbr(record.getSequenceNbr());
cylinderFillingRecordList.add(cylinderFillingRecord);
......
spring.datasource.url=jdbc:vastbase://${POSTGRESQL_IP_port}/${POSTGRESQL_NAME}?currentSchema=${TZS_IDX_BIZ_DATABASE}&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&noAccessToProcedureBodies=true&allowMultiQueries=true
spring.datasource.username=${POSTGRESQL_USER}
spring.datasource.password=${POSTGRESQL_PASSWORD}
#注册中心地址
eureka.client.service-url.defaultZone =http://admin:a1234560@192.168.249.13:10001/eureka/,http://admin:a1234560@192.168.249.139:10001/eureka/
eureka.instance.prefer-ip-address=true
eureka.instance.ip-address = 192.168.249.139
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.health-check-url=http://elevator:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://elevator:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://elevator:${server.port}${server.servlet.context-path}/doc.html
## ES properties:
spring.elasticsearch.rest.uris=${ELASTICSEARCH_REST_URIS}
elasticsearch.username=${ELASTICSEARCH_USERNAME}
elasticsearch.password= ${ELASTICSEARCH_PASSWORD}
## unit(h)
alertcall.es.synchrony.time=48
#redis properties:
spring.redis.mode=cluster
spring.redis.cluster.nodes=${REDIS_CLUSTER_NODES}
spring.redis.password=${REDIS_PASSWORD}
spring.redis.cluster.max-redirects=3
spring.redis.timeout=10000
spring.redis.lettuce.cluster.refresh.adaptive=true
spring.redis.lettuce.cluster.refresh.period=2000
#默认配置,生产时需要调优
spring.redis.lettuce.pool.max-active=8
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=8
spring.redis.lettuce.pool.min-idle=0
#springboot指标显示器不使用默认的,使用自定义的MyRedisHealthIndicator
management.health.redis.enabled=false
##emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=${EMQX_BROKER}
emqx.client-user-name=${EMQX_USER}
emqx.client-password=${EMQX_PASSWORD}
tzs.cti.appkey=0a1b1cf1-a55b-447a-d275-02931f13b2fa
tzs.cti.secretkey=cae7c0f8-a7b8-9876-d69b-3eba8262898a
tzs.cti.url=http://192.168.249.178:8000
##wechatToken
tzs.wechat.token=yeejoin_2021
##wechatTicketUrl
tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
#tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
tzs.wechat.tempId.kr=bxchKYhYW7aHbGKM2pVyR_yY2-bG4sRMNU3ZRQbMKYM
tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
#tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
#tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
tzs.wechat.tempId.ts=VWqgY-lXFt4dg2EL4pLjfDCBAU49Z0mRxVaQhAMMW8Q
tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
mqtt.topic.task.newtask=tzs-task-newtask
mqtt.topic.task.personinfo=tzs-task-personinfo
mqtt.topic.elevator.push=/tzs/tcb_elevator
mqtt.topic.alertInfo.push=/tzs/tcb_alertInfo
mqtt.topic.alertReport.push=/tzs/tcb_alertReport
mqtt.topic.alertHeart.push=/tzs/tcb_alertHeart
mqtt.topic.alertMatrix.push=/tzs/tcb_alertMatrix
mqtt.topic.cti.push=/cti/record
cti.user.name=tzs_cti
cti.user.pwd=a1234567
flc.sms.tempCode=SMS_TZS_0001
## 预警通知模板id
tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
##督查整改通知
tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
## 公众号测试用户id(平台userId)
tzs.wechat.test.userId=3413513
fileserver.domain=https://rpm.yeeamos.com:8888/
org.filter.group.seq=1564150103147573249
duty.seats.role.ids=1585956200472674305,1585956257590706177
## 规则配置 properties:
rule.definition.load=false
##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
rule.definition.default-agency=tzs
rule.definition.local-ip=192.168.249.139
tzs.auth.user.photo=/public/common/userPic.png
minio.url.path=${MINIO_FILESERVER_DOMAIN}/
#### 管理员变更机器人账号
tzs.admin.name=tzs_robot
tzs.admin.pwd=a1234567
##小程序appid
tzs.WxApp.appId=wx48a1b1915b10d14b
tzs.WxApp.secret=ac4f4a9d3c97676badb70c19a2f37b16
tzs.WxApp.grant-type=authorization_code
#气瓶充装信息定时同步至es
tzs.cylinder.fill.cron=0 0 12 * * ?
#气瓶基本信息定时同步至es
tzs.cylinder.info.cron=0 0 1 * * ?
outSystem.user.password=a1234560
amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=STUDIO_APP_WEB
##生成监管码前缀域名
regulatory_code_prefix=https://nav.sspai.top/tzs?code=
#DB properties:
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://172.16.10.90:53306/tzs_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
##eureka properties:
eureka.client.service-url.defaultZone =http://172.16.3.99:10001/eureka/
spring.datasource.url=jdbc:vastbase://36.46.137.116:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
spring.datasource.username=admin
spring.datasource.password=Yeejoin@2023
eureka.client.service-url.defaultZone=http://172.16.10.230:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.health-check-url=http://172.16.3.99:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.health-check-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://172.16.3.99:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.99:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.status-page-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.34:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address=172.16.3.34
## ES properties:
biz.elasticsearch.address=172.16.10.90
spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username= elastic
elasticsearch.password= Yeejoin@2020
elasticsearch.username=elastic
elasticsearch.password=a123456
spring.elasticsearch.rest.uris=http://172.16.10.230:9200
## unit(h)
alertcall.es.synchrony.time=48
fileserver.domain=https://rpm.yeeamos.com:8888/
#redis properties:
spring.redis.database=1
spring.redis.host=172.16.10.90
spring.redis.host=172.16.10.230
spring.redis.port=16379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
## emqx properties:
emqx.clean-session=true
emqx.clean-session=false
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
tzs.cti.url=http://172.16.10.90:8000
rule.definition.load=false
rule.definition.model-package=com.yeejoin.amos.boot.module.elevator.api.dto
rule.definition.default-agency=tzs
rule.definition.localIp=172.16.3.39
emqx.broker=tcp://36.46.151.113:1883
emqx.client-user-name=super
emqx.client-password=123456
emqx.keepAliveInterval=1000
tzs.cti.appkey=4e805006-3fef-ae43-3915-a153731007c4
tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
tzs.cti.url=http://36.41.172.83:8000
##wechatToken
tzs.wechat.token=yeejoin_2021
##wechatTicketUrl
tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
#tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
tzs.wechat.tempId.kr=bxchKYhYW7aHbGKM2pVyR_yY2-bG4sRMNU3ZRQbMKYM
tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
#tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
#tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
tzs.wechat.tempId.ts=VWqgY-lXFt4dg2EL4pLjfDCBAU49Z0mRxVaQhAMMW8Q
tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
mqtt.topic.task.newtask=tzs-task-newtask
mqtt.topic.task.personinfo=tzs-task-personinfo
mqtt.topic.elevator.push=/tzs/tcb_elevator
mqtt.topic.alertInfo.push=/tzs/tcb_alertInfo
mqtt.topic.alertReport.push=/tzs/tcb_alertReport
mqtt.topic.alertHeart.push=/tzs/tcb_alertHeart
mqtt.topic.alertMatrix.push=/tzs/tcb_alertMatrix
mqtt.topic.cti.push=/cti/record
cti.user.name=tzs_cti
cti.user.pwd=a1234567
flc.sms.tempCode=SMS_TZS_0001
## ??????id
tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
##??????
tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
## ???????id???userId?
tzs.wechat.test.userId=3413513
##new properties
org.filter.group.seq=1564150103147573249
fileserver.domain=http://172.16.10.230:19000/
log.level=INFO
duty.seats.role.ids=1585956200472674305,1585956257590706177
## ???? properties:
rule.definition.load=false
##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
rule.definition.default-agency=tzs
rule.definition.local-ip=172.16.10.230
#\u6C14\u74F6\u5145\u88C5\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
tzs.cylinder.fill.cron=0 0 12 * * ?
#\u6C14\u74F6\u57FA\u672C\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
tzs.cylinder.info.cron=0 0 1 * * ?
# ??????????
minio.url.path=http://172.16.10.230:9000/
## ɼǰ׺
regulatory_code_prefix=https://nav.sspai.top/tzs?code=
outSystem.user.password=a1234560
amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=STUDIO_APP_WEB
\ No newline at end of file
#DB properties:
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://36.46.151.113:23306/tzs_amos_tzs_biz_init?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
#eureka properties:
eureka.instance.hostname= eureka
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone =http://36.46.151.113:10001/eureka/
eureka.instance.ip-address = 172.16.3.133
## ES properties:
biz.elasticsearch.address=36.46.151.113
spring.data.elasticsearch.cluster-name=docker-cluster
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username=elastic
elasticsearch.password=123456
## unit(h)
alertcall.es.synchrony.time=48
#redis properties:
spring.redis.database=1
spring.redis.host=36.46.151.113
spring.redis.port=16379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
## emqx properties:
emqx.clean-session=false
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://36.46.151.113:1883
emqx.user-name=super
emqx.password=123456
emqx.keepAliveInterval=1000
tzs.cti.appkey=4e805006-3fef-ae43-3915-a153731007c4
tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
tzs.cti.url=http://36.46.151.113:8000
##wechatToken
tzs.wechat.token=yeejoin_2021
##wechatTicketUrl
tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
#tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
tzs.wechat.tempId.kr=bxchKYhYW7aHbGKM2pVyR_yY2-bG4sRMNU3ZRQbMKYM
tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
#tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
#tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
tzs.wechat.tempId.ts=VWqgY-lXFt4dg2EL4pLjfDCBAU49Z0mRxVaQhAMMW8Q
tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
mqtt.topic.task.newtask=tzs-task-newtask
mqtt.topic.task.personinfo=tzs-task-personinfo
mqtt.topic.elevator.push=/tzs/tcb_elevator
mqtt.topic.alertInfo.push=/tzs/tcb_alertInfo
mqtt.topic.alertReport.push=/tzs/tcb_alertReport
mqtt.topic.alertHeart.push=/tzs/tcb_alertHeart
mqtt.topic.alertMatrix.push=/tzs/tcb_alertMatrix
mqtt.topic.cti.push=/cti/record
cti.user.name=tzs_cti
cti.user.pwd=a1234567
flc.sms.tempCode=SMS_TZS_0001
## \u9884\u8B66\u901A\u77E5\u6A21\u677Fid
tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
##\u7763\u67E5\u6574\u6539\u901A\u77E5
tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
## \u516C\u4F17\u53F7\u6D4B\u8BD5\u7528\u6237id\uFF08\u5E73\u53F0userId\uFF09
tzs.wechat.test.userId=3413513
fileserver.domain=https://rpm.yeeamos.com:8888/
org.filter.group.seq=1564150103147573249
duty.seats.role.ids=1585956200472674305,1585956257590706177
#DB properties:
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://113.134.211.174:3306/xiy_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
##eureka properties:
eureka.client.service-url.defaultZone =http://172.16.3.28:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.health-check-url=http://172.16.3.28:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://172.16.3.28:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://192.168.1.10:${server.port}${server.servlet.context-path}/doc.html
## ES properties:
biz.elasticsearch.address=36.46.151.113
spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
## unit(h)
alertcall.es.synchrony.time=48
#redis properties:
spring.redis.database=1
spring.redis.host=172.16.3.28
spring.redis.port=16379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.28:1883
emqx.user-name=admin
emqx.password=public
tzs.cti.url=http://113.134.211.174:8000
rule.definition.load=false
rule.definition.model-package=com.yeejoin.amos.boot.module.elevator.api.dto
rule.definition.default-agency=tzs
rule.definition.localIp=172.16.3.39
\ No newline at end of file
#DB properties:
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://36.46.151.113:13306/tzs_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8\
&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
##eureka properties:
eureka.client.service-url.defaultZone =http://36.46.151.113:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.health-check-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
## ES properties:
biz.elasticsearch.address=36.46.151.113
spring.data.elasticsearch.cluster-name=elasticsearch
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
## unit(h)
alertcall.es.synchrony.time=48
#redis properties:
spring.redis.database=1
spring.redis.host=36.46.151.113
spring.redis.port=16379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://36.46.151.113:1883
emqx.user-name=admin
emqx.password=public
tzs.cti.url=http://113.134.211.174:8000
spring.application.name=TZS-96333
server.servlet.context-path=/elevator
server.port=11004
spring.profiles.active=dev3
spring.profiles.active=dev
spring.jackson.time-zone=GMT+8
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
logging.config=classpath:logback-${spring.profiles.active}.xml
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
logging.level.net.javacrumbs.shedlock=DEBUG
##liquibase
spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
spring.liquibase.enabled= true
......@@ -37,12 +38,7 @@ spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.max-lifetime=120000
spring.datasource.hikari.connection-timeout=30000
spring.datasource.hikari.connection-test-query=SELECT 1
## redis properties:
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
iot.fegin.name=AMOS-API-IOT
......@@ -152,7 +148,7 @@ amos.system.user.app-key=AMOS_STUDIO
amos.system.user.product=AMOS_STUDIO_WEB
## ??????????????topic
amos.operation.log=$share/${spring.application.name}/amos/operation/log
amos.operation.log=$share/${spring.application.name}//amos/operation/log
amos.agency.code=tzs
## ?????orgCode
......
......@@ -37,20 +37,20 @@
<logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
-->
<!--myibatis log configure-->
<logger name="com.apache.ibatis" level="INFO"/>
<logger name="org.mybatis" level="INFO" />
<logger name="java.sql.Connection" level="INFO"/>
<logger name="java.sql.Statement" level="INFO"/>
<logger name="java.sql.PreparedStatement" level="INFO"/>
<logger name="org.springframework" level="INFO"/>
<logger name="com.apache.ibatis" level="debug"/>
<logger name="org.mybatis" level="debug" />
<logger name="java.sql.Connection" level="debug"/>
<logger name="java.sql.Statement" level="debug"/>
<logger name="java.sql.PreparedStatement" level="debug"/>
<logger name="org.springframework" level="debug"/>
<logger name="com.baomidou.mybatisplus" level="INFO"/>
<logger name="org.apache.activemq" level="INFO"/>
<logger name="org.typroject" level="INFO"/>
<logger name="com.yeejoin" level="INFO"/>
<logger name="com.baomidou.mybatisplus" level="debug"/>
<logger name="org.apache.activemq" level="debug"/>
<logger name="org.typroject" level="debug"/>
<logger name="com.yeejoin" level="debug"/>
<!-- 日志输出级别 -->
<root level="DEBUG">
<root level="error">
<!-- <appender-ref ref="FILE" /> -->
<appender-ref ref="STDOUT" />
<!-- <appender-ref ref="ELK" />-->
......
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="log" />
<!--格式化输出:%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" />
<!-- 按照每天生成日志文件 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/96333.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<!--日志文件大小-->
<MaxFileSize>30mb</MaxFileSize>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- ELK管理 -->
<appender name="ELK" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>172.16.10.230:4560</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
</appender>
<!-- show parameters for hibernate sql 专为 Hibernate 定制
<logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" />
<logger name="org.hibernate.type.descriptor.sql.BasicExtractor" level="DEBUG" />
<logger name="org.hibernate.SQL" level="DEBUG" />
<logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
<logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
-->
<!--myibatis log configure-->
<logger name="com.apache.ibatis" level="INFO"/>
<logger name="org.mybatis" level="INFO" />
<logger name="java.sql.Connection" level="INFO"/>
<logger name="java.sql.Statement" level="INFO"/>
<logger name="java.sql.PreparedStatement" level="INFO"/>
<logger name="org.springframework" level="INFO"/>
<logger name="com.baomidou.mybatisplus" level="INFO"/>
<logger name="org.apache.activemq" level="INFO"/>
<logger name="org.typroject" level="INFO"/>
<logger name="com.yeejoin" level="INFO"/>
<!-- 日志输出级别 -->
<root level="DEBUG">
<!-- <appender-ref ref="FILE" /> -->
<appender-ref ref="STDOUT" />
<!-- <appender-ref ref="ELK" />-->
</root>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="log" />
<!--格式化输出:%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" />
<!-- 按照每天生成日志文件 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/96333.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<!--日志文件大小-->
<MaxFileSize>30mb</MaxFileSize>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- show parameters for hibernate sql 专为 Hibernate 定制
<logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" />
<logger name="org.hibernate.type.descriptor.sql.BasicExtractor" level="DEBUG" />
<logger name="org.hibernate.SQL" level="DEBUG" />
<logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
<logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
-->
<!--myibatis log configure-->
<logger name="com.apache.ibatis" level="DEBUG"/>
<logger name="org.mybatis" level="DEBUG" />
<logger name="java.sql.Connection" level="DEBUG"/>
<logger name="java.sql.Statement" level="DEBUG"/>
<logger name="java.sql.PreparedStatement" level="DEBUG"/>
<logger name="org.springframework" level="DEBUG"/>
<logger name="com.baomidou.mybatisplus" level="DEBUG"/>
<logger name="org.apache.activemq" level="INFO"/>
<logger name="org.typroject" level="DEBUG"/>
<logger name="com.yeejoin" level="DEBUG"/>
<!-- 日志输出级别 -->
<root level="DEBUG">
<appender-ref ref="FILE" />
<appender-ref ref="STDOUT" />
</root>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="log" />
<!--格式化输出:%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" />
<!-- 按照每天生成日志文件 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/96333.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<!--日志文件大小-->
<MaxFileSize>30mb</MaxFileSize>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- show parameters for hibernate sql 专为 Hibernate 定制
<logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" />
<logger name="org.hibernate.type.descriptor.sql.BasicExtractor" level="DEBUG" />
<logger name="org.hibernate.SQL" level="DEBUG" />
<logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
<logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
-->
<!--myibatis log configure-->
<logger name="com.apache.ibatis" level="DEBUG"/>
<logger name="org.mybatis" level="DEBUG" />
<logger name="java.sql.Connection" level="DEBUG"/>
<logger name="java.sql.Statement" level="DEBUG"/>
<logger name="java.sql.PreparedStatement" level="DEBUG"/>
<logger name="org.springframework" level="DEBUG"/>
<logger name="com.baomidou.mybatisplus" level="DEBUG"/>
<logger name="org.apache.activemq" level="INFO"/>
<logger name="org.typroject" level="DEBUG"/>
<logger name="com.yeejoin" level="DEBUG"/>
<!-- 日志输出级别 -->
<root level="DEBUG">
<appender-ref ref="FILE" />
<appender-ref ref="STDOUT" />
</root>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>amos-boot-module-app</artifactId>
<groupId>com.amosframework.boot</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0.0</version>
<artifactId>amos-boot-module-app-api</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-common-api</artifactId>
<version>${amos-biz-boot.version}</version>
</dependency>
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-spring</artifactId>
</dependency>
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-provider-redis-spring</artifactId>
</dependency>
<dependency>
<artifactId>amos-component-rule</artifactId>
<groupId>com.yeejoin</groupId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
package com.yeejoin.amos.boot.module.app.api.common;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @description: 公共实体
* @author: duanwei
**/
@Data
public class BaseEntity implements Serializable {
private static final long serialVersionUID = -5464322936854328207L;
@TableId(type = IdType.ID_WORKER)
private Long id;
/**
* 创建时间
*/
@TableField(value = "create_date", fill = FieldFill.INSERT)
private Date createDate;
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.UPDATE)
private Date updateTime;
}
package com.yeejoin.amos.boot.module.app.api.common;
import com.yeejoin.amos.boot.module.app.api.enums.BaseExceptionEnum;
/**
* @Author cpp
* @Description基础异常类
* @Date 2023/4/23
*/
public class BaseException extends RuntimeException {
private static final long serialVersionUID = 194906846739586857L;
/**
* 错误码
*/
private int code;
/**
* 错误内容
*/
private String msg;
public BaseException(String msg) {
super(msg);
}
public BaseException(int code, String msg) {
super(msg);
this.code = code;
this.msg = msg;
}
public BaseException(BaseExceptionEnum baseExceptionEnum) {
super(baseExceptionEnum.getMsg());
this.msg = baseExceptionEnum.getMsg();
this.code = baseExceptionEnum.getCode();
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
}
package com.yeejoin.amos.boot.module.app.api.common;
/**
* @Description: 通用常量类
* @Author: DELL
* @Date: 2021/5/26
*/
public interface BizCommonConstant {
/**
* 所有平台企业数据redisKey
*/
String COMPANY_TREE_REDIS_KEY = "REGULATOR_UNIT_TREE";
}
package com.yeejoin.amos.boot.module.app.api.common;
import com.yeejoin.amos.boot.module.app.api.enums.CommonErrorEnum;
/**
* @description: 共同异常类
* @author: duanwei
* @create: 2019-08-28 20:07
**/
public class CommonException extends BaseException {
private static final long serialVersionUID = 194906846739586857L;
/**
* 错误码
*/
private int code;
/**
* 错误内容
*/
private String msg;
public CommonException(int code, String msg) {
super(msg);
this.code = code;
this.msg = msg;
}
public CommonException(CommonErrorEnum menuExceptionEnum) {
super(menuExceptionEnum.getMsg());
this.msg = menuExceptionEnum.getMsg();
this.code = menuExceptionEnum.getCode();
}
@Override
public int getCode() {
return code;
}
@Override
public void setCode(int code) {
this.code = code;
}
@Override
public String getMsg() {
return msg;
}
@Override
public void setMsg(String msg) {
this.msg = msg;
}
}
package com.yeejoin.amos.boot.module.app.api.common;
import org.springframework.util.Assert;
import java.io.Closeable;
import java.io.Flushable;
import java.io.IOException;
/**
* IO流拓展工具类,补充IOUtils新版本中废弃的closeQuietly
*
* @author King
* @since 2018/12/27 17:56
*/
public class ExtendedIOUtils {
public static void flush(Flushable... resources) throws IOException {
Assert.noNullElements(resources, "resources invalid");
int length = resources.length;
for (int i = 0; i < length; ++i) {
Flushable resource = resources[i];
if (resource != null) {
resource.flush();
}
}
}
public static void closeQuietly(Closeable... resources) {
int length = resources.length;
for (int i = 0; i < length; ++i) {
Closeable resource = resources[i];
if (resource != null) {
try {
resource.close();
} catch (IOException e) {
//ignore exception
}
}
}
}
}
package com.yeejoin.amos.boot.module.app.api.common;
import java.util.HashMap;
import java.util.Map;
/**
* @Description: 全局单机缓存
* @Author: duanwei
* @Date: 2020/6/30
*/
public class GlobalCache {
/**
* 全局请求头
*/
public static Map<String, String> header = new HashMap<>();
/**
* 依赖参数容器
*/
public static Map<String, String> paramMap = new HashMap<>(1000);
}
package com.yeejoin.amos.boot.module.app.api.common;
import lombok.Data;
/**
* @Author cpp
* @Description
* @Date 2023/4/23
*/
@Data
public class MobileLoginParam {
/**
* 注册类型:1-微信授权快捷登录;2-手机验证登录
*/
private int registerType;
/**
* 是否需要需要短信验证: true-验证; false-不验证
*/
private Boolean isNeedVerify;
/**
* 注册类型为1时使用:微信用户数据字段1,根据1、2进行数据解密,计算出手机号
*/
private String encryptedData;
/**
* 注册类型为1时使用:微信用户数据字段2,根据1、2进行数据解密,计算出手机号
*/
private String iv;
/**
*注册类型为1时使用:微信用户数据字段3,根据1、2、3进行数据解密,计算出手机号
*/
private String code;
/**
* 账号或手机号
*/
private String phoneNo;
/**
* 密码
*/
private String verifyCode;
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.app.api.common;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 字符串工具类
*
* @author as-youjun
*/
public class StringUtil {
private static Pattern NOT_ZERO_AT_THE_END = Pattern.compile("[1-9](\\d*[1-9])?");
private static Pattern numericPattern = Pattern.compile("-?[0-9]+\\.?[0-9]*");
private static Pattern NUMBER_PATTERN = Pattern.compile("-?[0-9]+(\\.[0-9]+)?");
/**
* 判断对象是否为空
*
* @param str
* @return
*/
public static boolean isNotEmpty(Object str) {
boolean flag = true;
if (str != null && !"".equals(str)) {
if (str.toString().length() > 0) {
flag = true;
}
} else {
flag = false;
}
return flag;
}
/***************************************************************************
* repeat - 通过源字符串重复生成N次组成新的字符串。
*
* @param src
* - 源字符串 例如: 空格(" "), 星号("*"), "浙江" 等等...
* @param num
* - 重复生成次数
* @return 返回已生成的重复字符串
* @version 1.0 (2006.10.10) Wilson Lin
**************************************************************************/
public static String repeat(String src, int num) {
StringBuffer s = new StringBuffer();
for (int i = 0; i < num; i++) {
s.append(src);
}
return s.toString();
}
/**
* 判断是否数字表示
*
* @param str 源字符串
* @return 是否数字的标志
*/
public static boolean isNumeric(String str) {
// 该正则表达式可以匹配所有的数字 包括负数
String bigStr;
try {
bigStr = new BigDecimal(str).toString();
} catch (Exception e) {
return false;//异常 说明包含非数字。
}
Matcher isNum = NUMBER_PATTERN.matcher(bigStr); // matcher是全匹配
if (!isNum.matches()) {
return false;
}
return true;
}
public static int toInt(String s) {
if (s != null && !"".equals(s.trim())) {
try {
return Integer.parseInt(s);
} catch (Exception e) {
return 0;
}
}
return 0;
}
public static boolean isEmpty(Collection collection) {
return collection == null || collection.isEmpty();
}
public static boolean isNotEmpty(Collection collection) {
return collection != null && collection.size() > 0;
}
public static boolean isEmpty(Map map) {
return map == null || map.isEmpty();
}
/**
* 截取前后都不是0的数字字符串
* <p>
* 12010102 => 12010102 12010100 => 120101 ab1201100b => 12011
*
* @param str
* @return
*/
public static String delEndZero(String str) {
Matcher mat = NOT_ZERO_AT_THE_END.matcher(str);
boolean rs = mat.find();
if (rs) {
return mat.group(0);
}
return null;
}
/**
* <pre>
* 移除字符串后面的0
* </pre>
*
* @param s
* @return
*/
public static String removeSufixZero(String s) {
if (s == null) {
return "";
}
while (s.endsWith("0")) {
if ("0".equals(s)) {
s = "";
break;
}
s = s.substring(0, s.length() - 1);
}
return s;
}
public static String transforCode(String code) {
if (code.endsWith("0000000")) {
code = code.substring(0, 1);
} else if (code.endsWith("000000")) {
code = code.substring(0, 2);
} else if (code.endsWith("0000")) {
code = code.substring(0, 4);
} else if (code.endsWith("00")) {
code = code.substring(0, 6);
}
return code;
}
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 单位注册许可信息表
*
* @author system_generator
* @date 2022-08-09
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="BaseUnitLicenceDto", description="单位注册许可信息表")
public class BaseUnitLicenceDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "单位编码")
private String unitCode;
@ApiModelProperty(value = "单位名称")
private String unitName;
@ApiModelProperty(value = "许可地址")
private String licAddress;
@ApiModelProperty(value = "证书类型")
private String certType;
@ApiModelProperty(value = "证书类型code")
private String certTypeCode;
@ApiModelProperty(value = "证书编号")
private String certNo;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "有效期至")
private Date expiryDate;
@ApiModelProperty(value = "发证日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date issueDate;
@JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "变更日期")
private Date changeDate;
@ApiModelProperty(value = "许可方式/许可状态")
private String applyType;
@ApiModelProperty(value = "许可方式/许可状态code")
private String applyTypeCode;
@ApiModelProperty(value = "许可评审方式")
private String appraisalType;
@ApiModelProperty(value = "许可评审方式code")
private String appraisalTypeCode;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "许可项目/检验类型/设备品种编码")
private String itemCode;
@ApiModelProperty(value = "许可项目/检验类型/设备品种")
private String itemCodeName;
@ApiModelProperty(value = "许可子项目/检验项目/充装介质类别code")
private String subItemCode;
@ApiModelProperty(value = "许可子项目/检验项目/充装介质类别")
private String subItemName;
@ApiModelProperty(value = "许可参数/充装介质名称")
private String parameter;
@ApiModelProperty(value = "许可参数/充装介质code")
private String parameterCode;
@ApiModelProperty(value = "固定检验地址")
private String itemAddress;
@ApiModelProperty(value = "发证机关")
private String approvedOrgan;
@ApiModelProperty(value = "发证机关code")
private String approvedOrganCode;
@ApiModelProperty(value = "是否同步自许可(1是 0否)")
private String isNotSync;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 施工信息表
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="constructionInfo", description="最近施工信息")
public class ConstructionInfoModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "施工类型")
private String constructionType;
@ApiModelProperty(value = "施工单位统一社会信用代码")
private String uscUnitCreditCode;
@ApiModelProperty(value = "施工单位")
private String uscUnitName;
@ApiModelProperty(value = "施工时间")
private Date uscDate;
@ApiModelProperty(value = "")
private String uscInformId;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 安全追溯-设计信息表
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="designInfo", description="设计信息")
public class DesignInfoModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String supervisoryCode;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "设计单位统一社会信用代码")
private String designUnitCreditCode;
@ApiModelProperty(value = "设计单位")
private String designUnitName;
@ApiModelProperty(value = "设计许可编号")
private String designLicenseNum;
@ApiModelProperty(value = "设计使用年限")
private String designUseDate;
@ApiModelProperty(value = "设计日期")
private Date designDate;
@ApiModelProperty(value = "总图图号")
private String drawingDo;
@ApiModelProperty(value = "设计附件")
private String designDoc;
@ApiModelProperty(value = "设计文件鉴定单位")
private String appraisalUnit;
@ApiModelProperty(value = "设计单位鉴定日期")
private String appraisalDate;
@ApiModelProperty(value = "设计规范")
private String designStandard;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
/**
* @Author cpp
* @Description
* @Date 2023/6/5
*/
@Data
@Accessors(chain = true)
@Document(indexName = "idx_biz_view_jg_all", shards = 6, replicas = 2)
public class ESEquipmentCategoryDto {
@Id
private String SEQUENCE_NBR;
@Field(type = FieldType.Text)
private String ORG_BRANCH_NAME;
@Field(type = FieldType.Text)
private String ORG_BRANCH_CODE;
@Field(type = FieldType.Text)
private String USE_UNIT_NAME;
@Field(type = FieldType.Text)
private String USE_UNIT_CREDIT_CODE;
@Field(type = FieldType.Text)
private String EQU_LIST_CODE;
@Field(type = FieldType.Text)
private String EQU_LIST;
@Field(type = FieldType.Text)
private String EQU_CATEGORY;
@Field(type = FieldType.Text)
private String USE_ORG_CODE;
@Field(type = FieldType.Text)
private String CODE96333;
@Field(type = FieldType.Text)
private String EQU_CODE;
@Field(type = FieldType.Text)
private String SUPERVISORY_CODE;
@Field(type = FieldType.Text)
private String USE_PLACE;
@Field(type = FieldType.Text)
private String ADDRESS;
@Field(type = FieldType.Integer)
private Integer EQU_STATE;
@Field(type = FieldType.Text)
private String STATUS;
@Field(type = FieldType.Long)
private Long REC_DATE;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "ElevatorBaseInfoForWXModel", description = "")
public class ElevatorBaseInfoForWXModel {
@ApiModelProperty(value = "电梯识别码")
private String code96333;
@ApiModelProperty(value = "设备代码")
private String equCode;
@ApiModelProperty(value = "使用登记证编号")
private String useOrgCode;
@ApiModelProperty(value = "设备类别")
private String equCategory;
@ApiModelProperty(value = "制造单位名")
private String produceUnitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "所属区域")
private String area;
@ApiModelProperty(value = "使用地址")
private String address;
@ApiModelProperty(value = "单位内编号")
private String intraUnitNumber;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import lombok.Data;
@Data
public class EquEnterDto {
/**
* 设备id
*/
private String sequenceNbr;
/**
* 使用登记代码
*/
private String useOrgCode;
/**
* 设备类别
*/
private String equCategory;
/**
* 设备名称
*/
private String productName;
/**
* 设备位置
*/
private String address;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import lombok.Data;
@Data
public class EquInfoDto {
/**
* 城市编码
*/
private String city;
/**
* 区县编码
*/
private String county;
/**
* 设备类别
*/
private String equipCategory;
/**
* 设备种类
*/
private String equipList;
/**
* record
*/
private String record;
/**
* 电梯96333识别码
*/
private String code;
/**
* 监管码
*/
private String supervisor;
/**
* 设备认领状态
*/
private String status;
/**
* 设备状态
*/
private String equState;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import lombok.Data;
import java.util.List;
@Data
public class EquipExportDto {
String ORG_BRANCH_NAME;
String USE_UNIT_NAME;
String EQU_LIST;
String EQU_CATEGORY;
String USE_ORG_CODE;
String CODE96333;
String SUPERVISORY_CODE;
String USE_PLACE;
String EQU_STATE;
String STATUS;
String USE_UNIT_CREDIT_CODE;
String ORG_BRANCH_CODE;
String EQU_CODE;
String EQU_LIST_CODE;
List<String> ids;
String tableName;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 安全追溯-锅炉
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="paramBoiler", description="锅炉技术参数")
public class EquipTechParamBoilerModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "设备等级")
private String deviceLevel;
@ApiModelProperty(value = "额定蒸发量(热功率)")
private BigDecimal ratedEvaporationCapacityThermalPower;
@ApiModelProperty(value = "额定工作压力")
private BigDecimal ratedWorkingPressure;
@ApiModelProperty(value = "额定工作温度")
private BigDecimal ratedOperatingTemperature;
@ApiModelProperty(value = "设计热效率")
private BigDecimal designThermalEfficiency;
@ApiModelProperty(value = "给水温度")
private BigDecimal feedwaterTemperature;
@ApiModelProperty(value = "额定出/回水(油)温度")
private BigDecimal ratedOutletReturnWaterOilTemperature;
@ApiModelProperty(value = "锅炉本体水(油)容积")
private BigDecimal waterOilVolumeOfBoilerProper;
@ApiModelProperty(value = "整装锅炉本体液压试验介质/压力")
private BigDecimal hydraulicTestMediumPressureOfPackagedBoilerBody;
@ApiModelProperty(value = "再热器进(出)口温度")
private BigDecimal inletOutletTemperatureOfReheater;
@ApiModelProperty(value = "再热器进(出)口压力")
private BigDecimal reheaterInletOutletPressure;
@ApiModelProperty(value = "再热蒸汽流量")
private BigDecimal reheatSteamFlow;
@ApiModelProperty(value = "燃料(热源)种类")
private String fuelType;
@ApiModelProperty(value = "受压部件名称")
private String nameOfPressureParts;
@ApiModelProperty(value = "受压部件材料")
private String materialOfPressureParts;
@ApiModelProperty(value = "受压部件壁厚")
private BigDecimal wallThicknessOfPressureParts;
@ApiModelProperty(value = "受压部件无损检测方法")
private String nonDestructiveTestingMethodsForPressureParts;
@ApiModelProperty(value = "受压部件无损检测比例")
private BigDecimal proportionOfNdtForPressureParts;
@ApiModelProperty(value = "受压部件热处理温度")
private BigDecimal heatTreatmentTemperatureOfPressureParts;
@ApiModelProperty(value = "受压部件热处理时间")
private BigDecimal heatTreatmentTimeOfPressureParts;
@ApiModelProperty(value = "受压部件水(耐)压试验介质")
private String hydrostaticTestMedium;
@ApiModelProperty(value = "受压部件水(耐)压试验压力")
private BigDecimal hydrostaticTestPressure;
@ApiModelProperty(value = "燃烧方式")
private String combustionMode;
@ApiModelProperty(value = "有机热载体锅炉气密试验介质/压力")
private BigDecimal glAirtightTest;
@ApiModelProperty(value = "安装附件与有关装置")
private String safetyAccessoriesAndRelatedDevices;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 安全追溯-电梯
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="paramElevator", description="电梯技术参数")
public class EquipTechParamElevatorModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "额定速度(上行)")
private BigDecimal ratedSpeedUp;
@ApiModelProperty(value = "额定速度(下行)")
private BigDecimal ratedSpeedDown;
@ApiModelProperty(value = "额定载重量")
private BigDecimal ratedLoadCapacity;
@ApiModelProperty(value = "轿厢尺寸")
private BigDecimal carSize;
@ApiModelProperty(value = "提升高度")
private BigDecimal liftingHeight;
@ApiModelProperty(value = "层")
private Integer storey;
@ApiModelProperty(value = "站")
private Integer stand;
@ApiModelProperty(value = "门数")
private Integer numberDoors;
@ApiModelProperty(value = "控制方式")
private String controlMode;
@ApiModelProperty(value = "油缸数量")
private Integer numberCylinders;
@ApiModelProperty(value = "顶升型式")
private String jackingType;
@ApiModelProperty(value = "额定压力")
private BigDecimal ratedPressure;
@ApiModelProperty(value = "防爆型式")
private String explosionproofType;
@ApiModelProperty(value = "防爆等级")
private String explosionproofGrade;
@ApiModelProperty(value = "燃爆物质")
private String explosiveSubstance;
@ApiModelProperty(value = "整机防爆标志")
private String explosionproofSignComplete;
@ApiModelProperty(value = "驱动主机额定功率")
private BigDecimal qdzjRatedPower;
@ApiModelProperty(value = "驱动主机额定转速")
private BigDecimal qdzjRatedSpeed;
@ApiModelProperty(value = "驱动主机减速比")
private BigDecimal qdzjReductionRatio;
@ApiModelProperty(value = "液压泵站满载工作压力")
private BigDecimal yabzFullloadPressure;
@ApiModelProperty(value = "悬挂系统悬挂介质种类")
private String xgxlMediaType;
@ApiModelProperty(value = "悬挂系统悬挂介质数量")
private Integer xgxlMediaNumber;
@ApiModelProperty(value = "悬挂系统悬挂介质型号")
private String xgxlMediaModel;
@ApiModelProperty(value = "悬挂系统悬挂介质规格")
private String xgxlMediaSpecification;
@ApiModelProperty(value = "驱动主机型号")
private String qdzjModel;
@ApiModelProperty(value = "驱动主机产品编号")
private String qdzjProductNo;
@ApiModelProperty(value = "驱动主机制造单位")
private String qdzjManufacturer;
@ApiModelProperty(value = "控制柜型号")
private String kzgModel;
@ApiModelProperty(value = "控制柜产品编号")
private String kzgProductNo;
@ApiModelProperty(value = "控制柜制造单位")
private String kzgManufacturer;
@ApiModelProperty(value = "限速器型号")
private String xsqModel;
@ApiModelProperty(value = "限速器产品编号")
private String xsqProductNo;
@ApiModelProperty(value = "限速器制造单位")
private String xsqManufacturer;
@ApiModelProperty(value = "安全钳型号")
private String aqqModel;
@ApiModelProperty(value = "安全钳产品编号")
private String aqqProductNo;
@ApiModelProperty(value = "安全钳制造单位")
private String aqqManufacturer;
@ApiModelProperty(value = "轿厢缓冲器型号")
private String jxhcqModel;
@ApiModelProperty(value = "轿厢缓冲器产品编号")
private String jxhcqProductNo;
@ApiModelProperty(value = "轿厢缓冲器制造单位")
private String jxhcqManufacturer;
@ApiModelProperty(value = "对重缓冲器型号")
private String dchcqModel;
@ApiModelProperty(value = "对重缓冲器产品编号")
private String dchcqProductNo;
@ApiModelProperty(value = "对重缓冲器制造单位")
private String dchcqManufacturer;
@ApiModelProperty(value = "层门门锁装置型号")
private String cmmszzModel;
@ApiModelProperty(value = "层门门锁装置产品编号")
private String cmmszzProductNo;
@ApiModelProperty(value = "层门门锁装置制造单位")
private String cmmszzManufacturer;
@ApiModelProperty(value = "轿门门锁装置型号")
private String jmmszzModel;
@ApiModelProperty(value = "轿门门锁装置产品编号")
private String jmmszzProductNo;
@ApiModelProperty(value = "轿门门锁装置制造单位")
private String jmmszzManufacturer;
@ApiModelProperty(value = "上行超速保护装置型号")
private String sxcsbhzzModel;
@ApiModelProperty(value = "上行超速保护装置产品编号")
private String sxcsbhzzProductNo;
@ApiModelProperty(value = "上行超速保护装置制造单位")
private String sxcsbhzzManufacturer;
@ApiModelProperty(value = "轿厢意外移动保护装置型号")
private String jxywydbhzzModel;
@ApiModelProperty(value = "轿厢意外移动保护装置")
private String jxywydbhzzProductNo;
@ApiModelProperty(value = "轿厢意外移动保护装置制造单位")
private String jxywydbhzzManufacturer;
@ApiModelProperty(value = "液压泵站型号")
private String yybzModel;
@ApiModelProperty(value = "液压泵站产品编号")
private String yybzProductNo;
@ApiModelProperty(value = "液压泵站制造单位")
private String yybzManufacturer;
@ApiModelProperty(value = "限速切断阀型号")
private String xsqdfModel;
@ApiModelProperty(value = "限速切断阀产品编号")
private String xsqdfProductNo;
@ApiModelProperty(value = "限速切断阀制造单位")
private String xsqdfManufacturer;
@ApiModelProperty(value = "名义速度")
private BigDecimal nominalSpeed;
@ApiModelProperty(value = "倾斜角")
private BigDecimal angleRoll;
@ApiModelProperty(value = "名义宽度")
private BigDecimal nominalWidth;
@ApiModelProperty(value = "使用区段长度")
private BigDecimal useSectionLength;
@ApiModelProperty(value = "输送能力")
private String conveyingCapacity;
@ApiModelProperty(value = "工作类型")
private String workType;
@ApiModelProperty(value = "工作环境")
private String workEnvironment;
@ApiModelProperty(value = "控制柜节能运行方式")
private String kzgOperationMode;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 安全追溯-压力管道
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="paramPipeline", description="压力管道技术参数")
public class EquipTechParamPipelineModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "工程(装置)名称")
private String deviceName;
@ApiModelProperty(value = "管道类别")
private String pipelineClass;
@ApiModelProperty(value = "管道名称(登记单元)")
private String pipeName;
@ApiModelProperty(value = "管道编号")
private String pipelineNumber;
@ApiModelProperty(value = "设备级别")
private String deviceLevel;
@ApiModelProperty(value = "设计标准")
private String designStandard;
@ApiModelProperty(value = "管道图号")
private String pipeDrawNumber;
@ApiModelProperty(value = "公称直径")
private BigDecimal nominalDiameter;
@ApiModelProperty(value = "公称壁厚")
private BigDecimal wallThickness;
@ApiModelProperty(value = "管道长度")
private BigDecimal pipeLength;
@ApiModelProperty(value = "起始位置起点")
private String startePosition;
@ApiModelProperty(value = "压力")
private BigDecimal pressure;
@ApiModelProperty(value = "温度")
private BigDecimal temperature;
@ApiModelProperty(value = "介质")
private String medium;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "管道信息")
private String pipeInfo;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 安全追溯-游乐设施
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="paramRides", description="游乐设施技术参数")
public class EquipTechParamRidesModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "设计寿命")
private Integer designLife;
@ApiModelProperty(value = "滑道长度")
private BigDecimal slideLength;
@ApiModelProperty(value = "滑道高度")
private BigDecimal slideHeight;
@ApiModelProperty(value = "滑道最小坡度")
private BigDecimal minimumSlopeOfSlide;
@ApiModelProperty(value = "滑道平均坡度")
private BigDecimal averageSlopeOfSlide;
@ApiModelProperty(value = "滑道无跳跃段最大坡度")
private BigDecimal maximumSlopeOfTheSlideWithoutJumping;
@ApiModelProperty(value = "滑道最小曲率半径")
private BigDecimal minimumRadiusOfCurvatureOfSlideway;
@ApiModelProperty(value = "滑道数量")
private Integer numberOfSlides;
@ApiModelProperty(value = "滑道主体材料")
private String mainMaterialOfSlide;
@ApiModelProperty(value = "滑车数量")
private Integer numberOfPulleys;
@ApiModelProperty(value = "乘坐人数")
private Integer numberOfPassengers;
@ApiModelProperty(value = "水平距离")
private BigDecimal horizontalDistance;
@ApiModelProperty(value = "高度")
private BigDecimal height;
@ApiModelProperty(value = "下滑速度")
private BigDecimal glideSpeed;
@ApiModelProperty(value = "乘员数")
private Integer countOfPassengers;
@ApiModelProperty(value = "运行速度")
private BigDecimal runningSpeed;
@ApiModelProperty(value = "车辆数")
private Integer numberOfVehicles;
@ApiModelProperty(value = "功率")
private BigDecimal power;
@ApiModelProperty(value = "轨道高度")
private BigDecimal trackHeight;
@ApiModelProperty(value = "成员数")
private Integer numberOfMembers;
@ApiModelProperty(value = "运行高度")
private BigDecimal operatingHeight;
@ApiModelProperty(value = "驱动功率")
private BigDecimal drivePower;
@ApiModelProperty(value = "回转直径")
private BigDecimal rotaryDiameter;
@ApiModelProperty(value = "额定乘客数")
private Integer ratedNumberOfPassengers;
@ApiModelProperty(value = "吊舱数量")
private Integer numberOfPods;
@ApiModelProperty(value = "设备高度")
private BigDecimal equipmentHeight;
@ApiModelProperty(value = "额定线速度")
private BigDecimal ratedLinearSpeed;
@ApiModelProperty(value = "转盘转速")
private BigDecimal rotaryTableSpeed;
@ApiModelProperty(value = "单边摆角")
private BigDecimal unilateralSwingAngle;
@ApiModelProperty(value = "座舱数量")
private Integer numberOfCabins;
@ApiModelProperty(value = "最大运行高度")
private BigDecimal maximumOperatingHeight;
@ApiModelProperty(value = "旋转直径")
private BigDecimal rotationDiameter;
@ApiModelProperty(value = "最大转速")
private BigDecimal maximumSpeed;
@ApiModelProperty(value = "倾角")
private BigDecimal dip;
@ApiModelProperty(value = "回转速度")
private BigDecimal slewingSpeed;
@ApiModelProperty(value = "升降速度")
private BigDecimal liftingSpeed;
@ApiModelProperty(value = "高差")
private BigDecimal heightDifference;
@ApiModelProperty(value = "主索直径")
private BigDecimal mainCableDiameter;
@ApiModelProperty(value = "弦倾角")
private BigDecimal angleOfChord;
@ApiModelProperty(value = "乘客人数")
private Integer passengerNum;
@ApiModelProperty(value = "弹跳高度")
private BigDecimal bounceHeight;
@ApiModelProperty(value = "最大载重")
private BigDecimal maximumLoad;
@ApiModelProperty(value = "设备功率")
private BigDecimal equipmentPower;
@ApiModelProperty(value = "占地面积")
private BigDecimal floorArea;
@ApiModelProperty(value = "升空高度")
private BigDecimal liftoffAltitude;
@ApiModelProperty(value = "场地直径")
private BigDecimal fieldDiameter;
@ApiModelProperty(value = "球体直径")
private BigDecimal sphereDiameter;
@ApiModelProperty(value = "球体体积")
private BigDecimal sphereVolume;
@ApiModelProperty(value = "操作人数")
private Integer operatorNumber;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 安全追溯-索道
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="paramRopeway", description="索道技术参数")
public class EquipTechParamRopewayModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "")
private BigDecimal horizontalDistance;
@ApiModelProperty(value = "支架数目")
private Integer supportsCount;
@ApiModelProperty(value = "斜长")
private BigDecimal obliqueLength;
@ApiModelProperty(value = "主电机型号和功率")
private BigDecimal mainMotorModelAndPower;
@ApiModelProperty(value = "高差")
private BigDecimal altitudeDifference;
@ApiModelProperty(value = "张紧油压(重锤)")
private BigDecimal oilPressureHeavyHammer;
@ApiModelProperty(value = "张紧油压(油压)")
private BigDecimal oilPressureOilPressure;
@ApiModelProperty(value = "运量")
private BigDecimal freightVolume;
@ApiModelProperty(value = "运载索")
private String carrierLine;
@ApiModelProperty(value = "速度")
private BigDecimal speed;
@ApiModelProperty(value = "承载索")
private String bearingCable;
@ApiModelProperty(value = "索距")
private BigDecimal cablePitch;
@ApiModelProperty(value = "运载工具数量和类型")
private String numberAndTypeOfVehicles;
@ApiModelProperty(value = "索引索")
private String tractionRope;
@ApiModelProperty(value = "平衡索")
private String balanceCable;
@ApiModelProperty(value = "主要部件")
private String mainComponents;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 安全追溯-场内车辆
*
* @author cpp
* @date 2023-04-06 15:21:21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="paramVehicle", description="场内车辆技术参数")
public class EquipTechParamVehicleModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "车架编号")
private String frameNo;
@ApiModelProperty(value = "发动机(行走电机)编号")
private String engineNo;
@ApiModelProperty(value = "动力方式")
private String powerMode;
@ApiModelProperty(value = "传动方式")
private String transmissionMode;
@ApiModelProperty(value = "车架结构")
private String frameStructure;
@ApiModelProperty(value = "驾驶方式")
private String drivingMode;
@ApiModelProperty(value = "自重")
private BigDecimal weight;
@ApiModelProperty(value = "空载最大运行速度")
private BigDecimal carryingIdlerMaxRunningSpeed;
@ApiModelProperty(value = "空载最大起升速度")
private BigDecimal maxLiftingSpeed;
@ApiModelProperty(value = "设备保护等级(防爆)")
private String protectGrade;
@ApiModelProperty(value = "气体/粉尘组别(防爆)")
private String gasGroup;
@ApiModelProperty(value = "温度组别(防爆)")
private String temperatureGroup;
@ApiModelProperty(value = "额定起重量")
private BigDecimal liftingCapacity;
@ApiModelProperty(value = "系统电压")
private BigDecimal systemVoltage;
@ApiModelProperty(value = "载荷中心距")
private BigDecimal loadCenterDistance;
@ApiModelProperty(value = "发动机(电机)额定功率")
private BigDecimal enginePower;
@ApiModelProperty(value = "最大速度(额载)")
private BigDecimal maxSpeed;
@ApiModelProperty(value = "防爆使用场所")
private String explosionproofPlace;
@ApiModelProperty(value = "工作装置门架形式")
private String gantryForm;
@ApiModelProperty(value = "工作装置空载最大起升高度")
private BigDecimal maxLiftingHeight;
@ApiModelProperty(value = "工作装置(全)自由起升高度")
private BigDecimal freeLiftingHeight;
@ApiModelProperty(value = "工作装置门架倾角(前)")
private BigDecimal portalAngleFront;
@ApiModelProperty(value = "工作装置门架倾角(后)")
private BigDecimal portalAngleBehind;
@ApiModelProperty(value = "工作装置最大起升速度(空载)")
private BigDecimal maxLiftingSpeed1;
@ApiModelProperty(value = "工作装置最大起升速度(额载)")
private BigDecimal maxLiftingSpeed2;
@ApiModelProperty(value = "工作装置最大下降速度(空载)")
private BigDecimal maxDescentSpeed1;
@ApiModelProperty(value = "工作装置最大下降速度(额载)")
private BigDecimal maxDescentSpeed2;
@ApiModelProperty(value = "整车整备质量")
private BigDecimal vehicleMass;
@ApiModelProperty(value = "额定载客数")
private Integer passengersNumber;
@ApiModelProperty(value = "最大运行速度")
private BigDecimal maxRunningSpeed;
@ApiModelProperty(value = "轴距")
private BigDecimal wheelBase;
@ApiModelProperty(value = "轮距(前)")
private BigDecimal trackWidthFront;
@ApiModelProperty(value = "轮距(后)")
private BigDecimal trackWidthBehind;
@ApiModelProperty(value = "观光列车车厢数")
private Integer carsNumber;
@ApiModelProperty(value = "观光列车每节车厢座位数")
private Integer seatNumber;
@ApiModelProperty(value = "观光列车牵引车头座位数")
private Integer tractorSeatNumber;
@ApiModelProperty(value = "最大行驶坡度")
private BigDecimal maxDrivingSlope;
@ApiModelProperty(value = "制动距离")
private BigDecimal brakingDistance;
@ApiModelProperty(value = "全长")
private BigDecimal overallLength;
@ApiModelProperty(value = "全宽")
private BigDecimal overallWidth;
@ApiModelProperty(value = "全高")
private BigDecimal overallAltitude;
@ApiModelProperty(value = "最小离地间隙")
private BigDecimal minGroundClearance;
@ApiModelProperty(value = "最小外侧转弯半径")
private BigDecimal minTurningRadius;
@ApiModelProperty(value = "主要零部件、安全保护和防护装置")
private String mainParts;
@ApiModelProperty(value = "监管码")
private String supervisoryCode;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 安全追溯-压力容器
*
* @author cpp
* @date 2023-04-06 15:21:21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="paramVessel", description="压力容器技术参数")
public class EquipTechParamVesselModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "额定质量")
private BigDecimal ratedQuality;
@ApiModelProperty(value = "使用环境温度")
private BigDecimal ambientTemperature;
@ApiModelProperty(value = "型号")
private String modelNumber;
@ApiModelProperty(value = "数量")
private Integer num;
@ApiModelProperty(value = "单瓶容积")
private BigDecimal singleBottleVolume;
@ApiModelProperty(value = "总容积")
private BigDecimal totalVolume;
@ApiModelProperty(value = "充装介质")
private String chargingMedium;
@ApiModelProperty(value = "规格")
private String specification;
@ApiModelProperty(value = "外径")
private BigDecimal outsideDiameter;
@ApiModelProperty(value = "壁厚")
private BigDecimal wallThickness;
@ApiModelProperty(value = "长度")
private BigDecimal length;
@ApiModelProperty(value = "公称工作压力")
private BigDecimal nominalWorkingPressure;
@ApiModelProperty(value = "材料(瓶体)")
private String bottleBody;
@ApiModelProperty(value = "材料(端塞)")
private String endPlug;
@ApiModelProperty(value = "材料(管路)")
private String piping;
@ApiModelProperty(value = "无损检测方法(气瓶)")
private String qpLossless;
@ApiModelProperty(value = "无损检测方法(管路)")
private String glLossless;
@ApiModelProperty(value = "无损检测比例(气瓶)")
private BigDecimal qpRatio;
@ApiModelProperty(value = "无损检测比例(管路)")
private BigDecimal glRatio;
@ApiModelProperty(value = "耐压试验压力(气瓶)")
private BigDecimal qpPressure;
@ApiModelProperty(value = "耐压试验压力(管路)")
private BigDecimal glPressure;
@ApiModelProperty(value = "气密性试验压力(气瓶)")
private BigDecimal qpAirTightness;
@ApiModelProperty(value = "气密性试验压力(管路)")
private BigDecimal glAirTightness;
@ApiModelProperty(value = "气体置换后压力")
private BigDecimal displacementPressure;
@ApiModelProperty(value = "瓶体内含氧量")
private BigDecimal oxygen;
@ApiModelProperty(value = "瓶体内含氧量")
private String heatTreatmentMethod;
@ApiModelProperty(value = "热处理温度")
private BigDecimal qpHeatTreatmentTemperature;
@ApiModelProperty(value = "气瓶安装位置")
private String installationPosition;
@ApiModelProperty(value = "容器容积")
private BigDecimal containerVolume;
@ApiModelProperty(value = "容器内径")
private BigDecimal pressureVesselDiameter;
@ApiModelProperty(value = "容器高(长)")
private BigDecimal height;
@ApiModelProperty(value = "材料(筒体(球壳))")
private String materialCylinderShell;
@ApiModelProperty(value = "材料(封头)")
private String pressureMaterialHead;
@ApiModelProperty(value = "材料(衬里)")
private String pressureMaterialLining;
@ApiModelProperty(value = "材料(夹套)")
private String materialJacket;
@ApiModelProperty(value = "厚度(筒体(球壳))")
private BigDecimal thickness;
@ApiModelProperty(value = "厚度(封头)")
private BigDecimal fixedHead;
@ApiModelProperty(value = "厚度(衬里)")
private BigDecimal fixedLining;
@ApiModelProperty(value = "厚度(夹套)")
private BigDecimal fixedJacket;
@ApiModelProperty(value = "容器自重")
private BigDecimal selfWeight;
@ApiModelProperty(value = "盛装介质重量")
private BigDecimal mediumWeight;
@ApiModelProperty(value = "设计压力(壳程)")
private BigDecimal pressureHousingPath;
@ApiModelProperty(value = "设计压力(管程)")
private BigDecimal pressurePipe;
@ApiModelProperty(value = "设计压力(夹套)")
private BigDecimal pressureJacket;
@ApiModelProperty(value = "设计温度(壳程)")
private BigDecimal temperatureShell;
@ApiModelProperty(value = "设计温度(管程)")
private BigDecimal temperaturePipe;
@ApiModelProperty(value = "设计温度(夹套)")
private BigDecimal temperatureJacket;
@ApiModelProperty(value = "最高允许工作压力(壳程)")
private BigDecimal maxPressureShell;
@ApiModelProperty(value = "最高允许工作压力(管程)")
private BigDecimal maxPressurePipe;
@ApiModelProperty(value = "最高允许工作压力(夹套)")
private BigDecimal maxPressureJacket;
@ApiModelProperty(value = "介质(壳程)")
private String mediumShell;
@ApiModelProperty(value = "介质(管程)")
private String mediumPipe;
@ApiModelProperty(value = "介质(夹套)")
private String mediumJacket;
@ApiModelProperty(value = "主体结构型式")
private String mainStructureType;
@ApiModelProperty(value = "支座型式")
private String support;
@ApiModelProperty(value = "安装型式")
private String installation;
@ApiModelProperty(value = "保温绝热方式")
private String insulation;
@ApiModelProperty(value = "无损检测方法")
private String checkLossless;
@ApiModelProperty(value = "耐压试验种类")
private String withstandVoltage;
@ApiModelProperty(value = "泄漏试验种类")
private String leakage;
@ApiModelProperty(value = "耐压试验压力")
private BigDecimal withstandPressureTest;
@ApiModelProperty(value = "泄漏试验压力")
private BigDecimal leakPressure;
@ApiModelProperty(value = "容器型号")
private String container;
@ApiModelProperty(value = "罐车编号")
private String carNum;
@ApiModelProperty(value = "容积")
private BigDecimal volume;
@ApiModelProperty(value = "最大充装量")
private BigDecimal maxFill;
@ApiModelProperty(value = "设计压力")
private BigDecimal designPressure;
@ApiModelProperty(value = "设计温度")
private BigDecimal designTemperature;
@ApiModelProperty(value = "工作压力")
private BigDecimal workingPressure;
@ApiModelProperty(value = "工作温度")
private BigDecimal workTemperature;
@ApiModelProperty(value = "材料(筒体)")
private String materialCylinder;
@ApiModelProperty(value = "厚度(筒体)")
private BigDecimal thicknessCylinder;
@ApiModelProperty(value = "腐蚀裕量")
private BigDecimal corrosionMargin;
@ApiModelProperty(value = "介质")
private String medium;
@ApiModelProperty(value = "氧舱品种")
private String oxygenChamber;
@ApiModelProperty(value = "额定进舱人数")
private Integer ratedEntryCapacity;
@ApiModelProperty(value = "主体结构")
private String chamberMain;
@ApiModelProperty(value = "压力")
private BigDecimal chamberPressure;
@ApiModelProperty(value = "温度")
private BigDecimal temperature;
@ApiModelProperty(value = "压力介质")
private BigDecimal pressureMedium;
@ApiModelProperty(value = "人均舱容")
private BigDecimal perCapitaCabinCapacity;
@ApiModelProperty(value = "固定安全附件")
private String fixedSafetyAccessory;
@ApiModelProperty(value = "气瓶")
private String gasCylinder;
@ApiModelProperty(value = "气瓶安全附件")
private String gasCylinderAccessories;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
* 一码通总览数据统计
*
* @author system_generator
*/
@Data
@ApiModel(value = "EquipmentCategoryDataDto", description = "一码通总览数据统计")
public class EquipmentCategoryDataDto extends BaseDto {
/**
* 管辖分局组织机构代码
*/
@TableField("org_branch_code")
private String org_branch_code;
/**
* 单位统一信用代码
*/
@TableField("unit_code")
private String unitCode;
/**
* 电梯
*/
@TableField("elevator")
private String elevator;
/**
* 厂车
*/
@TableField("vehicle")
private String vehicle;
/**
* 索道
*/
@TableField("ropeway")
private String ropeway;
/**
* 游乐设施
*/
@TableField("rides")
private String rides;
/**
* 锅炉
*/
@TableField("boiler")
private String boiler;
/**
* 压力容器
*/
@TableField("vessel")
private String vessel;
/**
* 压力管道
*/
@TableField("pipeline")
private String pipeline;
/**
* 起重机械
*/
@TableField("lifting")
private String lifting;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 装备分类
*
* @author system_generator
* @date 2021-10-20
*/
@Data
@ApiModel(value="EquipmentCategoryDto", description="装备分类")
public class EquipmentCategoryDto {
private static final long serialVersionUID = 1L;
private Long id;
private String parentId;
@ApiModelProperty(value = "装备分类编码")
private String code;
@ApiModelProperty(value = "装备分类名称")
private String name;
@ApiModelProperty(value = "描述")
private String description;
@ApiModelProperty(value = "备注")
private String remark;
private Date createDate;
@ApiModelProperty(value = "行业编码")
private String industryCode;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 特种设备搜索列表DTO
*/
@Data
@ApiModel(value="EsSpecialEquipmentListDto", description="特种设备搜索列表DTO")
public class EsSpecialEquipmentListDto {
/**
*
*/
private static final long serialVersionUID = 1L;
/**
* 所属区域代码
*/
@ApiModelProperty(value = "所属区域代码")
private String regionCode;
/**
* 设备类别编码
*/
@ApiModelProperty(value = "设备类别编码")
private String categoryCode;
/**
* 搜索数量
*/
@ApiModelProperty(value = "搜索数量")
private Integer equipmentNumber;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 安全追溯-检验检测信息表
*
* @author cpp
* @date 2023-04-20 16:36:14
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="InspectionDetectionInfo", description="检验检测信息")
public class InspectionDetectionInfoModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "检验类型")
private String inspectType;
@ApiModelProperty(value = "检验机构名称")
private String inspectOrgName;
@ApiModelProperty(value = "检验报告附件")
private String inspectReport;
@ApiModelProperty(value = "检验人员")
private String inspectStaff;
@ApiModelProperty(value = "检验日期")
private Date inspectDate;
@ApiModelProperty(value = "检验结论")
private String inspectConclusion;
@ApiModelProperty(value = "安全状况等级")
private String safetyLevel;
@ApiModelProperty(value = "检验问题备注")
private String problemRemark;
@ApiModelProperty(value = "下次检验日期")
private Date nextInspectDate;
@ApiModelProperty(value = "设备唯一标识")
private String sequenceCode;
private String superviseCode;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value="InspectionDetectionInfoModelForWX", description="")
public class InspectionDetectionInfoModelForWX {
@ApiModelProperty(value = "检验机构名称")
private String inspectOrgName;
@ApiModelProperty(value = "检验结论")
private String inspectConclusion;
@ApiModelProperty(value = "下次检验日期")
private Date nextInspectDate;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
/**
* ${comments}
*
* @author cpp
* @date 2023-04-21 11:08:35
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="mainParts", description="主要零部件技术参数")
public class MainPartsModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "零部件号")
private String mainPartNumber;
@ApiModelProperty(value = "型号规格")
private String typeSpecification;
@ApiModelProperty(value = "制造单位")
private String manufactureCompany;
@ApiModelProperty(value = "产品编号")
private String identificatioProduct;
@ApiModelProperty(value = "制造日期")
private Date manufacturingDate;
@ApiModelProperty(value = "名称")
private String designation;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty(value = "型号(厂车技术) ")
private String model;
@ApiModelProperty(value = "规格(厂车技术) ")
private String specification;
@ApiModelProperty(value = "型式试验证书编号")
private String certificateNumber;
@ApiModelProperty(value = "序号")
private String serialNumber;
@ApiModelProperty(value = "气瓶批号 ")
private String batchNumber;
@ApiModelProperty(value = "单位内编号")
private String intraUnitNumber;
@ApiModelProperty(value = "净重 ")
private BigDecimal weight;
@ApiModelProperty(value = "管道名称")
private String pipeName;
@ApiModelProperty(value = "管道编号 ")
private String pipelineNumber;
@ApiModelProperty(value = "设备级别")
private String deviceLevel;
@ApiModelProperty(value = "设计标准")
private String designCriterion;
@ApiModelProperty(value = "管道图号 ")
private String figureNumber;
@ApiModelProperty(value = "零部件名称")
private String partName;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 安全追溯-维保备案信息表
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="maintenanceRecordInfo", description="最近维保备案信息")
public class MaintenanceInfoModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "维保单位统一社会信用代码")
private String meUnitCreditCode;
@ApiModelProperty(value = "维保单位名称")
private String meUnitName;
@ApiModelProperty(value = "维保备案合同附件")
private String repairInform;
@ApiModelProperty(value = "维保合同开始日期")
private Date informStart;
@ApiModelProperty(value = "维保合同结束日期")
private Date informEnd;
@ApiModelProperty(value = "维保负责人姓名")
private String meMaster;
@ApiModelProperty(value = "维保负责人身份证")
private String meMasterId;
@ApiModelProperty(value = "紧急救援电话")
private String emergencycall;
@ApiModelProperty(value = "维保周期")
private String meCycle;
@ApiModelProperty(value = "大修周期")
private String overhaulCycle;
@ApiModelProperty(value = "24小时维保电话")
private String me24Telephone;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value="maintenanceRecordInfo", description="")
public class MaintenanceInfoModelForWX {
@ApiModelProperty(value = "最近维保日期")
private Date recentTime;
@ApiModelProperty(value = "维保单位")
private String meUnitName;
@ApiModelProperty(value = "维保电话")
private String me24Telephone;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "OtherEquBaseInfoForWXModel", description = "")
public class OtherEquBaseInfoForWXModel {
@ApiModelProperty(value = "设备代码")
private String equCode;
@ApiModelProperty(value = "使用登记证编号")
private String useOrgCode;
@ApiModelProperty(value = "设备类别")
private String equCategory;
@ApiModelProperty(value = "制造单位名")
private String produceUnitName;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "所属区域")
private String area;
@ApiModelProperty(value = "使用地址")
private String address;
@ApiModelProperty(value = "单位内编号")
private String intraUnitNumber;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* ${comments}
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="otherInfo", description="其他信息")
public class OtherInfoModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "保险机构")
private String insuranceOrg;
@ApiModelProperty(value = "保险到期日")
private String expiryDate;
@ApiModelProperty(value = "物联网接入标志")
private String iotOrg;
@ApiModelProperty(value = "物联网接入标志")
private String iotSign;
@ApiModelProperty(value = "有无监控")
private String isMonitor;
@ApiModelProperty(value = "96333识别码")
private String code96333;
@ApiModelProperty(value = "监管码")
private String supervisoryCode;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 安全追溯-制造信息
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="produceInfo", description="制造信息")
public class ProduceInfoModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String supervisoryCode;
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "制造单位统一社会信用代码")
private String produceUnitCreditCode;
@ApiModelProperty(value = "制造单位名")
private String produceUnitName;
@ApiModelProperty(value = "制造许可编号")
private String produceLicenseNum;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "制造日期")
private Date produceDate;
@ApiModelProperty(value = "是否进口")
private String imported;
@ApiModelProperty(value = "制造国")
private String produceCountry;
@ApiModelProperty(value = "制造标准")
private String factoryStandard;
@ApiModelProperty(value = "制造附件")
private String productQualityYieldProve;
@ApiModelProperty(value = "安装及使用维护保养说明附件")
private String insUseMaintainExplain;
@ApiModelProperty(value = "监督检验证书附件")
private String supervisionAgencyCredential;
@ApiModelProperty(value = "型式试验证书附件")
private String typeTestCredential;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 安全追溯-安全保护装置
*
* @author cpp
* @date 2023-04-21 11:08:36
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="protectionDevices", description="安全保护装置技术参数")
public class ProtectionDevicesModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "装置号")
private String deviceNumber;
@ApiModelProperty(value = "型号规格")
private String typeSpecification;
@ApiModelProperty(value = "制造单位")
private String manufactureCompany;
@ApiModelProperty(value = "制造日期")
private Date manufacturingDate;
@ApiModelProperty(value = "产品编号")
private String code;
@ApiModelProperty(value = "型式试验证合格证号")
private String certificateNumber;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "数量")
private Integer quantity;
@ApiModelProperty(value = "名称")
private String designation;
@ApiModelProperty(value = "型号(锅炉,压力容器) ")
private String model;
@ApiModelProperty(value = "规格(锅炉,压力容器)")
private String specification;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
/**
* 注册登记信息表
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="registerInfo", description="注册登记信息")
public class RegistrationInfoModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "登记机关")
private String organizationName;
@ApiModelProperty(value = "使用登记证编号")
private String useOrgCode;
@ApiModelProperty(value = "设备代码")
private String equCode;
@ApiModelProperty(value = "注册状态")
private String registerState;
@ApiModelProperty(value = "设备种类")
private String equList;
@ApiModelProperty(value = "设备类别")
private String equCategory;
@ApiModelProperty(value = "产品名称")
private String productName;
@ApiModelProperty(value = "品牌名称")
private String brandName;
@ApiModelProperty(value = "设备型号")
private String equType;
@ApiModelProperty(value = "设备总价值(万元)")
private BigDecimal equPrice;
@ApiModelProperty(value = "注册附件")
private String useRegistrationCertificate;
@ApiModelProperty(value = "使用标志附件")
private String useSign;
@ApiModelProperty(value = "产品照片附件")
private String productPhoto;
@ApiModelProperty(value = "登记机关组织机构代码")
private String organizationCode;
@ApiModelProperty(value = "设备品种")
private String equDefine;
@ApiModelProperty(value = "车辆牌号")
private String carNumber;
@ApiModelProperty(value = "车架编号")
private String frameNumber;
@ApiModelProperty(value = "发动机编号")
private String engineNumber;
@ApiModelProperty(value = "电动机编号")
private String motorNumber;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* 使用单位
*
* @author duanwei
* @date 2022-09-08
*/
@Data
@Accessors(chain = true)
@ApiModel(value="SpeUseUnit对象", description="使用单位")
public class SpeUseUnitDto implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "单位名称")
private String name;
@ApiModelProperty(value = "统一社会信用代码")
private String cerCode;
@ApiModelProperty(value = "单位性质")
private String unitNature;
@ApiModelProperty(value = "营业执照图片")
private String cerImgUrl;
@ApiModelProperty(value = "营业执照登记机关")
private String cerRegiOrg;
@ApiModelProperty(value = "注册地址_省")
private String cerAddrProvince;
@ApiModelProperty(value = "注册地址_市")
private String cerAddrCity;
@ApiModelProperty(value = "注册地址")
private String cerAddrArea;
@ApiModelProperty(value = "注册大厦(小区)")
private String cerAddrVillage;
@ApiModelProperty(value = "注册地址_街道")
private String cerAddrStreet;
@ApiModelProperty(value = "注册地址_详细地址")
private String cerAddrDetail;
@ApiModelProperty(value = "法定代表人")
private String legalPerson;
@ApiModelProperty(value = "法人手机")
private String legalPersonPhone;
@ApiModelProperty(value = "负责人")
private String responPerson;
@ApiModelProperty(value = "负责人手机")
private String responPersonPhone;
@ApiModelProperty(value = "所在地邮政编码")
private String zipCode;
@ApiModelProperty(value = "办公地址_省")
private String offiAddrProvince;
@ApiModelProperty(value = "办公地址_市")
private String offiAddrCity;
@ApiModelProperty(value = "办公地址")
private String offiAddrArea;
@ApiModelProperty(value = "办公地址_街道")
private String offiAddrStreet;
@ApiModelProperty(value = "办公大厦(小区)")
private String offiAddrVillage;
@ApiModelProperty(value = "办公地址_详细地址")
private String offiAddrDetail;
@ApiModelProperty(value = "冻结原因")
private String frozenReason;
@ApiModelProperty(value = "单位所属行业")
private String industry;
@ApiModelProperty(value = "值班电话")
private String onDutyPhone;
@ApiModelProperty(value = "管辖分局ID")
private String auditOrgId;
@ApiModelProperty(value = "管辖分局")
private String auditOrgName;
@ApiModelProperty(value = "管辖分局编码")
private String auditOrgCode;
@ApiModelProperty(value = "单位状态")
private Integer status;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除状态")
private Integer delFlag;
@ApiModelProperty(value = "创建人")
private String createBy;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "更新人")
private String updateBy;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "组织机构ID")
private String sysOrgId;
@ApiModelProperty(value = "所属组织机构编码")
private String sysOrgCode;
@ApiModelProperty(value = "96333救援电话")
private String rescueCall;
@ApiModelProperty(value = "同步id")
private String syncId;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 监督管理信息表
*
* @author cpp
* @date 2023-04-06 15:21:22
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipSupervisionInfoDto", description="监督管理信息表Dto")
public class SuperviseInfoModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "$column.comments")
private String supervisoryCode;
@ApiModelProperty(value = "$column.comments")
private String instanceId;
@ApiModelProperty(value = "$column.comments")
private String status;
@ApiModelProperty(value = "管辖分局组织机构代码")
private String orgBranchCode;
@ApiModelProperty(value = "管辖分局名称")
private String orgBranchName;
@ApiModelProperty(value = "是否重点监察设备")
private String keyMonitoringEqu;
@ApiModelProperty(value = "是否在人口密集区")
private String denselyPopulatedAreas;
@ApiModelProperty(value = "是否在重要场所")
private String importantPlaces;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.app.flc.api.dto.RegUnitIcDto;
import com.yeejoin.amos.boot.module.app.flc.api.dto.RegUnitInfoDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* 企业数据信息Dto
*
* @author duanwei
* @date 2022-07-26
*/
@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
public class TzBaseEnterpriseInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id")
/**
* id
*/
private Long sequenceNbr;
@ApiModelProperty(value = "使用单位唯一标识")
/**
* 使用单位唯一标识
*/
private String useUnitCode;
@ApiModelProperty(value = "监管系统唯一编码")
/**
* 监管系统唯一编码
*/
private String superviseCode;
@ApiModelProperty(value = "使用单位证件类型")
/**
* 使用单位证件类型
*/
private String useUnitCertificate;
@ApiModelProperty(value = "单位类型")
/**
* 单位类型
*/
private String unitType;
@ApiModelProperty(value = "使用单位统一信用代码")
/**
* 使用单位统一信用代码
*/
private String useCode;
@ApiModelProperty(value = "根据统一信用代码生成的二维码")
private String qrCode;
@ApiModelProperty(value = "使用单位名称")
/**
* 使用单位名称
*/
private String useUnit;
@ApiModelProperty(value = "监管机构组织机构代码")
/**
* 监管机构组织机构代码
*/
private String superviseOrgCode;
@ApiModelProperty(value = "监管机构名称")
/**
* 监管机构名称
*/
private String superviseOrgName;
@ApiModelProperty(value = "是否重点监控单位")
/**
* 是否重点监控单位
*/
private String keyUnit;
@ApiModelProperty(value = "重点场所分类")
/**
* 重点场所分类
*/
private String classPlaces;
@ApiModelProperty(value = "单位所在省份名称")
/**
* 单位所在省份名称
*/
private String province;
@ApiModelProperty(value = "单位所在城市名称")
/**
* 单位所在城市名称
*/
private String city;
@ApiModelProperty(value = "单位所在区县名称")
/**
* 单位所在区县名称
*/
private String district;
@ApiModelProperty(value = "单位所在街道名称")
/**
* 单位所在街道名称
*/
private String street;
@ApiModelProperty(value = "单位所在社区名称")
/**
* 单位所在社区名称
*/
private String community;
@ApiModelProperty(value = "单位详细地址")
/**
* 单位详细地址
*/
private String address;
@ApiModelProperty(value = "使用单位法人")
/**
* 使用单位法人
*/
private String legalPerson;
@ApiModelProperty(value = "法人联系电话")
/**
* 法人联系电话
*/
private String legalPhone;
@ApiModelProperty(value = "使用单位联系人")
/**
* 使用单位联系人
*/
private String useContact;
@ApiModelProperty(value = "联系人联系电话")
/**
* 联系人联系电话
*/
private String contactPhone;
@ApiModelProperty(value = "安全管理人员1姓名")
/**
* 安全管理人员1姓名
*/
private String safetyOne;
@ApiModelProperty(value = "安全管理人员1身份证")
/**
* 安全管理人员1身份证
*/
private String safetyOneId;
@ApiModelProperty(value = "安全管理人员1联系电话")
/**
* 安全管理人员1联系电话
*/
private String safetyOnePhone;
@ApiModelProperty(value = "安全管理人员2")
/**
* 安全管理人员2
*/
private String safetyTwo;
@ApiModelProperty(value = "安全管理人员2身份证")
/**
* 安全管理人员2身份证
*/
private String safetyTwoId;
@ApiModelProperty(value = "安全管理人员2联系电话")
/**
* 安全管理人员2联系电话
*/
private String safetyTwoPhone;
@ApiModelProperty(value = "单位地理坐标经度")
/**
* 单位地理坐标经度
*/
private String longitude;
@ApiModelProperty(value = "单位地理坐标纬度")
/**
* 单位地理坐标纬度
*/
private String latitude;
@ApiModelProperty(value = "同步时间")
/**
* 同步时间
*/
private Date syncDate;
@ApiModelProperty(value = "同步状态(0-新增 1-更新 2-删除)")
/**
* 同步状态(0-新增 1-更新 2-删除)
*/
private Integer syncState;
@ApiModelProperty(value = "对接公司编码")
/**
* 对接公司编码
*/
private String appId;
@ApiModelProperty(value = "创建时间")
/**
* 创建时间
*/
private Date recDate;
@ApiModelProperty(value = "操作人员")
/**
* 操作人员
*/
private String recUserId;
@ApiModelProperty(value = "管辖机构")
/**
* 管辖机构
*/
private String governingBody;
@ApiModelProperty(value = "数据来源")
/**
* 数据来源
*/
private String dataSources;
@ApiModelProperty(value = "所属行业")
/**
* 所属行业
*/
private String industry;
@ApiModelProperty(value = "登记机关")
/**
* 登记机关
*/
private String registrationAuthority;
@ApiModelProperty(value = "核准时间")
/**
* 核准时间
*/
private Date approvalTime;
/**
* 核准时间(企业端基础信息使用)
*/
@ApiModelProperty(value = "核准时间")
private String approval;
@ApiModelProperty(value = "经营状态")
/**
* 经营状态
*/
private String operatingStatus;
@ApiModelProperty(value = "维保负责人")
/**
* 维保负责人
*/
private String maintenPerson;
@ApiModelProperty(value = "维保负责人联系电话")
/**
* 维保负责人联系电话
*/
private String maintenTelephone;
@ApiModelProperty(value = "质量保证工程师")
/**
* 质量保证工程师
*/
private String sqa;
@ApiModelProperty(value = "质量负责人")
/**
* 质量负责人
*/
private String qualityPerson;
@ApiModelProperty(value = "质量负责人电话")
/**
* 质量负责人电话
*/
private String qualityTelephone;
@ApiModelProperty(value = "技术负责人")
/**
* 技术负责人
*/
private String technicalPerson;
@ApiModelProperty(value = "涉及设备类型")
private List equipCategory;
@ApiModelProperty(value = "企业营业执照")
private List unitBusinessLicense;
@ApiModelProperty(value = "企业许可证书")
private List unitExequatur;
@ApiModelProperty(value = "安全管理人2身份证照片")
private List safetyTwoPhoto;
@ApiModelProperty(value = "安全管理人1身份证照片")
private List safetyOnePhoto;
@ApiModelProperty(value = "质量保证工程师电话")
private String sqaPhone;
@ApiModelProperty(value = "行业主管部门")
private String industrySupervisor;
private String region;
private String fullAddress;
private String superviseKey;
private List<BaseUnitLicenceDto> unitLicences;
private RegUnitIcDto regUnitIcDto;
//企业管理员信息
private RegUnitInfoDto regUnitInfoDto;
@ApiModelProperty(value = "企业标签信息")
private String regulatoryLabels;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 使用信息表
*
* @author cpp
* @date 2023-04-06 15:21:21
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="UseInfo", description="使用信息")
public class UseInfoModel extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
private String instanceId;
@ApiModelProperty(value = "")
private String status;
@ApiModelProperty(value = "使用单位统一信用代码")
private String useUnitCreditCode;
@ApiModelProperty(value = "使用单位名称")
private String useUnitName;
@ApiModelProperty(value = "产权单位统一信用代码")
private String estateUnitCreditCode;
@ApiModelProperty(value = "产权单位名称")
private String estateUnitName;
@ApiModelProperty(value = "使用状态变更日期")
private String useStateChangeDate;
@ApiModelProperty(value = "变更事项")
private String changes;
@ApiModelProperty(value = "使用内部编号")
private String useInnerCode;
@ApiModelProperty(value = "投入使用日期")
private String useDate;
@ApiModelProperty(value = "经办人")
private String agent;
@ApiModelProperty(value = "设备使用地点-省")
private String province;
@ApiModelProperty(value = "设备使用地点-市")
private String city;
@ApiModelProperty(value = "设备使用地点-区(县)")
private String county;
@ApiModelProperty(value = "设备使用地点-街道(镇)")
private String factoryUseSiteStreet;
@ApiModelProperty(value = "设备详细使用地址")
private String address;
@ApiModelProperty(value = "设备地理坐标经纬度")
private String longitudeLatitude;
@ApiModelProperty(value = "设备使用场所")
private String usePlace;
@ApiModelProperty(value = "设备主管部门")
private String equManageDt;
@ApiModelProperty(value = "安全管理部门名称")
private String safetyManageDt;
@ApiModelProperty(value = "安全管理员")
private String safetyManager;
@ApiModelProperty(value = "安全管理员移动电话")
private String phone;
@ApiModelProperty(value = "设备状态")
private String equState;
@ApiModelProperty(value = "")
private String provinceName;
@ApiModelProperty(value = "")
private String cityName;
@ApiModelProperty(value = "")
private String countyName;
}
package com.yeejoin.amos.boot.module.app.api.dto;
import lombok.Data;
/**
* @author Administrator
*/
@Data
public class UseUnitCreditCodeCategoryDto {
/**
* 使用单位编码
*/
private String useUnitCreditCode;
/**
* 管辖机构编码
*/
private String orgBranchCode;
/**
* 状态
*/
private String claimStatus;
/**
* 设备定义编码
*/
private String equList;
/**
* 数量
*/
private Long total;
}
package com.yeejoin.amos.boot.module.app.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
@Data
public abstract class AbstractEquipBaseEntity {
@TableId(
value = "\"SEQUENCE_NBR\"",
type = IdType.ID_WORKER
)
protected String sequenceNbr;
@TableField("\"REC_DATE\"")
protected String recDate;
@TableField("\"REC_USER_ID\"")
protected String recUserId;
/**
* * 监管码
* */
@TableField(value ="\"RECORD\"")
private String record;
/**
*
*/
private static final long serialVersionUID = 1L;
}
package com.yeejoin.amos.boot.module.app.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 单位注册许可信息表
*
* @author system_generator
* @date 2022-08-09
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tz_base_unit_licence")
public class BaseUnitLicence extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 单位编码
*/
@TableField("unit_code")
private String unitCode;
/**
* 单位名称
*/
@TableField("unit_name")
private String unitName;
/**
* 许可地址
*/
@TableField("lic_address")
private String licAddress;
/**
* 证书类型
*/
@TableField("cert_type")
private String certType;
/**
* 证书类型code
*/
@TableField("cert_type_code")
private String certTypeCode;
/**
* 证书编号
*/
@TableField("cert_no")
private String certNo;
/**
* 有效期至
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("expiry_date")
private Date expiryDate;
/**
* 发证日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("issue_date")
private Date issueDate;
/**
* 变更日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("change_date")
private Date changeDate;
/**
* 许可方式/许可状态
*/
@TableField("apply_type")
private String applyType;
/**
* 许可方式/许可状态
*/
@TableField("apply_type_code")
private String applyTypeCode;
/**
* 许可评审方式
*/
private String appraisalType;
/**
* 许可评审方式code
*/
private String appraisalTypeCode;
/**
* 备注
*/
@TableField("remark")
private String remark;
/**
* 许可项目/检验类型/设备品种编码
*/
@TableField("item_code")
private String itemCode;
/**
* 许可项目/检验类型/设备品种
*/
@TableField("item_code_name")
private String itemCodeName;
/**
* 许可子项目/检验项目/充装介质类别code
*/
@TableField("sub_item_code")
private String subItemCode;
/**
* 许可子项目/检验项目/充装介质类别
*/
@TableField("sub_item_name")
private String subItemName;
/**
* 许可参数/充装介质名称
*/
@TableField("parameter")
private String parameter;
/**
* 许可参数/充装介质code
*/
@TableField("parameter_code")
private String parameterCode;
/**
* 固定检验地址
*/
@TableField("item_address")
private String itemAddress;
/**
* 发证机关
*/
private String approvedOrgan;
/**
* 发证机关code
*/
private String approvedOrganCode;
/**
* 是否同步自许可(1是 0否)
*/
@TableField("is_not_sync")
private String isNotSync;
}
This diff is collapsed.
This diff is collapsed.
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