Skip to content

A
amos-boot-biz
Commit ac308f32 authored by tianbo's avatar tianbo
Browse files
Options

Merge branch 'develop_tzs_register' of D:\workspace\git\amos\amos-boot-biz with conflicts.

parent a91ceab9
Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 460 deletions
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/SuperviseController.java
View file @ ac308f32
......@@ -207,7 +207,7 @@ public class SuperviseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "赋码")
@PostMapping(value = "/generation/code")
@RestEventTrigger(value = "openapiLogEventHandler")
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ConstructionInfo.java
View file @ ac308f32
......@@ -21,6 +21,9 @@ public class ConstructionInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
@TableField("\"RECORD\"")
private String record;
/**
* * 监管码
* */
......@@ -75,4 +78,6 @@ public class ConstructionInfo extends AbstractEquipBaseEntity {
@TableField(value ="\"USC_INFORM_ID\"")
private String uscInformId;
@TableField("\"SEQUENCE_CODE\"")
private String sequenceCode;
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/DesignInfo.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
import java.util.Date;
/**
* 安全追溯-设计信息表
*
......@@ -24,6 +20,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
public class DesignInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
/**
* * $column.comments
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipTechParamElevator.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
import java.math.BigDecimal;
/**
* 安全追溯-电梯
*
......@@ -25,6 +20,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
public class EquipTechParamElevator extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
/**
* * $column.comments
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MainParts.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import java.math.BigDecimal;
import java.util.Date;
/**
*
*
......@@ -30,6 +24,8 @@ public class MainParts extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
@TableField("\"SUPERVISORY_CODE\"")
private String supervisoryCode;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MaintenanceInfo.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
import java.util.Date;
/**
* 安全追溯-维保备案信息表
*
......@@ -24,6 +20,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
public class MaintenanceInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
/**
* * $column.comments
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/OtherInfo.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* ${comments}
*
......@@ -24,6 +18,15 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
public class OtherInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
@TableField("\"INSTANCE_ID\"")
private String instanceId;
/**
*
*/
private String status;
/**
* * 保险机构
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ProduceInfo.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
import java.util.Date;
/**
* 安全追溯-制造信息
*
......@@ -24,7 +20,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
public class ProduceInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
@TableField(value ="\"SUPERVISORY_CODE\"")
private String supervisoryCode;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ProtectionDevices.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import java.util.Date;
/**
*
*
......@@ -29,6 +23,7 @@ public class ProtectionDevices extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
@TableField("\"SUPERVISORY_CODE\"")
private String supervisoryCode;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/RegistrationInfo.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
import java.math.BigDecimal;
/**
* 注册登记信息表
*
......@@ -25,6 +20,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
public class RegistrationInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
/**
* * $column.comments
......@@ -32,9 +28,6 @@ public class RegistrationInfo extends AbstractEquipBaseEntity {
@TableField(value ="\"SUPERVISORY_CODE\"")
private String supervisoryCode;
/**
* * $column.comments
* */
/**
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/SuperviseInfo.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* 监督管理信息表
*
......@@ -24,6 +18,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
public class SuperviseInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
/**
* * $column.comments
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/UseInfo.java
View file @ ac308f32
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
import java.util.Date;
/**
* 使用信息表
*
......@@ -188,5 +185,28 @@ public class UseInfo extends AbstractEquipBaseEntity {
@TableField(value ="\"COUNTY_NAME\"")
private String countyName;
/**
* 是否西咸（0不是，1是）
*/
private String isXiXian;
/**
* 是否在es（0不是，1是）
*/
private String isEs;
/**
* 创建时间
* */
private Date createDate;
/**
* 认领时间
* */
private Date claimDate;
/**
* 数据来源（新增：0、导入：1、复制：复制数据的id ）
* */
private Date dataSource;
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsServiceFeignClient.java
View file @ ac308f32
......@@ -14,7 +14,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
import java.util.Map;
@FeignClient(name = "TZS-YMT", path = "/ymt", configuration =
@FeignClient(name = "TZS-YMT", url = "http://36.46.151.113:11000", path = "/ymt", configuration =
{MultipartSupportConfig.class})
public interface TzsServiceFeignClient {
......
amos-boot-data/amos-boot-data-openapi/src/main/resources/application-vb.properties
View file @ ac308f32
spring.application.name=AMOS-API-OPENAPI
spring.application.name=AMOS-API-OPENAPI-tb
server.servlet.context-path=/openapi
server.port=11001
# jdbc_config
spring.datasource.driver-class-name=cn.com.vastbase.Driver
spring.datasource.url=jdbc:vastbase://36.46.137.116:5432/per_tzs_amos_tzs_biz?currentSchema=amos_openapi_cyl
spring.datasource.url=jdbc:vastbase://36.46.151.113:5432/tzs_amos_tzs_biz_test?currentSchema=amos_openapi_cyl
spring.datasource.username=admin
spring.datasource.password=Yeejoin@2023
......@@ -19,7 +19,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
# REDIS (RedisProperties)
spring.redis.database=1
spring.redis.host=172.16.10.210
spring.redis.host=36.46.151.113
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
......@@ -29,20 +29,20 @@ spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
#注册中心地址
eureka.client.service-url.defaultZone =http://admin:a1234560@172.16.10.210:10001/eureka/
eureka.client.service-url.defaultZone =http://admin:a1234560@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://172.16.10.210:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.health-check-url=http://172.16.3.89:${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.10.210:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.10.210:${server.port}${server.servlet.context-path}/swagger-ui.html
eureka.instance.ip-address = 172.16.3.34
eureka.instance.status-page-url=http://172.16.3.89:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.89:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address = 172.16.3.89
##emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.210:1883
emqx.broker=tcp://36.46.151.113:1883
emqx.client-user-name=super
emqx.client-password=123456
......
amos-boot-system-precontrol/src/main/java/com/yeejoin/amos/StartPrecontrolService.java
View file @ ac308f32
package com.yeejoin.amos;
import java.text.ParseException;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.web.client.RestTemplate;
import org.typroject.tyboot.component.emq.EmqKeeper;
import com.yeejoin.precontrol.common.listener.mqtt.AmosMqTtlListener;
import com.yeejoin.precontrol.common.listener.mqtt.ExamMqTtRecordListener;
import com.yeejoin.precontrol.common.listener.mqtt.ExamMqTtlListener;
import com.yeejoin.precontrol.common.start.StartPlatformTokenService;
import com.yeejoin.precontrol.common.start.StartRiskService;
import lombok.extern.slf4j.Slf4j;
/**
* @Description: 服务启动类
* @Author: duanwei
* @Date: 2020/8/18
*/
@SpringBootApplication(scanBasePackages = { "com.yeejoin.precontrol", "com.yeejoin.amos",
"com.yeejoin.amos.component.rule", "org.typroject.tyboot.component.emq", "org.typroject.tyboot.component.cache",
"org.typroject.tyboot.core.auth", "org.typroject.tyboot.core.foundation","com.yeejoin.precontrol.common.feign", })
@EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yeejoin.precontrol.common.feign","com.yeejoin.amos.boot.module.common.api.feign"
,"com.yeejoin.amos.boot.biz.common.workflow.feign"})
@EnableEurekaClient
//@EnableWebSocket
@EnableAsync
@MapperScan({ "com.yeejoin.precontrol.common.mapper", "org.typroject.tyboot.face.*.orm.dao*",
"org.typroject.tyboot.core.auth.face.orm.dao", "org.typroject.tyboot.component.*.face.orm.dao*"
,"com.yeejoin.amos.boot.module.common.api.mapper"
,"com.yeejoin.amos.boot.biz.common.dao.mapper" })
@Slf4j
public class StartPrecontrolService {
@Autowired
private EmqKeeper emqKeeper;
@Autowired
private AmosMqTtlListener amosMqTtlListener;
@Autowired
private ExamMqTtlListener examMqTtlListener;
@Autowired
private ExamMqTtRecordListener examMqTtRecordListener;
@Autowired
private StartPlatformTokenService startPlatformTokenService;
@Autowired
private StartRiskService startRiskService;
public static void main(String[] args) {
SpringApplication.run(StartPrecontrolService.class, args).getEnvironment();
log.info("swagger:--->http://localhost:8060/precontrol/swagger-ui.html");
}
/**
* 使用 websockt注解的时候，使用@EnableScheduling注解后，即开启定时任务 启动的时候一直报错，增加这个bean 则报错解决。
*
* @throws ParseException
*/
@Bean
public TaskScheduler taskScheduler() throws ParseException {
ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
taskScheduler.setPoolSize(10);
taskScheduler.initialize();
return taskScheduler;
}
/**
* 添加ribbon负载均衡支持
*/
@Bean
@LoadBalanced
RestTemplate initRestTemplate() {
return new RestTemplate();
}
/**
* 初始化MQTT
*
* @throws MqttException
*/
@Bean
void initMqtt() throws MqttException {
emqKeeper.getMqttClient().subscribe("/amos/operation/log", 1, amosMqTtlListener);
emqKeeper.getMqttClient().subscribe("topic_mqtt_exam", 1, examMqTtlListener);
emqKeeper.getMqttClient().subscribe("topic_mqtt_exam_record", 1, examMqTtRecordListener);
}
// /**
// * 如果直接使用springboot的内置容器，而不是使用独立的servlet容器，就要注入ServerEndpointExporter，外部容器则不需要。
// */
// @Bean
// public ServerEndpointExporter serverEndpointExporter() {
// return new ServerEndpointExporter();
// }
@Bean
public void initToken() {
startPlatformTokenService.getToken();
}
@Bean
public void initTask() {
startRiskService.doTimerTask();
}
}
//package com.yeejoin.amos;
//
//import java.text.ParseException;
//
//import org.eclipse.paho.client.mqttv3.MqttException;
//import org.mybatis.spring.annotation.MapperScan;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.SpringApplication;
//import org.springframework.boot.autoconfigure.SpringBootApplication;
//import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
//import org.springframework.cloud.client.loadbalancer.LoadBalanced;
//import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
//import org.springframework.cloud.openfeign.EnableFeignClients;
//import org.springframework.context.annotation.Bean;
//import org.springframework.scheduling.TaskScheduler;
//import org.springframework.scheduling.annotation.EnableAsync;
//import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
//import org.springframework.web.client.RestTemplate;
//import org.typroject.tyboot.component.emq.EmqKeeper;
//
//import com.yeejoin.precontrol.common.listener.mqtt.AmosMqTtlListener;
//import com.yeejoin.precontrol.common.listener.mqtt.ExamMqTtRecordListener;
//import com.yeejoin.precontrol.common.listener.mqtt.ExamMqTtlListener;
//import com.yeejoin.precontrol.common.start.StartPlatformTokenService;
//import com.yeejoin.precontrol.common.start.StartRiskService;
//
//import lombok.extern.slf4j.Slf4j;
//
///**
// * @Description: 服务启动类
// * @Author: duanwei
// * @Date: 2020/8/18
// */
//@SpringBootApplication(scanBasePackages = { "com.yeejoin.precontrol", "com.yeejoin.amos",
// "com.yeejoin.amos.component.rule", "org.typroject.tyboot.component.emq", "org.typroject.tyboot.component.cache",
// "org.typroject.tyboot.core.auth", "org.typroject.tyboot.core.foundation","com.yeejoin.precontrol.common.feign", })
//@EnableDiscoveryClient
//@EnableFeignClients(basePackages = {"com.yeejoin.precontrol.common.feign","com.yeejoin.amos.boot.module.common.api.feign"
// ,"com.yeejoin.amos.boot.biz.common.workflow.feign"})
//@EnableEurekaClient
////@EnableWebSocket
//@EnableAsync
//@MapperScan({ "com.yeejoin.precontrol.common.mapper", "org.typroject.tyboot.face.*.orm.dao*",
// "org.typroject.tyboot.core.auth.face.orm.dao", "org.typroject.tyboot.component.*.face.orm.dao*"
// ,"com.yeejoin.amos.boot.module.common.api.mapper"
// ,"com.yeejoin.amos.boot.biz.common.dao.mapper" })
//@Slf4j
//public class StartPrecontrolService {
//
// @Autowired
// private EmqKeeper emqKeeper;
//
// @Autowired
// private AmosMqTtlListener amosMqTtlListener;
//
// @Autowired
// private ExamMqTtlListener examMqTtlListener;
//
// @Autowired
// private ExamMqTtRecordListener examMqTtRecordListener;
//
// @Autowired
// private StartPlatformTokenService startPlatformTokenService;
//
// @Autowired
// private StartRiskService startRiskService;
//
// public static void main(String[] args) {
// SpringApplication.run(StartPrecontrolService.class, args).getEnvironment();
// log.info("swagger:--->http://localhost:8060/precontrol/swagger-ui.html");
// }
//
// /**
// * 使用 websockt注解的时候，使用@EnableScheduling注解后，即开启定时任务 启动的时候一直报错，增加这个bean 则报错解决。
// *
// * @throws ParseException
// */
// @Bean
// public TaskScheduler taskScheduler() throws ParseException {
// ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
// taskScheduler.setPoolSize(10);
// taskScheduler.initialize();
// return taskScheduler;
// }
//
// /**
// * 添加ribbon负载均衡支持
// */
// @Bean
// @LoadBalanced
// RestTemplate initRestTemplate() {
// return new RestTemplate();
// }
//
// /**
// * 初始化MQTT
// *
// * @throws MqttException
// */
// @Bean
// void initMqtt() throws MqttException {
// emqKeeper.getMqttClient().subscribe("/amos/operation/log", 1, amosMqTtlListener);
// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam", 1, examMqTtlListener);
// emqKeeper.getMqttClient().subscribe("topic_mqtt_exam_record", 1, examMqTtRecordListener);
// }
//
//// /**
//// * 如果直接使用springboot的内置容器，而不是使用独立的servlet容器，就要注入ServerEndpointExporter，外部容器则不需要。
//// */
//// @Bean
//// public ServerEndpointExporter serverEndpointExporter() {
//// return new ServerEndpointExporter();
//// }
//
// @Bean
// public void initToken() {
// startPlatformTokenService.getToken();
// }
//
// @Bean
// public void initTask() {
// startRiskService.doTimerTask();
// }
//
//}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-dev.properties
View file @ ac308f32
......@@ -7,11 +7,11 @@ eureka.client.service-url.defaultZone=http://172.16.10.210: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.17:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.health-check-url=http://172.16.3.89:${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.17:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.17:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address=172.16.3.17
eureka.instance.status-page-url=http://172.16.3.89:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.89:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address=172.16.3.89
## ES properties:
elasticsearch.username=elastic
elasticsearch.password=a123456
......
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application.properties
View file @ ac308f32
spring.application.name=TZS-COMMON
spring.application.name=TZS-COMMON-tb
server.servlet.context-path=/tcm
server.port=11002
spring.profiles.active=dev
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @ ac308f32
......@@ -12,11 +12,53 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.ymt.api.dto.*;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipExportDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.CategoryOtherInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.entity.EsElevator;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMainParts;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProtectionDevices;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsBoiler;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVehicle;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentCategoryEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryDataMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgFactoryInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgMainPartsMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProtectionDevicesMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsBoilerMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsElevatorMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsLiftingMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsPipelineMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsRidesMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsRopewayMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsVehicleMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsVesselMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.service.IEquipmentCategoryService;
import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
import com.yeejoin.amos.boot.module.ymt.biz.dao.ESElavtorRepository;
......@@ -1877,7 +1919,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
if (!ObjectUtils.isEmpty(esElevator)) {
Double lat = esElevator.getLatitude();
Double lon = esElevator.getLongitude();
//esElevator.setLocation(new GeoPoint(lat, lon));
esElevator.setLocation(new GeoPoint(lat, lon));
esElavtorRepository.save(esElevator);
superviseInfoMapper.updateRecordBatch(recordList);
}
......@@ -2169,230 +2211,4 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
}
return totle;
}
@Transactional
public Boolean saveSupervisoryData(EquipmentMessageDto data) {
if (ObjectUtils.isEmpty(data) || ObjectUtils.isEmpty(data.getSupervisoryCode())) {
return false;
}
Date date = new Date();
String supervisoryCode = data.getSupervisoryCode();
Integer saveStatus = data.getSaveStatus();
Integer alias = 0;
// 使用信息
if (!ObjectUtils.isEmpty(data.getUseInfo())) {
IdxBizJgUseInfo useInfo = data.getUseInfo();
useInfo.setRecDate(date);
if (saveStatus == 1) {
useInfo.setRecord(supervisoryCode);
useInfo.setClaimDate(date);
useInfo.setCreateDate(date);
useInfo.setDataSource("1");
idxBizJgUseInfoService.save(useInfo);
} else {
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, supervisoryCode);
idxBizJgUseInfoService.update(data.getUseInfo(), lambda);
}
}
// 设计信息
if (!ObjectUtils.isEmpty(data.getDesignInfo())) {
IdxBizJgDesignInfo designInfo = data.getDesignInfo();
designInfo.setRecDate(date);
if (saveStatus == 1) {
designInfo.setRecord(supervisoryCode);
idxBizJgDesignInfoService.save(designInfo);
} else {
LambdaQueryWrapper<IdxBizJgDesignInfo> lambda = new QueryWrapper<IdxBizJgDesignInfo>().lambda();
lambda.eq(IdxBizJgDesignInfo::getRecord, supervisoryCode);
idxBizJgDesignInfoService.update(designInfo, lambda);
}
}
// 制造信息
if (!ObjectUtils.isEmpty(data.getFactoryInfo())) {
IdxBizJgFactoryInfo factoryInfo = data.getFactoryInfo();
factoryInfo.setRecDate(date);
if (saveStatus == 1) {
factoryInfo.setRecord(supervisoryCode);
idxBizJgFactoryInfoService.save(factoryInfo);
} else {
LambdaQueryWrapper<IdxBizJgFactoryInfo> lambda = new QueryWrapper<IdxBizJgFactoryInfo>().lambda();
lambda.eq(IdxBizJgFactoryInfo::getRecord, supervisoryCode);
idxBizJgFactoryInfoService.update(factoryInfo, lambda);
}
}
// 注册登记
if (!ObjectUtils.isEmpty(data.getRegisterInfo())) {
IdxBizJgRegisterInfo registerInfo = data.getRegisterInfo();
registerInfo.setRecDate(date);
if (saveStatus == 1) {
registerInfo.setRecord(supervisoryCode);
alias = Integer.parseInt(String.valueOf(registerInfo.getEquList()));
registerInfo.setEquList("3000");
idxBizJgRegisterInfoService.save(registerInfo);
} else {
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambda = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambda.eq(IdxBizJgRegisterInfo::getRecord, supervisoryCode);
idxBizJgRegisterInfoService.update(registerInfo, lambda);
}
}
// 维保信息
if (!ObjectUtils.isEmpty(data.getMaintenanceRecordInfo())) {
IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = data.getMaintenanceRecordInfo();
maintenanceRecordInfo.setRecDate(date);
if (saveStatus == 1) {
maintenanceRecordInfo.setRecord(supervisoryCode);
idxBizJgMaintenanceRecordInfoService.save(maintenanceRecordInfo);
} else {
LambdaQueryWrapper<IdxBizJgMaintenanceRecordInfo> lambda = new QueryWrapper<IdxBizJgMaintenanceRecordInfo>().lambda();
lambda.eq(IdxBizJgMaintenanceRecordInfo::getRecord, supervisoryCode);
idxBizJgMaintenanceRecordInfoService.update(maintenanceRecordInfo, lambda);
}
}
// 其他信息
if (!ObjectUtils.isEmpty(data.getOtherInfo())) {
IdxBizJgOtherInfo otherInfo = data.getOtherInfo();
otherInfo.setRecDate(date);
if (saveStatus == 1) {
otherInfo.setRecord(supervisoryCode);
otherInfo.setClaimStatus("已认领");
otherInfo.setAlias(alias);
idxBizJgOtherInfoService.save(otherInfo);
} else {
LambdaQueryWrapper<IdxBizJgOtherInfo> lambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
lambda.eq(IdxBizJgOtherInfo::getRecord, supervisoryCode);
idxBizJgOtherInfoService.update(otherInfo, lambda);
}
}
// 监管信息
if (!ObjectUtils.isEmpty(data.getSupervisionInfo())) {
IdxBizJgSupervisionInfo supervisionInfo = data.getSupervisionInfo();
supervisionInfo.setRecDate(date);
if (saveStatus == 1) {
supervisionInfo.setRecord(supervisoryCode);
idxBizJgSupervisionInfoService.save(supervisionInfo);
} else {
LambdaQueryWrapper<IdxBizJgSupervisionInfo> lambda = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda();
lambda.eq(IdxBizJgSupervisionInfo::getRecord, supervisoryCode);
idxBizJgSupervisionInfoService.update(supervisionInfo, lambda);
}
}
// 参数信息
if (!ObjectUtils.isEmpty(data.getParams())) {
Map<String, Object> params = data.getParams();
IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = new IdxBizJgTechParamsElevator();
BeanUtil.copyProperties(params, idxBizJgTechParamsElevator);
idxBizJgTechParamsElevator.setRecDate(date);
if (saveStatus == 1) {
idxBizJgTechParamsElevator.setRecord(supervisoryCode);
idxBizJgTechParamsElevatorService.save(idxBizJgTechParamsElevator);
} else {
LambdaQueryWrapper<IdxBizJgTechParamsElevator> lambda = new QueryWrapper<IdxBizJgTechParamsElevator>().lambda();
lambda.eq(IdxBizJgTechParamsElevator::getRecord, supervisoryCode);
idxBizJgTechParamsElevatorService.update(idxBizJgTechParamsElevator, lambda);
}
}
checkEsData(supervisoryCode);
return true;
}
@Transactional
public Boolean saveConstructionInfoData(IdxBizJgConstructionInfo data) {
if (!ObjectUtils.isEmpty(data) && !ObjectUtils.isEmpty(data.getSupervisoryCode())){
String supervisoryCode = data.getSupervisoryCode();
data.setRecDate(new Date());
if (!ObjectUtils.isEmpty(data.getSequenceNbr())){
idxBizJgConstructionInfoService.updateById(data);
}else {
data.setRecord(supervisoryCode);
idxBizJgConstructionInfoService.save(data);
}
}else {
return false;
}
return true;
}
@Transactional
public Boolean saveMaintenanceRecordInfoData(IdxBizJgMaintenanceRecordInfo data) {
if (!ObjectUtils.isEmpty(data) && !ObjectUtils.isEmpty(data.getSupervisoryCode())){
String supervisoryCode = data.getSupervisoryCode();
data.setRecDate(new Date());
if (!ObjectUtils.isEmpty(data.getSequenceNbr())){
idxBizJgMaintenanceRecordInfoService.updateById(data);
}else {
data.setRecord(supervisoryCode);
idxBizJgMaintenanceRecordInfoService.save(data);
}
}else {
return false;
}
return true;
}
@Transactional
public Boolean saveDetectionInfoData(IdxBizJgInspectionDetectionInfo data) {
if (!ObjectUtils.isEmpty(data) && !ObjectUtils.isEmpty(data.getSupervisoryCode())){
String supervisoryCode = data.getSupervisoryCode();
data.setRecDate(new Date());
if (!ObjectUtils.isEmpty(data.getSequenceNbr())){
idxBizJgInspectionDetectionInfoService.updateById(data);
}else {
data.setRecord(supervisoryCode);
idxBizJgInspectionDetectionInfoService.save(data);
}
}else {
return false;
}
return true;
}
public Boolean deleteByRecord(String record) {
if (!ObjectUtils.isEmpty(record)){
// 使用信息删除
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, record);
idxBizJgUseInfoService.getBaseMapper().delete(lambda);
// 设计信息删除
LambdaQueryWrapper<IdxBizJgDesignInfo> lambdaDes = new QueryWrapper<IdxBizJgDesignInfo>().lambda();
lambdaDes.eq(IdxBizJgDesignInfo::getRecord, record);
idxBizJgDesignInfoService.getBaseMapper().delete(lambdaDes);
// 制造信息删除
LambdaQueryWrapper<IdxBizJgFactoryInfo> lambdaFac = new QueryWrapper<IdxBizJgFactoryInfo>().lambda();
lambdaFac.eq(IdxBizJgFactoryInfo::getRecord, record);
idxBizJgFactoryInfoService.getBaseMapper().delete(lambdaFac);
// 施工信息删除
LambdaQueryWrapper<IdxBizJgConstructionInfo> lambdaCon = new QueryWrapper<IdxBizJgConstructionInfo>().lambda();
lambdaCon.eq(IdxBizJgConstructionInfo::getRecord, record);
idxBizJgConstructionInfoService.getBaseMapper().delete(lambdaCon);
// 注册信息删除
LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, record);
idxBizJgRegisterInfoService.getBaseMapper().delete(lambdaReg);
// 维保信息删除
LambdaQueryWrapper<IdxBizJgMaintenanceRecordInfo> lambdaMain = new QueryWrapper<IdxBizJgMaintenanceRecordInfo>().lambda();
lambdaMain.eq(IdxBizJgMaintenanceRecordInfo::getRecord, record);
idxBizJgMaintenanceRecordInfoService.getBaseMapper().delete(lambdaMain);
// 监督信息删除
LambdaQueryWrapper<IdxBizJgSupervisionInfo> lambdaSup = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda();
lambdaSup.eq(IdxBizJgSupervisionInfo::getRecord, record);
idxBizJgSupervisionInfoService.getBaseMapper().delete(lambdaSup);
// 其他信息删除
LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
lambdaOth.eq(IdxBizJgOtherInfo::getRecord, record);
idxBizJgOtherInfoService.getBaseMapper().delete(lambdaOth);
// 检验检测信息删除
LambdaQueryWrapper<IdxBizJgInspectionDetectionInfo> lambdaIns = new QueryWrapper<IdxBizJgInspectionDetectionInfo>().lambda();
lambdaIns.eq(IdxBizJgInspectionDetectionInfo::getRecord, record);
idxBizJgInspectionDetectionInfoService.getBaseMapper().delete(lambdaIns);
// 参数删除
LambdaQueryWrapper<IdxBizJgTechParamsElevator> lambdaPar = new QueryWrapper<IdxBizJgTechParamsElevator>().lambda();
lambdaPar.eq(IdxBizJgTechParamsElevator::getRecord, record);
idxBizJgTechParamsElevatorService.getBaseMapper().delete(lambdaPar);
}else {
return false;
}
return true;
}
}
\ No newline at end of file
pom.xml
View file @ ac308f32
......@@ -316,27 +316,27 @@
</repositories>
<modules>
<module>amos-boot-module</module>
<!-- <module>amos-boot-module</module>-->
<module>amos-boot-biz-common</module>
<module>amos-boot-system-tzs</module>
<module>amos-boot-system-jcs</module>
<module>amos-boot-system-knowledgebase</module>
<module>amos-boot-system-fas</module>
<module>amos-boot-system-patrol</module>
<module>amos-boot-system-maintenance</module>
<module>amos-boot-system-supervision</module>
<module>amos-boot-system-equip</module>
<!-- <module>amos-boot-system-jcs</module>-->
<!-- <module>amos-boot-system-knowledgebase</module>-->
<!-- <module>amos-boot-system-fas</module>-->
<!-- <module>amos-boot-system-patrol</module>-->
<!-- <module>amos-boot-system-maintenance</module>-->
<!-- <module>amos-boot-system-supervision</module>-->
<!-- <module>amos-boot-system-equip</module>-->
<module>amos-boot-core</module>
<module>amos-boot-utils</module>
<module>amos-boot-system-latentdanger</module>
<module>amos-boot-system-ccs</module>
<!-- <module>amos-boot-system-latentdanger</module>-->
<!-- <module>amos-boot-system-ccs</module>-->
<module>amos-boot-data</module>
<module>amos-boot-system-precontrol</module>
<module>amos-boot-system-cas</module>
<module>amos-boot-system-ugp</module>
<module>amos-boot-system-tdc</module>
<module>amos-boot-system-kgd</module>
<module>amos-boot-system-file</module>
<module>amos-boot-system-jxiop</module>
<!-- <module>amos-boot-system-precontrol</module>-->
<!-- <module>amos-boot-system-cas</module>-->
<!-- <module>amos-boot-system-ugp</module>-->
<!-- <module>amos-boot-system-tdc</module>-->
<!-- <module>amos-boot-system-kgd</module>-->
<!-- <module>amos-boot-system-file</module>-->
<!-- <module>amos-boot-system-jxiop</module>-->
</modules>
</project>
\ No newline at end of file
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