修复bug
This commit is contained in:
+1
-1
@@ -26,7 +26,7 @@ public class YouBianCodeUtil {
|
||||
*/
|
||||
public static synchronized String getNextYouBianCode(String code) {
|
||||
String newcode = "";
|
||||
if (code == null || code =="") {
|
||||
if (oConvertUtils.isEmpty(code)) {
|
||||
String zimu = "A";
|
||||
String num = getStrNum(1);
|
||||
newcode = zimu + num;
|
||||
|
||||
+7
-3
@@ -1,14 +1,18 @@
|
||||
package com.jero.config;
|
||||
|
||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.module.SimpleModule;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Conditional;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Primary;
|
||||
import org.springframework.http.converter.HttpMessageConverter;
|
||||
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
|
||||
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
|
||||
import org.springframework.web.cors.CorsConfiguration;
|
||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||
@@ -72,9 +76,9 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加Long转json精度丢失的配置
|
||||
* @Return: void
|
||||
*/
|
||||
* 添加Long转json精度丢失的配置
|
||||
* @Return: void
|
||||
*/
|
||||
@Override
|
||||
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
|
||||
MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ public interface BaseCommonMapper {
|
||||
* 保存日志
|
||||
* @param dto
|
||||
*/
|
||||
@InterceptorIgnore
|
||||
@InterceptorIgnore(illegalSql = "true", tenantLine = "true")
|
||||
void saveLog(@Param("dto")LogDTO dto);
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
public class OnlCgformButton implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@TableId(
|
||||
type = IdType.UUID
|
||||
type = IdType.ASSIGN_UUID
|
||||
)
|
||||
private String id;
|
||||
private String cgformHeadId;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
public class OnlCgformEnhanceJava implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@TableId(
|
||||
type = IdType.UUID
|
||||
type = IdType.ASSIGN_UUID
|
||||
)
|
||||
private String id;
|
||||
private String cgformHeadId;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
public class OnlCgformEnhanceJs implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@TableId(
|
||||
type = IdType.UUID
|
||||
type = IdType.ASSIGN_UUID
|
||||
)
|
||||
private String id;
|
||||
private String cgformHeadId;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import java.io.Serializable;
|
||||
public class OnlCgformEnhanceSql implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@TableId(
|
||||
type = IdType.UUID
|
||||
type = IdType.ASSIGN_UUID
|
||||
)
|
||||
private String id;
|
||||
private String cgformHeadId;
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
|
||||
public class OnlCgformField implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@TableId(
|
||||
type = IdType.UUID
|
||||
type = IdType.ASSIGN_UUID
|
||||
)
|
||||
private String id;
|
||||
private String cgformHeadId;
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
|
||||
public class OnlCgformHead implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@TableId(
|
||||
type = IdType.UUID
|
||||
type = IdType.ASSIGN_UUID
|
||||
)
|
||||
private String id;
|
||||
private String tableName;
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
|
||||
public class OnlCgformIndex implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
@TableId(
|
||||
type = IdType.UUID
|
||||
type = IdType.ASSIGN_UUID
|
||||
)
|
||||
private String id;
|
||||
private String cgformHeadId;
|
||||
|
||||
@@ -29,11 +29,7 @@
|
||||
<!--加载hutool-->
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.hutool</groupId>
|
||||
<artifactId>hutool-crypto</artifactId>
|
||||
<artifactId>hutool-all</artifactId>
|
||||
</dependency>
|
||||
<!--加载beanutils-->
|
||||
<dependency>
|
||||
|
||||
Reference in New Issue
Block a user