bug修改

cert
anthonywj 2 years ago
parent d600f45435
commit 911219384b

@ -22,8 +22,8 @@ public class Knife4jConfiguration {
public Docket defaultApi2() {
Docket docket = new Docket(DocumentationType.SWAGGER_2)
.apiInfo(new ApiInfoBuilder()
.title("UDI管理系统后台")
.description("UDI管理系统后台 - APIS")
.title("UDI监管平台")
.description("UDI监管平台 - API接口文档")
.version("1.0")
.build())
.enable(enable)

@ -50,7 +50,7 @@ public class UdiRelController extends BaseController {
//获取同步库UDI信息
@AuthRuleAnnotation("")
@ApiIgnore
@ApiOperation(value = "获取同步库UDI信息",response = BasicUdiRelResponse.class)
@ApiOperation(value = "获取同步库UDI信息", response = BasicUdiRelResponse.class)
@GetMapping("udi/basic/rel/filter")
public BaseResponse filterRel(FilterUdiRelRequest filterUdiRelRequest) {
String nameCode;
@ -118,7 +118,10 @@ public class UdiRelController extends BaseController {
BasicUdiProductEntity basicUdiProductEntity = new BasicUdiProductEntity();
BeanUtils.copyProperties(productInfoEntity, basicUdiProductEntity);
basicUdiProductEntity.setId(IdUtil.getSnowflakeNextId());
basicUdiProductService.save(basicUdiProductEntity);
if (!basicUdiProductService.isExit(basicUdiProductEntity.getUuid())) {
basicUdiProductService.save(basicUdiProductEntity);
}
}
}
@ -129,7 +132,7 @@ public class UdiRelController extends BaseController {
}
@AuthRuleAnnotation("")
@ApiOperation(value = "注册企业删除医疗器械信息",response = BaseResponse.class)
@ApiOperation(value = "注册企业删除医疗器械信息", response = BaseResponse.class)
@PostMapping("udi/basic/rel/delete")
public BaseResponse deletRel(@RequestBody DeleteRequest deleteRequest) {
basicUdiRelService.removeById(deleteRequest.getId());
@ -138,7 +141,7 @@ public class UdiRelController extends BaseController {
//产品信息关联修改
@AuthRuleAnnotation("")
@ApiOperation(value = "注册企更新除医疗器械信息",response = BaseResponse.class)
@ApiOperation(value = "注册企更新除医疗器械信息", response = BaseResponse.class)
@PostMapping("udi/basic/rel/update")
public BaseResponse updateRel(@RequestBody BasicUdiRelRequest basicUdiRelRequest) {

@ -282,7 +282,7 @@ public class UserRegisterController extends BaseController {
userPersonEntity.setRegisterId(Long.valueOf(registComPerResponse.getId()));
userPersonService.insert(userPersonEntity);
//发送邮件
iEmailService.sendSimpleMail(id.getXemail(), "测试邮箱", "账号:" + userName + ",密码:" + password);
// iEmailService.sendSimpleMail(id.getXemail(), "测试邮箱", "账号:" + userName + ",密码:" + password);
// 生产企业任务配置表

@ -89,15 +89,6 @@ public class UdiTraceController extends BaseController {
return ResultVOUtils.success("发送成功");
}
/*@PostMapping("/udi/trace/source/task")
public BaseResponse sendTask(@RequestBody MqTaskDelayMessage mqTaskDelayMessage) {
String messageJson = JSON.toJSONString(mqTaskDelayMessage);
System.out.println(messageJson);
rabbitTemplate.convertAndSend(TopicRabbitConfig.TRACE_DELAY_EXCHANGE, TopicRabbitConfig.delaytrace, mqTaskDelayMessage);
return ResultVOUtils.success("发送成功");
}*/
/**
*
*
@ -210,7 +201,6 @@ public class UdiTraceController extends BaseController {
@GetMapping("udi/trace/scene/search")
public BaseResponse sceneTrace(TraceRecordRequest traceRecordRequest) {
TraceSearchReponse traceSearchReponse = new TraceSearchReponse();
TraceRecordLogEntity traceRecordLogEntity = null;
TraceProductDetailEntity traceProductDetailEntity = null;
BasicUdiRelResponse basicUdiRelResponse = null;

@ -1,5 +1,6 @@
server:
port: 9991
port: 9998
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
@ -10,8 +11,10 @@ spring:
connection-timeout: 60000
maximum-pool-size: 60
minimum-idle: 10
redis:
database: 8
database: 14
host: 127.0.0.1
port: 6379
# password: 123456
@ -31,11 +34,32 @@ spring:
max-request-size: 500MB
rabbitmq:
host: 192.168.0.66
host: 127.0.0.1
port: 5672
virtual-host: dev
username: glxp
password: glxp1234
username: cpt
password: 123456
virtual-host: /
publisher-confirms: false
connection-timeout: 15000
mail:
# QQ邮箱hostsmtp.qq.com 163邮箱host:smtp.163.com
host: smtp.qq.com
protocol: smtp
default-encoding: UTF-8
# 邮箱账号
username: 1610949092@qq.com
nickname: 高立新鹏
# 授权码
password: jkxwxfencqhichfh
smtp:
port: 465
timeout: 10000
auth: true
starttls:
enable: true
required: true
defaultEncoding: UTF-8
ok:
http:
@ -58,5 +82,3 @@ SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
back_file_path: D:/share/cpt/back/
API_KEY: 1101
API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ9L

@ -1,6 +1,6 @@
spring:
profiles:
active: dev
active: pro
jmx:
enabled: false
servlet:

Loading…
Cancel
Save