Browse Source

commit

master
hehongxing 3 years ago
parent
commit
f80760bae5
  1. 4
      04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/UserController.java
  2. 5
      04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/UserMapper.java
  3. 6
      04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/provider/UserMapperProvider.java
  4. 13
      04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dao/UserPage.java
  5. 33
      04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java
  6. 5
      04.系统编码/Frontend/.idea/workspace.xml
  7. 3734
      04.系统编码/Frontend/package-lock.json
  8. 8
      04.系统编码/Frontend/src/components/Login.vue
  9. 46
      04.系统编码/Frontend/src/components/SystemManagement.vue
  10. 2
      04.系统编码/Frontend/src/uilts/axios.ts

4
04.系统编码/Backend/src/main/java/com/userinformation/backend/controller/UserController.java

@ -42,8 +42,8 @@ public class UserController {
}
@RequestMapping("findUserByUserName")
public RequestResult findUserByUserName(String userName){
return RequestResult.success(userService.findUserByUserName(userName));
public RequestResult findUserByUserName(String userName, Integer current, Integer size){
return RequestResult.success(userService.findUserByUserName(userName, current, size));
}
@RequestMapping("insertUser")

5
04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/UserMapper.java

@ -14,11 +14,8 @@ public interface UserMapper extends BaseMapper<User> {
@SelectProvider(type = UserMapperProvider.class, method = "userLogin")
User userLogin(String userAccountNumber, String userPassword);
@SelectProvider(type = UserMapperProvider.class, method = "findUserByUserAccountNumber")
List<User> findUserByUserAccountNumber(String userAccountNumber);
@SelectProvider(type = UserMapperProvider.class, method = "findUserByUserName")
User findUserByUserName(String userName);
List<User> findUserByUserName(String userName);
@SelectProvider(type = UserMapperProvider.class, method = "findUserCount")
Integer findUserCount();

6
04.系统编码/Backend/src/main/java/com/userinformation/backend/mapper/provider/UserMapperProvider.java

@ -6,12 +6,8 @@ public class UserMapperProvider {
return "select * from user where user_account_number = #{userAccountNumber} and user_password = #{userPassword}";
}
public String findUserByUserAccountNumber(String userAccountNumber){
return "select * from user where user_name like '%" + userAccountNumber.trim() + "%' limit 10";
}
public String findUserByUserName(String userName){
return "select * from user where user_name like CONCAT('%',#{userName},'%')";
return "select * from user where user_name like '%" + userName.trim() + "%'";
}
public String findUserCount(){

13
04.系统编码/Backend/src/main/java/com/userinformation/backend/model/dao/UserPage.java

@ -0,0 +1,13 @@
package com.userinformation.backend.model.dao;
import lombok.Data;
import java.util.List;
@Data
public class UserPage {
private Long current;
private Long size;
private Long total;
private List<User> records;
}

33
04.系统编码/Backend/src/main/java/com/userinformation/backend/service/UserService.java

@ -6,27 +6,50 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.userinformation.backend.mapper.UserMapper;
import com.userinformation.backend.model.dao.User;
import com.userinformation.backend.model.dao.UserPage;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Service
public class UserService extends ServiceImpl<UserMapper, User> {
public User userLogin(String userAccountNumber, String userPassword){return baseMapper.userLogin(userAccountNumber, userPassword);}
public List<User> findUserByUserAccountNumber(String userAccountNumber){return baseMapper.findUserByUserAccountNumber(userAccountNumber);}
public User findUserByUserAccountNumber(String userAccountNumber){return baseMapper.selectById(userAccountNumber);}
public User findUserByUserName(String userName){
return baseMapper.findUserByUserName(userName);
public UserPage findUserByUserName(String userName, Integer current, Integer size){
IPage<User> page = new Page<>(current, size);
IPage<User> users;
if (Objects.nonNull(userName) && !"".equals(userName)){
users = baseMapper.selectPage(page, new QueryWrapper<User>().like("user_name",userName));
}else {
users = baseMapper.selectPage(page, new QueryWrapper<User>().orderByDesc("user_registration_date"));
}
UserPage userPage = new UserPage();
userPage.setCurrent(users.getCurrent());
userPage.setSize(users.getSize());
userPage.setTotal(users.getTotal());
userPage.setRecords(users.getRecords());
return userPage;
}
public Integer findUserCount(){ return baseMapper.findUserCount(); }
public List<User> findAllUserPage(Integer current, Integer size){
public UserPage findAllUserPage(Integer current, Integer size){
IPage<User> page = new Page<>(current, size);
return baseMapper.selectPage(page, new QueryWrapper<User>().orderByDesc("user_registration_date")).getRecords();
IPage<User> users = baseMapper.selectPage(page, new QueryWrapper<User>().orderByDesc("user_registration_date"));
UserPage userPage = new UserPage();
userPage.setCurrent(users.getCurrent());
userPage.setSize(users.getSize());
userPage.setTotal(users.getTotal());
userPage.setRecords(users.getRecords());
return userPage;
}
public int insertUser(User user){

5
04.系统编码/Frontend/.idea/workspace.xml

@ -3,8 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="4b7d7b72-f5b8-41e4-85d5-6267bdc12fc5" name="默认变更列表" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Login.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/SystemManagement.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/SystemManagement.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/uilts/axios.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/uilts/axios.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -77,6 +77,9 @@
<workItem from="1638433091413" duration="7649000" />
<workItem from="1638440893221" duration="943000" />
<workItem from="1638441956659" duration="5371000" />
<workItem from="1638447904778" duration="262000" />
<workItem from="1638496246090" duration="1527000" />
<workItem from="1638497917929" duration="1734000" />
</task>
<task id="LOCAL-00001" summary="2021 12 01">
<created>1638357539757</created>

3734
04.系统编码/Frontend/package-lock.json

File diff suppressed because it is too large

8
04.系统编码/Frontend/src/components/Login.vue

@ -79,7 +79,6 @@ export default {
<style lang="less" scoped>
.loginInput {
width: 6.51rem;
opacity: 1;
border-radius: 10px;
position: absolute;
left: 50%;
@ -93,7 +92,6 @@ export default {
z-index: 10;
background: #FFFFFF;
border-radius: 50%;
opacity: 1;
display: flex;
justify-content: center;
}
@ -101,8 +99,6 @@ export default {
.importInput {
margin-top: -1.2rem;
background: #FFFFFF;
border: 1px solid #707070;
opacity: 1;
border-radius: 0.10rem;
display: flex;
flex-wrap: wrap;
@ -118,7 +114,6 @@ export default {
line-height: 0.4rem;
color: #222222;
text-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
opacity: 1;
margin-top: 1.20rem;
margin-bottom: 0.52rem;
padding-left: 0.12rem;
@ -128,7 +123,6 @@ export default {
height: 0.69rem;
background: #FFFFFF;
border: 1px solid #BCBCBC;
opacity: 1;
margin-bottom: 0.7rem;
.el-input__inner{
@ -145,7 +139,7 @@ export default {
img {
width: 0.18rem;
height: 0.1792rem;
height: 0.18rem;
position: absolute;
top: -0.10rem;
left: 0.18rem;

46
04.系统编码/Frontend/src/components/SystemManagement.vue

@ -44,7 +44,6 @@
<el-pagination background
layout="prev, pager, next"
:total="total"
page-size="2"
@prev-click="prev"
@next-click="next"
@current-change="changEnum">
@ -53,7 +52,7 @@
</div>
</div>
<!--弹出框--->
<el-dialog v-model="dialogFormVisible" :title="title" show-close=false center=true width="961px" top="17%">
<el-dialog v-model="dialogFormVisible" :title="title" center=true width="900px" top="17%">
<el-form :model="form">
<el-form-item label="用户账号:" :label-width="formLabelWidth" >
<el-input v-model="form.userAccountNumber" autocomplete="off" style="width: 260px" :disabled="isDisabled"></el-input>
@ -85,7 +84,7 @@
<script lang="ts">
import {reactive, toRefs ,ref , onMounted} from 'vue';
import {onMounted, reactive, toRefs} from 'vue';
import { post } from "../uilts/axios";
import { ElMessage } from 'element-plus'
import { format } from '../uilts/String';
@ -98,7 +97,7 @@ export default {
isDisabled:false,
title:'',
formLabelWidth:"100px",
total: "",
total:null,
current:1,
size:10,
form:{
@ -110,21 +109,22 @@ export default {
},
tableData:[]
})
const findAllUser= ()=>{
return post("user/findAllUser",{
onMounted(() => {
findAllUser();
})
const findAllUser = ()=>{
return post("user/findUserByUserName",{
userName: option.state1.trim(),
current:option.current,
size:option.size
}).then((res:any)=>{
option.tableData=res.data
option.tableData= res.data.records;
option.total = res.data.total;
})
}
post('user/findUserCount',{
}).then((res :any)=>{
option.total=res.data
findAllUser()
})
//
const onAddClick = ()=> {
option.isDisabled=false
@ -171,11 +171,13 @@ export default {
//
const onSearch = ()=> {
post("user/findUserByUserAccountNumber",{
post("user/findUserByUserName",{
current: option.current,
size: option.size,
userName: option.state1
}).then((res:any)=>{
option.tableData=[]
option.tableData = option.tableData.concat(res.data)
}).then((res:any) => {
option.tableData= res.data.records;
option.total = res.data.total;
console.log(res)
})
}
@ -190,8 +192,8 @@ export default {
findAllUser()
}
const changEnum =(e)=>{
option.current= e
const changEnum = (e)=> {
option.current = e;
findAllUser()
}
@ -206,16 +208,12 @@ export default {
if (option.form.userName == null || option.form.userName.trim() == ""){
errors.push("用户姓名");
}
// if (option.form.userPhone == null || option.form.userPhone.trim() == ""){
// errors.push("");
// }
if (errors.length > 0){
ElMessage.error({
message: format("{0}不能为空", errors.join(", ")),
type: 'error'
});
}
return errors.length > 0;
}
@ -304,6 +302,7 @@ export default {
height: 35px;
line-height: 35px;
font-size: 20px;
text-indent: 10px;
}
h1{
@ -390,3 +389,4 @@ export default {
color: #498DF0;
}
</style>

2
04.系统编码/Frontend/src/uilts/axios.ts

@ -5,7 +5,7 @@ import { ElLoading } from 'element-plus'
let loading = null;
const service = axios.create({
baseURL:"http://112.124.40.88:8002",
baseURL:"http://localhost:8001",
timeout: 500000
})

Loading…
Cancel
Save