Skip to content
This repository was archived by the owner on Aug 1, 2025. It is now read-only.

修正mysql大小写不一致的问题 #22

Open
scm1219 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修正mysql大小写不一致的问题 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions super-diamond-server/src/main/java/com/github/diamond/web/service/ProjectService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class ProjectService {
private ConfigService configService;

public List<Project> queryProjects(User user, int offset, int limit) {
String sql = "SELECT b.ID, b.PROJ_CODE, b.PROJ_NAME, a.USER_NAME, b.OWNER_ID FROM CONF_USER a, CONF_PROJECT b " +
String sql = "SELECT b.ID, b.PROJ_CODE, b.PROJ_NAME, a.USER_NAME, b.OWNER_ID FROM conf_user a, conf_project b " +
"WHERE a.ID=b.OWNER_ID AND b.DELETE_FLAG = 0 ";

if(!"admin".equals(user.getUserCode())) {
Expand All @@ -45,7 +45,7 @@ public List<Project> queryProjects(User user, int offset, int limit) {
}

public Long queryProjectCount(User user) {
String sql = "SELECT count(*) FROM CONF_USER a, CONF_PROJECT b " +
String sql = "SELECT count(*) FROM conf_user a, conf_project b " +
"WHERE a.ID=b.OWNER_ID AND b.DELETE_FLAG = 0 ";

if(!"admin".equals(user.getUserCode())) {
Expand All @@ -57,7 +57,7 @@ public Long queryProjectCount(User user) {

public long findUserId(String userCode) {
try {
String sql = "SELECT ID FROM CONF_USER WHERE USER_CODE = ?";
String sql = "SELECT ID FROM conf_user WHERE USER_CODE = ?";
long userid = jdbcTemplate.queryForObject(sql, new Object[]{userCode}, Long.class);
return userid;
} catch(DataAccessException e) {
Expand Down Expand Up @@ -89,7 +89,7 @@ public void saveProject(Project project, String copyCode, User user) {
} catch(NullPointerException e) {
;
}
sql = "insert into CONF_PROJECT (ID, PROJ_CODE, PROJ_NAME, OWNER_ID, CREATE_TIME) values (?, ?, ?, ?, ?)";
sql = "insert into conf_project (ID, PROJ_CODE, PROJ_NAME, OWNER_ID, CREATE_TIME) values (?, ?, ?, ?, ?)";

jdbcTemplate.update(sql, projId, project.getCode(), project.getName(), project.getOwnerId(), new Date());
this.saveUser(projId, project.getOwnerId(), "development", "test", "build", "production", "admin");
Expand All @@ -101,7 +101,7 @@ public void saveProject(Project project, String copyCode, User user) {

@Transactional
public void deleteProject(long id) {
String sql = "update CONF_PROJECT set DELETE_FLAG = 1 where id = ?";
String sql = "update conf_project set DELETE_FLAG = 1 where id = ?";
jdbcTemplate.update(sql, id);
}

Expand Down Expand Up @@ -141,10 +141,10 @@ public List<String> queryRoles(long projectId, long userId) {

@Transactional
public void saveUser(long projectId, long userId, String development, String test, String build, String production, String admin) {
String sql = "insert into CONF_PROJECT_USER (PROJ_ID, USER_ID) values (?, ?)";
String sql = "insert into conf_project_user (PROJ_ID, USER_ID) values (?, ?)";
jdbcTemplate.update(sql, projectId, userId);

sql = "insert into CONF_PROJECT_USER_ROLE (PROJ_ID, USER_ID, ROLE_CODE) values (?, ?, ?)";
sql = "insert into conf_project_user_role (PROJ_ID, USER_ID, ROLE_CODE) values (?, ?, ?)";
if(StringUtils.isNotBlank(admin)) {
jdbcTemplate.update(sql, projectId, userId, "admin");
//如果拥有admin权限，自动添加development、test、build、production
Expand All @@ -169,9 +169,9 @@ public void saveUser(long projectId, long userId, String development, String tes

@Transactional
public void deleteUser(long projectId, long userId) {
String sql = "delete from CONF_PROJECT_USER_ROLE where PROJ_ID = ? and USER_ID = ?";
String sql = "delete from conf_project_user_role where PROJ_ID = ? and USER_ID = ?";
jdbcTemplate.update(sql, projectId, userId);
sql = "delete from CONF_PROJECT_USER where PROJ_ID = ? and USER_ID = ?";
sql = "delete from conf_project_user where PROJ_ID = ? and USER_ID = ?";
jdbcTemplate.update(sql, projectId, userId);
}

Expand All @@ -182,7 +182,7 @@ public void deleteUser(long projectId, long userId) {
*/
public List<Project> queryProjectForUser(User user, int offset, int limit) {
if("admin".equals(user.getUserCode())) {
String sql = "SELECT distinct b.ID, b.PROJ_CODE, b.PROJ_NAME FROM CONF_PROJECT_USER a, CONF_PROJECT b " +
String sql = "SELECT distinct b.ID, b.PROJ_CODE, b.PROJ_NAME FROM conf_project_user a, conf_project b " +
"WHERE a.PROJ_ID = b.ID AND b.DELETE_FLAG = 0 order by b.ID desc limit ?, ?";
List<Project> projects = jdbcTemplate.query(sql, new RowMapper<Project>() {

Expand All @@ -197,7 +197,7 @@ public Project mapRow(ResultSet rs, int rowNum) throws SQLException,
}, offset, limit);
return projects;
} else {
String sql = "SELECT distinct b.ID, b.PROJ_CODE, b.PROJ_NAME FROM CONF_PROJECT_USER a, CONF_PROJECT b " +
String sql = "SELECT distinct b.ID, b.PROJ_CODE, b.PROJ_NAME FROM conf_project_user a, conf_project b " +
"WHERE a.PROJ_ID = b.ID and a.USER_ID=? AND b.DELETE_FLAG = 0 order by b.ID desc limit ?, ?";
List<Project> projects = jdbcTemplate.query(sql, new RowMapper<Project>() {

Expand All @@ -221,11 +221,11 @@ public Project mapRow(ResultSet rs, int rowNum) throws SQLException,
*/
public long queryProjectCountForUser(User user) {
if("admin".equals(user.getUserCode())) {
String sql = "select count(*) from (SELECT distinct b.ID FROM CONF_PROJECT_USER a, CONF_PROJECT b " +
String sql = "select count(*) from (SELECT distinct b.ID FROM conf_project_user a, conf_project b " +
"WHERE a.PROJ_ID = b.ID AND b.DELETE_FLAG = 0) as proj";
return jdbcTemplate.queryForObject(sql, Long.class);
} else {
String sql = "select count(*) from (SELECT distinct b.ID FROM CONF_PROJECT_USER a, CONF_PROJECT b " +
String sql = "select count(*) from (SELECT distinct b.ID FROM conf_project_user a, conf_project b " +
"WHERE a.PROJ_ID = b.ID and a.USER_ID=? AND b.DELETE_FLAG = 0) as proj";
return jdbcTemplate.queryForObject(sql, Long.class, user.getId());
}
Expand All @@ -237,7 +237,7 @@ public long queryProjectCountForUser(User user) {
*/
@Transactional
public void updateVersion(Long projectId) {
String sql = "update CONF_PROJECT set DEVELOPMENT_VERSION=DEVELOPMENT_VERSION+1,PRODUCTION_VERSION=PRODUCTION_VERSION+1," +
String sql = "update conf_project set DEVELOPMENT_VERSION=DEVELOPMENT_VERSION+1,PRODUCTION_VERSION=PRODUCTION_VERSION+1," +
"TEST_VERSION=TEST_VERSION+1 where ID=?";
jdbcTemplate.update(sql, projectId);
}
Expand All @@ -249,19 +249,19 @@ public void updateVersion(Long projectId) {
@Transactional
public void updateVersion(Long projectId, String type) {
if("development".equals(type)) {
String sql = "update CONF_PROJECT set DEVELOPMENT_VERSION=DEVELOPMENT_VERSION+1 where ID=?";
String sql = "update conf_project set DEVELOPMENT_VERSION=DEVELOPMENT_VERSION+1 where ID=?";
jdbcTemplate.update(sql, projectId);
} else if("production".equals(type)) {
String sql = "update CONF_PROJECT set PRODUCTION_VERSION=PRODUCTION_VERSION+1 where ID=?";
String sql = "update conf_project set PRODUCTION_VERSION=PRODUCTION_VERSION+1 where ID=?";
jdbcTemplate.update(sql, projectId);
} else if("test".equals(type)) {
String sql = "update CONF_PROJECT set TEST_VERSION=TEST_VERSION+1 where ID=?";
String sql = "update conf_project set TEST_VERSION=TEST_VERSION+1 where ID=?";
jdbcTemplate.update(sql, projectId);
}
}

public Map<String, Object> queryProject(Long projectId) {
String sql = "select * from CONF_PROJECT where ID=?";
String sql = "select * from conf_project where ID=?";
return jdbcTemplate.queryForMap(sql, projectId);
}

Expand Down
14 changes: 7 additions & 7 deletions super-diamond-server/src/main/java/com/github/diamond/web/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public Object login(String userCode, String password) {

try {
String sql = "SELECT ID, USER_NAME, PASSWORD, DELETE_FLAG " +
"FROM CONF_USER WHERE USER_CODE = ?";
"FROM conf_user WHERE USER_CODE = ?";
User user = jdbcTemplate.query(sql, new UserResultSetExtractor(), userCode);

if(md5Passwd.equals(user.getPassword())) {
Expand All @@ -49,34 +49,34 @@ public Object login(String userCode, String password) {

public List<User> queryUsers(int offset, int limit) {
String sql = "SELECT ID, USER_CODE, USER_NAME " +
"FROM CONF_USER WHERE DELETE_FLAG = 0 order by ID limit ?,?";
"FROM conf_user WHERE DELETE_FLAG = 0 order by ID limit ?,?";
return jdbcTemplate.query(sql, new UserRowMapper(), offset, limit);
}

public long queryUserCount() {
String sql = "SELECT count(*) FROM CONF_USER WHERE DELETE_FLAG = 0";
String sql = "SELECT count(*) FROM conf_user WHERE DELETE_FLAG = 0";
return jdbcTemplate.queryForObject(sql, Long.class);
}

@Transactional
public void saveUser(User user) {
String sql = "SELECT MAX(id)+1 FROM CONF_USER";
String sql = "SELECT MAX(id)+1 FROM conf_user";
long id = jdbcTemplate.queryForObject(sql, Long.class);
sql = "insert into CONF_USER (ID, USER_CODE, USER_NAME, PASSWORD, CREATE_TIME) " +
sql = "insert into conf_user (ID, USER_CODE, USER_NAME, PASSWORD, CREATE_TIME) " +
"values (?, ?, ?, ?, ?)";

jdbcTemplate.update(sql, id, user.getUserCode(), user.getUserName(), user.getPassword(), new Date());
}

@Transactional
public void deleteUser(long id) {
String sql = "update CONF_USER set DELETE_FLAG = 1 where id = ?";
String sql = "update conf_user set DELETE_FLAG = 1 where id = ?";
jdbcTemplate.update(sql, id);
}

@Transactional
public void updatePassword(long id, String password) {
String sql = "update CONF_USER set password = ? where id = ?";
String sql = "update conf_user set password = ? where id = ?";
jdbcTemplate.update(sql, password, id);
}

Expand Down
124 changes: 62 additions & 62 deletions super-diamond-server/src/main/resources/META-INF/scripts/mysql.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
CREATE DATABASE edu_diamond;
create database edu_diamond;

CREATE TABLE `CONF_USER` (
`ID` int(11) NOT NULL,
`USER_CODE` varchar(32) DEFAULT NULL,
`USER_NAME` varchar(32) NOT NULL,
`PASSWORD` varchar(32) NOT NULL,
`DELETE_FLAG` int(1) DEFAULT '0',
`CREATE_TIME` datetime DEFAULT NULL,
`UPDATE_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
create table `conf_user` (
`id` int(11) not null,
`user_code` varchar(32) default null,
`user_name` varchar(32) not null,
`password` varchar(32) not null,
`delete_flag` int(1) default '0',
`create_time` datetime default null,
`update_time` datetime default null,
primary key (`id`)
) engine=innodb default charset=utf8;

CREATE TABLE `CONF_PROJECT` (
`ID` int(11) NOT NULL,
`PROJ_CODE` varchar(32) DEFAULT NULL,
`PROJ_NAME` varchar(32) DEFAULT NULL,
`OWNER_ID` int(11) DEFAULT NULL COMMENT '椤圭洰鎷ユ湁鑰匢D',
`DEVELOPMENT_VERSION` INT(11) DEFAULT 0 NULL,
`PRODUCTION_VERSION` INT(11) DEFAULT 0 NULL,
`TEST_VERSION` INT(11) DEFAULT 0 NULL,
`DELETE_FLAG` int(1) DEFAULT '0',
`CREATE_TIME` datetime DEFAULT NULL,
`UPDATE_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
create table `conf_project` (
`id` int(11) not null,
`proj_code` varchar(32) default null,
`proj_name` varchar(32) default null,
`owner_id` int(11) default null ,
`development_version` int(11) default 0 null,
`production_version` int(11) default 0 null,
`test_version` int(11) default 0 null,
`delete_flag` int(1) default '0',
`create_time` datetime default null,
`update_time` datetime default null,
primary key (`id`)
) engine=innodb default charset=utf8;

CREATE TABLE `CONF_PROJECT_USER` (
`PROJ_ID` int(11) NOT NULL,
`USER_ID` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`PROJ_ID`,`USER_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
create table `conf_project_user` (
`proj_id` int(11) not null,
`user_id` int(11) not null default '0',
primary key (`proj_id`,`user_id`)
) engine=innodb default charset=utf8;

CREATE TABLE `CONF_PROJECT_MODULE` (
`MODULE_ID` int(11) NOT NULL,
`PROJ_ID` int(11) NOT NULL,
`MODULE_NAME` varchar(32) DEFAULT NULL,
PRIMARY KEY (`MODULE_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
create table `conf_project_module` (
`module_id` int(11) not null,
`proj_id` int(11) not null,
`module_name` varchar(32) default null,
primary key (`module_id`)
) engine=innodb default charset=utf8;

CREATE TABLE `CONF_PROJECT_USER_ROLE` (
`PROJ_ID` int(11) NOT NULL,
`USER_ID` int(11) NOT NULL,
`ROLE_CODE` varchar(32) NOT NULL,
PRIMARY KEY (`PROJ_ID`,`USER_ID`,`ROLE_CODE`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
create table `conf_project_user_role` (
`proj_id` int(11) not null,
`user_id` int(11) not null,
`role_code` varchar(32) not null,
primary key (`proj_id`,`user_id`,`role_code`)
) engine=innodb default charset=utf8;

CREATE TABLE `CONF_PROJECT_CONFIG` (
`CONFIG_ID` INT(11) NOT NULL,
`CONFIG_KEY` VARCHAR(64) NOT NULL,
`CONFIG_VALUE` VARCHAR(256) NOT NULL,
`CONFIG_DESC` VARCHAR(256) DEFAULT NULL,
`PROJECT_ID` INT(11) NOT NULL,
`MODULE_ID` INT(11) NOT NULL,
`DELETE_FLAG` INT(1) DEFAULT '0',
`OPT_USER` VARCHAR(32) DEFAULT NULL,
`OPT_TIME` DATETIME DEFAULT NULL,
`PRODUCTION_VALUE` VARCHAR(256) NOT NULL,
`PRODUCTION_USER` VARCHAR(32) DEFAULT NULL,
`PRODUCTION_TIME` DATETIME DEFAULT NULL,
`TEST_VALUE` VARCHAR(256) NOT NULL,
`TEST_USER` VARCHAR(32) DEFAULT NULL,
`TEST_TIME` DATETIME DEFAULT NULL,
`BUILD_VALUE` VARCHAR(256) NOT NULL,
`BUILD_USER` VARCHAR(32) DEFAULT NULL,
`BUILD_TIME` DATETIME DEFAULT NULL,
PRIMARY KEY (`CONFIG_ID`)
) ENGINE=INNODB DEFAULT CHARSET=utf8;
create table `conf_project_config` (
`config_id` int(11) not null,
`config_key` varchar(64) not null,
`config_value` varchar(256) not null,
`config_desc` varchar(256) default null,
`project_id` int(11) not null,
`module_id` int(11) not null,
`delete_flag` int(1) default '0',
`opt_user` varchar(32) default null,
`opt_time` datetime default null,
`production_value` varchar(256) not null,
`production_user` varchar(32) default null,
`production_time` datetime default null,
`test_value` varchar(256) not null,
`test_user` varchar(32) default null,
`test_time` datetime default null,
`build_value` varchar(256) not null,
`build_user` varchar(32) default null,
`build_time` datetime default null,
primary key (`config_id`)
) engine=innodb default charset=utf8;