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

# Conflicts:
#	04.系统编码/Frontend/package.json

04.系统编码/Backend/src/main/java/com/userinformation/backend/config/CorsConfig.java

@@ -0,0 +1,17 @@
+package com.userinformation.backend.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        WebMvcConfigurer.super.addCorsMappings(registry);
+        registry.addMapping("/**")
+                .allowedHeaders("*")
+                .allowedOrigins("*")
+                .allowedMethods("POST", "GET", "OPTIONS");
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.userinformation.backend.controller;
 
+import com.alibaba.druid.util.StringUtils;
 import com.userinformation.backend.model.dao.User;
 import com.userinformation.backend.service.UserService;
 import com.userinformation.backend.util.RequestResult;
@@ -7,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 @RestController
 @RequestMapping("user")
 public class UserController {
@@ -16,9 +19,18 @@ public class UserController {
 
     @RequestMapping("userLogin")
     public RequestResult userLogin(String userAccountNumber, String userPassword){
+        User user = userService.userLogin(userAccountNumber, userPassword);
+        if(user == null){
+            return RequestResult.fail("用户名或密码错误");
+        }
         return RequestResult.success(userService.userLogin(userAccountNumber, userPassword));
     }
 
+    @RequestMapping("findUserCount")
+    public RequestResult findUserCount(){
+        return RequestResult.success(userService.findUserCount());
+    }
+
     @RequestMapping("findAllUser")
     public RequestResult findAllUserPage(Integer current, Integer size){
         return RequestResult.success(userService.findAllUserPage(current, size));

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

@@ -19,4 +19,6 @@ public interface UserMapper extends BaseMapper<User> {
     @SelectProvider(type = UserMapperProvider.class, method = "findUserByUserName")
     User findUserByUserName(String userName);
 
+    @SelectProvider(type = UserMapperProvider.class, method = "findUserCount")
+    Integer findUserCount();
    }

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

@@ -14,4 +14,7 @@ public class UserMapperProvider {
         return "select * from user where user_name like CONCAT('%',#{userName},'%')";
     }
 
+    public String findUserCount(){
+        return "select count(1) from user";
+    }
 }

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

@@ -20,6 +20,8 @@ public class UserService extends ServiceImpl<UserMapper, User> {
         return baseMapper.findUserByUserName(userName);
     }
 
+    public Integer findUserCount(){ return baseMapper.findUserCount(); }
+
     public List<User> findAllUserPage(Integer current, Integer size){
         IPage<User> page = new Page<>(current, size);
         return baseMapper.selectPage(page, null).getRecords();

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

@@ -2,8 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="4b7d7b72-f5b8-41e4-85d5-6267bdc12fc5" name="默认变更列表" comment="">
-      <change afterPath="$PROJECT_DIR$/src/uilts/string.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" 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/uilts/axios.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/uilts/axios.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/uilts/string.ts" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -20,9 +24,6 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
   </component>
-  <component name="ProblemsViewState">
-    <option name="selectedIndex" value="3" />
-  </component>
   <component name="ProjectId" id="21a5rRZhTS1K7V7ken7d20h7EC3" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
@@ -69,6 +70,8 @@
       <workItem from="1638357465282" duration="311000" />
       <workItem from="1638357939110" duration="359000" />
       <workItem from="1638358323504" duration="523000" />
+      <workItem from="1638407060517" duration="348000" />
+      <workItem from="1638407479402" duration="5596000" />
     </task>
     <task id="LOCAL-00001" summary="2021 12 01">
       <created>1638357539757</created>

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

@@ -613,11 +613,11 @@
       "dev": true
     },
     "axios": {
-      "version": "0.24.0",
+      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "requires": {
-        "follow-redirects": "^1.14.4"
+        "follow-redirects": "^1.14.0"
       }
     },
     "balanced-match": {
@@ -726,6 +726,15 @@
         "ylru": "^1.2.0"
       }
     },
+    "call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      }
+    },
     "chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz",
@@ -1143,8 +1152,17 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz",
-      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0="
-      "dev": true
+    },
+    "get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "requires": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      }
     },
     "get-stream": {
       "version": "5.2.0",
@@ -1202,7 +1220,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz",
       "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -1216,8 +1233,7 @@
     "has-symbols": {
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.2.tgz?cache=0&sync_timestamp=1614443681706&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.2.tgz",
-      "integrity": "sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM=",
+      "integrity": "sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM="
-      "dev": true
     },
     "has-tostringtag": {
       "version": "1.0.0",
@@ -1890,6 +1906,11 @@
         "path-key": "^3.0.0"
       }
     },
+    "object-inspect": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz",
@@ -2153,6 +2174,14 @@
       "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
       "dev": true
     },
+    "qs": {
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
+    },
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.nlark.com/queue-microtask/download/queue-microtask-1.2.3.tgz",
@@ -2451,6 +2480,16 @@
       "integrity": "sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI=",
       "dev": true
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.6",
       "resolved": "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsignal-exit%2Fdownload%2Fsignal-exit-3.0.6.tgz",

