Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

系统功能调整

Browse Source
This commit is contained in:
xy
2024-12-02 14:46:58 +08:00
parent 8f57310625
commit e7b4117167
12 changed files with 72 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-common/common-autocode/src/main/java/com/njcn/autocode/utils/GenerateCode.java
View File

@@ -21,17 +21,17 @@ public class GenerateCode {
private static final String TARGET_DIR = "D://code";
private static final String DB_URL = "jdbc:mysql://127.0.0.1:3306/pqsinfo";
private static final String DB_URL = "jdbc:mysql://192.168.1.24:13306/pqsinfo_zl";
// private static final String DB_URL = "jdbc:oracle:thin:@192.168.1.170:1521:pqsbase";
private static final String USERNAME = "root";
private static final String PASSWORD = "123456";
private static final String PASSWORD = "njcnpqs";
public static void main(String[] args) {
List<Module> modules = Stream.of(
new Module("xy", "com.njcn.supervision", "survey", Stream.of(
"supervision_line_warning"
"app_version"
).collect(Collectors.toList()), "supervision_")
).collect(Collectors.toList());
generateJavaFile(modules);

15
pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java
View File

@@ -174,16 +174,31 @@ public interface PatternRegex {
*/
String TYPE_REGEX = "^[0-9a-zA-Z\\u0391-\\uFFE5]{1,100}$";
/**
* 描述32
*/
String DES32_REGEX = "^.{0,32}$";
/**
* 描述64
*/
String DES64_REGEX = "^.{0,64}$";
/**
* 描述100
*/
String DES100_REGEX = "^.{0,100}$";
/**
* 描述200
*/
String DES200_REGEX = "^.{0,200}$";
/**
* 描述400
*/
String DES400_REGEX = "^.{0,400}$";
/**
* 描述500
*/

4
pqs-common/common-web/src/main/java/com/njcn/web/constant/ValidMessage.java
View File

@@ -69,4 +69,8 @@ public interface ValidMessage {
String DEVICE_VERSION_NOT_BLANK = "装置版本json文件不能为空，请检查deviceVersionFile参数";
String SEARCH_DATA_ERROR = "搜索值有特殊字符或者过长,请检查搜索参数";
String DATA_TOO_LONG = "参数过长,请检查参数";
}

4
pqs-common/common-web/src/main/java/com/njcn/web/pojo/param/BaseParam.java
View File

@@ -1,8 +1,11 @@
package com.njcn.web.pojo.param;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.web.constant.ValidMessage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Pattern;
import java.io.Serializable;
/**
@@ -16,6 +19,7 @@ public class BaseParam implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("搜索值")
@Pattern(regexp = PatternRegex.ALL_CHAR_1_20, message = ValidMessage.SEARCH_DATA_ERROR)
private String searchValue;
@ApiModelProperty("开始时间")