Merge branch 'master' of http://112.124.40.88:5510/root/NanJingLamanRadarProject

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")

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();

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(){

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;
+}

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

@@ -6,27 +6,43 @@ 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;
 
 @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 = baseMapper.selectPage(page, new QueryWrapper<User>().like("user_name",userName));
+        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){

04.系统编码/Frontend/src/components/DecisionSupport.vue

@@ -62,7 +62,7 @@
 <script lang="ts">
     import { onMounted, reactive, toRefs } from 'vue';
     import * as Tiff from 'browser-tiff.js';
-    import { DecisionSupportConfig } from '../hooks/Config';
+    import { DecisionSupportConfig } from '../uilts/Config';
     
     export default {
         name: 'DecisionSupport',

04.系统编码/Frontend/src/components/MicrowaveRadiation.vue

@@ -101,7 +101,7 @@
 <script lang="ts">
     import { onMounted, reactive, toRefs } from 'vue';
     import moment from "moment";
-    import { MicrowaveRadiationConfig } from '../hooks/Config';
+    import { MicrowaveRadiationConfig } from '../uilts/Config';
     
     export default {
         name: 'MicrowaveRadiation',

04.系统编码/Frontend/src/components/RamanLidar.vue

@@ -82,7 +82,7 @@
 <script lang="ts">
     import { onMounted, reactive, toRefs } from 'vue';
     import moment from "moment";
-    import { RamanLidarConfig } from '../hooks/Config';
+    import { RamanLidarConfig } from '../uilts/Config';
     
     export default {
         name: 'RamanLidar',

04.系统编码/Frontend/src/components/SynergyEvaluation.vue

@@ -128,9 +128,9 @@
 
 <script lang="ts">
     import { onMounted, reactive, toRefs } from 'vue';
-    import { format } from '../hooks/String';
+    import { format } from '../uilts/String';
     import * as Tiff from 'browser-tiff.js';
-    import { SynergyEvaluationConfig } from '../hooks/Config';
+    import { SynergyEvaluationConfig } from '../uilts/Config';
     
     export default {
         name: 'SynergyEvaluation',

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

@@ -88,7 +88,7 @@
 import { reactive, toRefs } from 'vue';
 import { post } from "../uilts/axios";
 import { ElMessage } from 'element-plus'
-import { format } from '../hooks/String';
+import { format } from '../uilts/String';
 export default {
         name: 'SystemManagement',
         setup() {

04.系统编码/Frontend/src/hooks/Config.ts → 04.系统编码/Frontend/src/uilts/Config.ts

@@ -1,5 +1,5 @@
 import { Moment } from "moment";
-import { format } from "./String";
+import { format } from "../uilts/String";
 
 export class Config {
     public static parentUrl: string = "http://112.124.40.88:8890/product/picture";

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

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