04.系统编码/Frontend/package.json

@@ -6,10 +6,11 @@
     "build": "vite build"
   },
   "dependencies": {
-    "axios": "^0.24.0",
+    "axios": "^0.21.4",
     "browser-tiff.js": "^1.0.1",
     "element-plus": "^1.2.0-beta.4",
     "moment": "^2.29.1",
+    "qs": "^6.10.1",
     "typescript": "^4.5.2",
     "vue": "^3.0.4",
     "vue-router": "^4.0.12"

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

@@ -22,8 +22,10 @@
 
 <script lang="ts">
 import {reactive, toRefs} from "vue";
-import { ElMessageBox } from 'element-plus'
+import { setStaff } from "../uilts/storage";
+import { post } from "./../uilts/axios";
 import { useRouter } from "vue-router"
+import { ElMessage } from 'element-plus'
 export default {
   name: 'Login',
   setup() {
@@ -33,20 +35,53 @@ export default {
       centerDialogVisible:false
     })
     const router = useRouter()
+
     const onLoginClick = () => {
-      if(option.inputName=="xuhuihui" && option.inputPassword=="12345678" ){
+      post('user/userLogin',{
-        router.push({
+        userAccountNumber: option.inputName,
-          path: "MicrowaveRadiation",
+        userPassword: option.inputPassword
-          query:{
+      }).then((res:any)=>{
+        console.log(res)
+      })
 
-          }
+      // const errors = staffValidate();
-        })
+      // if (errors.length > 0) {
-      }else {
+      //   ElMessage.warning({
-        ElMessageBox.alert('请正确填写信息', '提示', {
+      //     message: '请输入' + errors.join('、'),
-          confirmButtonText: '确认',
+      //     type: 'warning'
-        })
+      //   })
-      }
+      // } else {
+      //   post('/user/userLogin', {
+      //     userAccountNumber: option.inputName,
+      //     userPassword: option.inputPassword,
+      //   }).then((res: any) => {
+      //     if (res.error == 1) {
+      //       ElMessage.error({
+      //         message: res.message,
+      //         type: 'error'
+      //       });
+      //     } else {
+      //       // setStaff('login_staff', res.data);
+      //       // console.log(res.data)
+      //       router.push({
+      //         path: '/SystemManagement'
+      //       });
+      //     }
+      //   });
+      // }
     }
+    // const staffValidate = ()=> {
+    //   const errors = [];
+    //   if (staff.loginName == null || staff.loginName.trim().length == 0)
+    //     errors.push('登录名');
+    //
+    //   if (staff.loginPassword == null || staff.loginPassword.trim().length == 0)
+    //     errors.push('登录密码');
+    //
+    //   return errors;
+    // }
+
+
     return {
       ...toRefs(option),
       onLoginClick

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

@@ -1,17 +1,13 @@
 import * as qs from "qs"
 import axios from "axios"
-import { format } from './string'
+import { ElLoading } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { MessageType } from "element-plus/lib/el-message/src/types";
 
 let loading = null;
 const service = axios.create({
-    baseURL: 'http://localhost:3000',
+    baseURL: 'http://localhost:8001',
-    // baseURL: '',
-    // baseURL: 'http://192.168.30.84:8999',
     timeout: 500000
 })
-let count = 0
+
 service.interceptors.request.use(config => {
     loading = ElLoading.service({
         customClass: 'loading',
@@ -45,36 +41,12 @@ export function post(url: any, params = {}, contentType = "application/x-www-for
     })
 }
 
-export function get(regionId, file, params = {}, baseUrl = '') {
+export function get(url, params = {}, baseUrl = '') {
     return new Promise((resolve, reject) => {
-        let url = getJsonFile(regionId, file);
         service({ url, baseURL: baseUrl, method: 'get', params: params }).then(response => {
             resolve(response);
         }).catch(error => {
             reject(error);
         })
     })
-}
-
-function getJsonFile(regionId, name) {
-    let pattern = 'json/{0}/{1}';
-    return format(pattern, regionId, name);
-}
-
-export function showMessageBox(message: string, title: string = "错误", type: MessageType = "error") {
-    ElMessage({
-        message: message,
-        center: true,
-        duration: 2000,
-        customClass: 'message-text',
-    })
-}
-
-export function showNoDataMessage() {
-    ElMessage({
-        message: '暂无数据',
-        center: true,
-        duration: 2000,
-        customClass: 'message-text',
-    })
 }

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

@@ -0,0 +1,19 @@
+import router from "../router";
+
+export function setStaff(key: any, staff: any) {
+    localStorage.setItem(key, JSON.stringify(staff));
+}
+
+export function getStaff(key: any) {
+    let data = localStorage.getItem(key);
+    if(data !== null) {
+        return JSON.parse(data);
+    } else {
+        router.push({path: '/Login'});
+    }
+    return null;
+}
+
+export function clear() {
+    localStorage.clear();
+}

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

@@ -1,3 +0,0 @@
-export function format() {
-
-}