Browse Source

add:根据微校推送信息自动更改信息
update:修复热水,冷水,电的缺少token问题

liu 3 years ago
parent
commit
8bdae939b8
60 changed files with 877 additions and 223 deletions
  1. 35 23
      pom.xml
  2. 0 9
      src/main/java/com/chuanghai/student_portrait/controller/AirConditioningController.java
  3. 0 2
      src/main/java/com/chuanghai/student_portrait/controller/CountController.java
  4. 0 6
      src/main/java/com/chuanghai/student_portrait/controller/DormController.java
  5. 0 5
      src/main/java/com/chuanghai/student_portrait/controller/FaceDiscernController.java
  6. 23 31
      src/main/java/com/chuanghai/student_portrait/controller/GetSchoolUserController.java
  7. 1 1
      src/main/java/com/chuanghai/student_portrait/controller/HotWaterController.java
  8. 0 3
      src/main/java/com/chuanghai/student_portrait/controller/LoginController.java
  9. 0 18
      src/main/java/com/chuanghai/student_portrait/controller/NewSchooluserController.java
  10. 255 0
      src/main/java/com/chuanghai/student_portrait/controller/ReceiveController.java
  11. 22 0
      src/main/java/com/chuanghai/student_portrait/controller/StructOfPeopleInSchoolController.java
  12. 12 0
      src/main/java/com/chuanghai/student_portrait/entity/CollegesInfo.java
  13. 0 1
      src/main/java/com/chuanghai/student_portrait/entity/Consume.java
  14. 0 2
      src/main/java/com/chuanghai/student_portrait/entity/Electricity.java
  15. 19 0
      src/main/java/com/chuanghai/student_portrait/entity/EventOrg.java
  16. 42 0
      src/main/java/com/chuanghai/student_portrait/entity/EventUser.java
  17. 0 3
      src/main/java/com/chuanghai/student_portrait/entity/ForeWarningEntity.java
  18. 0 1
      src/main/java/com/chuanghai/student_portrait/entity/LoginUser.java
  19. 0 1
      src/main/java/com/chuanghai/student_portrait/entity/NewSchooluser.java
  20. 0 1
      src/main/java/com/chuanghai/student_portrait/entity/OldSchooluser.java
  21. 13 0
      src/main/java/com/chuanghai/student_portrait/entity/StructOfPeopleInSchool.java
  22. 0 1
      src/main/java/com/chuanghai/student_portrait/entity/dto/AccessCountDto.java
  23. 0 1
      src/main/java/com/chuanghai/student_portrait/entity/dto/EnergyDto.java
  24. 9 0
      src/main/java/com/chuanghai/student_portrait/mapper/CollegesInfoMapper.java
  25. 0 5
      src/main/java/com/chuanghai/student_portrait/mapper/ConsumeMapper.java
  26. 0 1
      src/main/java/com/chuanghai/student_portrait/mapper/FaceDiscernMapper.java
  27. 1 1
      src/main/java/com/chuanghai/student_portrait/mapper/FaceDiscernMapper.xml
  28. 0 1
      src/main/java/com/chuanghai/student_portrait/mapper/LoginMapper.java
  29. 9 0
      src/main/java/com/chuanghai/student_portrait/mapper/StructOfPeopleInSchoolMapper.java
  30. 7 0
      src/main/java/com/chuanghai/student_portrait/service/CollegesInfoService.java
  31. 0 2
      src/main/java/com/chuanghai/student_portrait/service/ElectricityService.java
  32. 0 1
      src/main/java/com/chuanghai/student_portrait/service/FaceDiscernService.java
  33. 0 4
      src/main/java/com/chuanghai/student_portrait/service/ForewarningService.java
  34. 2 0
      src/main/java/com/chuanghai/student_portrait/service/HotWaterService.java
  35. 0 2
      src/main/java/com/chuanghai/student_portrait/service/LoginService.java
  36. 3 0
      src/main/java/com/chuanghai/student_portrait/service/OldSchooluserService.java
  37. 8 0
      src/main/java/com/chuanghai/student_portrait/service/StructOfPeopleInSchoolService.java
  38. 0 1
      src/main/java/com/chuanghai/student_portrait/service/impl/AccessServiceImpl.java
  39. 0 1
      src/main/java/com/chuanghai/student_portrait/service/impl/AffinityScoreServiceImpl.java
  40. 0 3
      src/main/java/com/chuanghai/student_portrait/service/impl/CapacityServiceImpl.java
  41. 4 1
      src/main/java/com/chuanghai/student_portrait/service/impl/ColdWaterServiceImpl.java
  42. 13 0
      src/main/java/com/chuanghai/student_portrait/service/impl/CollegesInfoServiceImpl.java
  43. 0 4
      src/main/java/com/chuanghai/student_portrait/service/impl/ConsumeServicelmpl.java
  44. 0 3
      src/main/java/com/chuanghai/student_portrait/service/impl/DormServiceImpl.java
  45. 5 12
      src/main/java/com/chuanghai/student_portrait/service/impl/ElectricityServiceImpl.java
  46. 14 14
      src/main/java/com/chuanghai/student_portrait/service/impl/FaceDiscernServiceImpl.java
  47. 0 5
      src/main/java/com/chuanghai/student_portrait/service/impl/ForewarningServiceImpl.java
  48. 34 4
      src/main/java/com/chuanghai/student_portrait/service/impl/HotWaterServiceImpl.java
  49. 7 16
      src/main/java/com/chuanghai/student_portrait/service/impl/LoginServiceImpl.java
  50. 2 2
      src/main/java/com/chuanghai/student_portrait/service/impl/NewSchooluserServiceImpl.java
  51. 66 3
      src/main/java/com/chuanghai/student_portrait/service/impl/OldSchooluserServiceImpl.java
  52. 20 0
      src/main/java/com/chuanghai/student_portrait/service/impl/StructOfPeopleInSchoolServiceImpl.java
  53. 102 0
      src/main/java/com/chuanghai/student_portrait/utils/AES.java
  54. 62 13
      src/main/java/com/chuanghai/student_portrait/utils/JWTUtils.java
  55. 30 7
      src/main/resources/application.yml
  56. 30 7
      target/classes/application.yml
  57. 1 1
      target/maven-archiver/pom.properties
  58. 13 0
      target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  59. 13 0
      target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  60. BIN
      target/student_portrait-0.0.1-SNAPSHOT.jar.original

+ 35 - 23
pom.xml

@@ -23,6 +23,16 @@
             <version>3.3.0</version>
             <version>3.3.0</version>
         </dependency>
         </dependency>
 
 
+
+        <!-- 多数据源 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.6.0</version>
+        </dependency>
+
+
+
         <!--redis的起步依赖-->
         <!--redis的起步依赖-->
         <dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <groupId>org.springframework.boot</groupId>
@@ -119,8 +129,6 @@
         </dependency>
         </dependency>
 
 
 
 
-
-
         <!--  用于执行python脚本-->
         <!--  用于执行python脚本-->
         <dependency>
         <dependency>
             <groupId>org.python</groupId>
             <groupId>org.python</groupId>
@@ -157,7 +165,7 @@
             <version>4.5.13</version>
             <version>4.5.13</version>
         </dependency>
         </dependency>
 
 
-<!--    log4j-->
+        <!--    log4j-->
         <dependency>
         <dependency>
             <groupId>log4j</groupId>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <artifactId>log4j</artifactId>
@@ -194,6 +202,11 @@
             <artifactId>java-jwt</artifactId>
             <artifactId>java-jwt</artifactId>
             <version>3.10.0</version>
             <version>3.10.0</version>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
 
 
 
 
     </dependencies>
     </dependencies>
@@ -211,7 +224,6 @@
     </dependencyManagement>
     </dependencyManagement>
 
 
 
 
-
     <build>
     <build>
         <plugins>
         <plugins>
             <plugin>
             <plugin>
@@ -242,25 +254,25 @@
             </plugin>
             </plugin>
         </plugins>
         </plugins>
 
 
-<!--        &lt;!&ndash; 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 &ndash;&gt;-->
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/java</directory>-->
-<!--                <includes>-->
-<!--                    <include>**/*.properties</include>-->
-<!--                    <include>**/*.xml</include>-->
-<!--                </includes>-->
-<!--                <filtering>false</filtering>-->
-<!--            </resource>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <includes>-->
-<!--                    <include>**/*.properties</include>-->
-<!--                    <include>**/*.xml</include>-->
-<!--                </includes>-->
-<!--                <filtering>false</filtering>-->
-<!--            </resource>-->
-<!--        </resources>-->
+        <!--        &lt;!&ndash; 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 &ndash;&gt;-->
+        <!--        <resources>-->
+        <!--            <resource>-->
+        <!--                <directory>src/main/java</directory>-->
+        <!--                <includes>-->
+        <!--                    <include>**/*.properties</include>-->
+        <!--                    <include>**/*.xml</include>-->
+        <!--                </includes>-->
+        <!--                <filtering>false</filtering>-->
+        <!--            </resource>-->
+        <!--            <resource>-->
+        <!--                <directory>src/main/resources</directory>-->
+        <!--                <includes>-->
+        <!--                    <include>**/*.properties</include>-->
+        <!--                    <include>**/*.xml</include>-->
+        <!--                </includes>-->
+        <!--                <filtering>false</filtering>-->
+        <!--            </resource>-->
+        <!--        </resources>-->
 
 
 
 
     </build>
     </build>

+ 0 - 9
src/main/java/com/chuanghai/student_portrait/controller/AirConditioningController.java

@@ -1,19 +1,10 @@
 package com.chuanghai.student_portrait.controller;
 package com.chuanghai.student_portrait.controller;
 
 
-import com.chuanghai.student_portrait.entity.AirConditioning;
-import com.chuanghai.student_portrait.response.BaseResponse;
-import com.chuanghai.student_portrait.response.enums.StatusEnum;
 import com.chuanghai.student_portrait.service.AirConditioningService;
 import com.chuanghai.student_portrait.service.AirConditioningService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
 /**
  * @Author:liu
  * @Author:liu
  * @Date: 2022/9/20  10:41
  * @Date: 2022/9/20  10:41

+ 0 - 2
src/main/java/com/chuanghai/student_portrait/controller/CountController.java

@@ -1,8 +1,6 @@
 package com.chuanghai.student_portrait.controller;
 package com.chuanghai.student_portrait.controller;
 
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.chuanghai.student_portrait.entity.City;
 import com.chuanghai.student_portrait.entity.City;

+ 0 - 6
src/main/java/com/chuanghai/student_portrait/controller/DormController.java

@@ -1,16 +1,10 @@
 package com.chuanghai.student_portrait.controller;
 package com.chuanghai.student_portrait.controller;
 
 
-import com.chuanghai.student_portrait.entity.Dorm;
 import com.chuanghai.student_portrait.service.DormService;
 import com.chuanghai.student_portrait.service.DormService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-import java.util.List;
-
 /**
 /**
  * @Author:liu
  * @Author:liu
  * @Date: 2022/9/21  15:44
  * @Date: 2022/9/21  15:44

+ 0 - 5
src/main/java/com/chuanghai/student_portrait/controller/FaceDiscernController.java

@@ -1,18 +1,13 @@
 package com.chuanghai.student_portrait.controller;
 package com.chuanghai.student_portrait.controller;
 
 
-import com.chuanghai.student_portrait.entity.dto.FaceDisernDto;
 import com.chuanghai.student_portrait.response.BaseResponse;
 import com.chuanghai.student_portrait.response.BaseResponse;
 import com.chuanghai.student_portrait.service.FaceDiscernService;
 import com.chuanghai.student_portrait.service.FaceDiscernService;
-import com.chuanghai.student_portrait.utils.ReturnValueUtil;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-import java.util.List;
-
 /**
 /**
  * @Author:liu
  * @Author:liu
  * @Date: 2022/9/28  17:33
  * @Date: 2022/9/28  17:33

+ 23 - 31
src/main/java/com/chuanghai/student_portrait/controller/GetSchoolUserController.java

@@ -3,17 +3,11 @@ package com.chuanghai.student_portrait.controller;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.chuanghai.student_portrait.entity.FaceDiscern;
 import com.chuanghai.student_portrait.entity.OldSchooluser;
 import com.chuanghai.student_portrait.entity.OldSchooluser;
 import com.chuanghai.student_portrait.service.FaceDiscernService;
 import com.chuanghai.student_portrait.service.FaceDiscernService;
 import com.chuanghai.student_portrait.service.OldSchooluserService;
 import com.chuanghai.student_portrait.service.OldSchooluserService;
-import com.chuanghai.student_portrait.utils.Base64Utils;
-import com.chuanghai.student_portrait.utils.FileUtil;
 import com.chuanghai.student_portrait.utils.LogUtils;
 import com.chuanghai.student_portrait.utils.LogUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -27,9 +21,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
 
 
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
 
 
 /**
 /**
@@ -102,27 +93,27 @@ public class GetSchoolUserController {
         return cardNumber;
         return cardNumber;
     }
     }
 
 
-    //获取组织架构
-//    @GetMapping("/get")
-//    public Map get() {
-//        String token = this.token();
-//        System.out.println("token = " + token);
-//        String url = "https://open.wecard.qq.com/cgi-bin/user/org-edu-list";
-//        Map<String, String> param = new HashMap<>();
-//        param.put("access_token", token);
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.setContentType(MediaType.APPLICATION_JSON);
-//        HttpEntity<Map<String, String>> request = new HttpEntity<>(param, headers);
-//        ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, request, String.class);
-//        String body = responseEntity.getBody();
-//        System.out.println("body = " + body);
-//        HashMap<String, String> parse = JSON.parseObject(body, HashMap.class);
-//
-//        return parse;
-//    }
+//    获取组织架构
+    @GetMapping("/get")
+    public Map get() {
+        String token = this.token();
+        System.out.println("token = " + token);
+        String url = "https://open.wecard.qq.com/cgi-bin/user/org-edu-list";
+        Map<String, String> param = new HashMap<>();
+        param.put("access_token", token);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<Map<String, String>> request = new HttpEntity<>(param, headers);
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, request, String.class);
+        String body = responseEntity.getBody();
+        System.out.println("body = " + body);
+        HashMap<String, String> parse = JSON.parseObject(body, HashMap.class);
+
+        return parse;
+    }
 
 
     //获取组织架构成员
     //获取组织架构成员
-//    @GetMapping("/list")
+    @GetMapping("/list")
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public List<String> getMessong(Integer page) throws JsonProcessingException {
     public List<String> getMessong(Integer page) throws JsonProcessingException {
         String token = this.token();
         String token = this.token();
@@ -130,9 +121,10 @@ public class GetSchoolUserController {
         Map<String, Object> param = new HashMap<>();
         Map<String, Object> param = new HashMap<>();
         ObjectMapper mapper = new ObjectMapper();
         ObjectMapper mapper = new ObjectMapper();
         param.put("access_token", token);
         param.put("access_token", token);
-        param.put("org_id", 560291);
+        param.put("org_id", 573084);
         param.put("fetch_child", 1);
         param.put("fetch_child", 1);
-        param.put("page", page);
+//        param.put("page", page);
+        param.put("page", 2);
         param.put("page_size", 1000);
         param.put("page_size", 1000);
         HttpHeaders headers = new HttpHeaders();
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -153,7 +145,7 @@ public class GetSchoolUserController {
         return strings;
         return strings;
     }
     }
 
 
-    //    @GetMapping
+        @GetMapping
     public Boolean a(Integer page) throws JsonProcessingException {
     public Boolean a(Integer page) throws JsonProcessingException {
         List<String> messong = this.getMessong(page);
         List<String> messong = this.getMessong(page);
         String token = this.token();
         String token = this.token();

+ 1 - 1
src/main/java/com/chuanghai/student_portrait/controller/HotWaterController.java

@@ -21,7 +21,7 @@ public class HotWaterController {
         return hotWaterService.hotWaterEnergy();
         return hotWaterService.hotWaterEnergy();
     }
     }
 
 
-    @GetMapping("person/energy")
+    @GetMapping("/person/energy")
     @ApiOperation(value = "个人热水和水电能耗,参数为该学生序号")
     @ApiOperation(value = "个人热水和水电能耗,参数为该学生序号")
     public BaseResponse personHotwaterEnergy(String id){
     public BaseResponse personHotwaterEnergy(String id){
         return hotWaterService.personHotwaterEnergy(id);
         return hotWaterService.personHotwaterEnergy(id);

+ 0 - 3
src/main/java/com/chuanghai/student_portrait/controller/LoginController.java

@@ -2,7 +2,6 @@ package com.chuanghai.student_portrait.controller;
 
 
 import com.chuanghai.student_portrait.entity.dto.UserLoginDTO;
 import com.chuanghai.student_portrait.entity.dto.UserLoginDTO;
 import com.chuanghai.student_portrait.response.BaseResponse;
 import com.chuanghai.student_portrait.response.BaseResponse;
-import com.chuanghai.student_portrait.response.enums.StatusEnum;
 import com.chuanghai.student_portrait.service.LoginService;
 import com.chuanghai.student_portrait.service.LoginService;
 import org.omg.CORBA.SystemException;
 import org.omg.CORBA.SystemException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-import javax.servlet.http.HttpServletRequest;
-
 @RestController
 @RestController
 @RequestMapping
 @RequestMapping
 public class LoginController {
 public class LoginController {

+ 0 - 18
src/main/java/com/chuanghai/student_portrait/controller/NewSchooluserController.java

@@ -1,30 +1,12 @@
 package com.chuanghai.student_portrait.controller;
 package com.chuanghai.student_portrait.controller;
 
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.chuanghai.student_portrait.entity.NewSchooluser;
-import com.chuanghai.student_portrait.entity.Student;
-import com.chuanghai.student_portrait.exception.ResultValue;
 import com.chuanghai.student_portrait.response.BaseResponse;
 import com.chuanghai.student_portrait.response.BaseResponse;
 import com.chuanghai.student_portrait.service.NewSchooluserService;
 import com.chuanghai.student_portrait.service.NewSchooluserService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
 
 
 /**
 /**
  * @Author:liu
  * @Author:liu

File diff suppressed because it is too large
+ 255 - 0
src/main/java/com/chuanghai/student_portrait/controller/ReceiveController.java


+ 22 - 0
src/main/java/com/chuanghai/student_portrait/controller/StructOfPeopleInSchoolController.java

@@ -0,0 +1,22 @@
+package com.chuanghai.student_portrait.controller;
+
+import com.chuanghai.student_portrait.entity.StructOfPeopleInSchool;
+import com.chuanghai.student_portrait.service.StructOfPeopleInSchoolService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/struct/of/people/in/school")
+public class StructOfPeopleInSchoolController {
+    @Autowired
+    StructOfPeopleInSchoolService structOfPeopleInSchoolService;
+
+    @PostMapping("/get")
+    public StructOfPeopleInSchool get(Integer id) {
+        StructOfPeopleInSchool struct = structOfPeopleInSchoolService.getId(id);
+        return struct;
+    }
+
+}

+ 12 - 0
src/main/java/com/chuanghai/student_portrait/entity/CollegesInfo.java

@@ -0,0 +1,12 @@
+package com.chuanghai.student_portrait.entity;
+
+import lombok.Data;
+
+@Data
+public class CollegesInfo {
+    private Integer id;
+    private String collegesName;
+    private String collegesAddr;
+    private String collegesDesc;
+    private Integer studentName;
+}

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/entity/Consume.java

@@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
-import lombok.ToString;
 
 
 import java.util.Date;
 import java.util.Date;
 
 

+ 0 - 2
src/main/java/com/chuanghai/student_portrait/entity/Electricity.java

@@ -2,8 +2,6 @@ package com.chuanghai.student_portrait.entity;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
-import java.util.Date;
-
 @Data
 @Data
 public class Electricity {
 public class Electricity {
     private Integer id;
     private Integer id;

+ 19 - 0
src/main/java/com/chuanghai/student_portrait/entity/EventOrg.java

@@ -0,0 +1,19 @@
+package com.chuanghai.student_portrait.entity;
+
+import lombok.Data;
+
+@Data
+public class EventOrg {
+//    "id":738777,"parent_id":560291,"name":"\u6d4b\u8bd5\u63a8\u9001","org_type":"","type":0,"province":"","city":"","area":"","updated_at":"2022-12-29 10:57:20"
+
+    private Integer id;
+    private Integer parentId;
+    private String name;
+    private String orgType;
+    private String type;
+    private String province;
+    private String city;
+    private String area;
+    private String updateAt;
+
+}

+ 42 - 0
src/main/java/com/chuanghai/student_portrait/entity/EventUser.java

@@ -0,0 +1,42 @@
+package com.chuanghai.student_portrait.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class EventUser {
+    private String cardNumber;
+    private String name;
+    private Integer gender;
+    private String headImage;
+    private Integer identityType;
+    private String grade;
+    private String campus;
+    private String dormNumber;
+    private String physicalChipNumber;
+    private String physicalCardNumber;
+    private String nation;
+    private String originPlace;
+    private String graduatedSchool;
+    private String address;
+    private String qq;
+    private String email;
+    private String cardType;
+    private String identityTitle;
+    private String college;
+    private String profession;
+    private String clazz;
+    private String idCard;
+    private String country;
+    private String telephone;
+    private String dateSource;
+    private Date startAt;
+    private Date expireAt;
+    private String jobTitle;
+    private String registerYear;
+    private String schoolPeriod;
+    private String serialNumber;
+    private String organization;
+
+}

+ 0 - 3
src/main/java/com/chuanghai/student_portrait/entity/ForeWarningEntity.java

@@ -1,9 +1,6 @@
 package com.chuanghai.student_portrait.entity;
 package com.chuanghai.student_portrait.entity;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-import java.util.Date;
 
 
 
 
 public class ForeWarningEntity {
 public class ForeWarningEntity {

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/entity/LoginUser.java

@@ -1,7 +1,6 @@
 package com.chuanghai.student_portrait.entity;
 package com.chuanghai.student_portrait.entity;
 
 
 import lombok.Data;
 import lombok.Data;
-import org.eclipse.jetty.util.security.Password;
 
 
 @Data
 @Data
 public class LoginUser {
 public class LoginUser {

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/entity/NewSchooluser.java

@@ -1,7 +1,6 @@
 package com.chuanghai.student_portrait.entity;
 package com.chuanghai.student_portrait.entity;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/entity/OldSchooluser.java

@@ -1,6 +1,5 @@
 package com.chuanghai.student_portrait.entity;
 package com.chuanghai.student_portrait.entity;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**

+ 13 - 0
src/main/java/com/chuanghai/student_portrait/entity/StructOfPeopleInSchool.java

@@ -0,0 +1,13 @@
+package com.chuanghai.student_portrait.entity;
+
+import lombok.Data;
+
+@Data
+public class StructOfPeopleInSchool {
+    private Integer id;
+    private Integer totalNum;
+    private Integer staffNum;
+    private Integer sutdentNum;
+    private Integer otherStaffNum;
+    private Integer otherNum;
+}

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/entity/dto/AccessCountDto.java

@@ -1,6 +1,5 @@
 package com.chuanghai.student_portrait.entity.dto;
 package com.chuanghai.student_portrait.entity.dto;
 
 
-import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/entity/dto/EnergyDto.java

@@ -3,7 +3,6 @@ package com.chuanghai.student_portrait.entity.dto;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
-import java.util.Date;
 
 
 @Data
 @Data
 public class EnergyDto implements Serializable {
 public class EnergyDto implements Serializable {

+ 9 - 0
src/main/java/com/chuanghai/student_portrait/mapper/CollegesInfoMapper.java

@@ -0,0 +1,9 @@
+package com.chuanghai.student_portrait.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chuanghai.student_portrait.entity.CollegesInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface CollegesInfoMapper extends BaseMapper<CollegesInfo> {
+}

+ 0 - 5
src/main/java/com/chuanghai/student_portrait/mapper/ConsumeMapper.java

@@ -2,12 +2,7 @@ package com.chuanghai.student_portrait.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chuanghai.student_portrait.entity.Consume;
 import com.chuanghai.student_portrait.entity.Consume;
-import com.chuanghai.student_portrait.entity.dto.ConsumeDto;
-import com.chuanghai.student_portrait.response.BaseResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
 
 
 /**
 /**
  * @Author:liu
  * @Author:liu

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/mapper/FaceDiscernMapper.java

@@ -6,7 +6,6 @@ import com.chuanghai.student_portrait.entity.dto.FaceDisernDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Component;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 1 - 1
src/main/java/com/chuanghai/student_portrait/mapper/FaceDiscernMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.chuanghai.student_portrait.mapper.FaceDiscernMapper">
+<mapper namespace="com.chuanghai.student_portrait.mapper.primary.FaceDiscernMapper">
 
 
 <!--    <select id="getStudentCount" resultType="com.chuanghai.student_portrait.entity.dto.FaceDisernDto">-->
 <!--    <select id="getStudentCount" resultType="com.chuanghai.student_portrait.entity.dto.FaceDisernDto">-->
 <!--        select shooluser_id as schoolUserID,COUNT(shooluser_id) as count from facediscern-->
 <!--        select shooluser_id as schoolUserID,COUNT(shooluser_id) as count from facediscern-->

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/mapper/LoginMapper.java

@@ -3,7 +3,6 @@ package com.chuanghai.student_portrait.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chuanghai.student_portrait.entity.LoginUser;
 import com.chuanghai.student_portrait.entity.LoginUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.poi.ss.formula.functions.T;
 
 
 @Mapper
 @Mapper
 public interface LoginMapper extends BaseMapper<LoginUser> {
 public interface LoginMapper extends BaseMapper<LoginUser> {

+ 9 - 0
src/main/java/com/chuanghai/student_portrait/mapper/StructOfPeopleInSchoolMapper.java

@@ -0,0 +1,9 @@
+package com.chuanghai.student_portrait.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chuanghai.student_portrait.entity.StructOfPeopleInSchool;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StructOfPeopleInSchoolMapper extends BaseMapper<StructOfPeopleInSchool> {
+}

+ 7 - 0
src/main/java/com/chuanghai/student_portrait/service/CollegesInfoService.java

@@ -0,0 +1,7 @@
+package com.chuanghai.student_portrait.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chuanghai.student_portrait.entity.CollegesInfo;
+
+public interface CollegesInfoService extends IService<CollegesInfo> {
+}

+ 0 - 2
src/main/java/com/chuanghai/student_portrait/service/ElectricityService.java

@@ -2,8 +2,6 @@ package com.chuanghai.student_portrait.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.chuanghai.student_portrait.entity.Electricity;
 import com.chuanghai.student_portrait.entity.Electricity;
-import com.chuanghai.student_portrait.exception.ResultValue;
-import com.chuanghai.student_portrait.response.BaseResponse;
 
 
 public interface ElectricityService extends IService<Electricity> {
 public interface ElectricityService extends IService<Electricity> {
 //    ResultValue getElectrucity(String dormNumber);
 //    ResultValue getElectrucity(String dormNumber);

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/service/FaceDiscernService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.chuanghai.student_portrait.entity.FaceDiscern;
 import com.chuanghai.student_portrait.entity.FaceDiscern;
 import com.chuanghai.student_portrait.entity.dto.FaceDisernDto;
 import com.chuanghai.student_portrait.entity.dto.FaceDisernDto;
 import com.chuanghai.student_portrait.response.BaseResponse;
 import com.chuanghai.student_portrait.response.BaseResponse;
-import com.chuanghai.student_portrait.utils.ReturnValueUtil;
 
 
 import java.util.List;
 import java.util.List;
 
 

+ 0 - 4
src/main/java/com/chuanghai/student_portrait/service/ForewarningService.java

@@ -1,13 +1,9 @@
 package com.chuanghai.student_portrait.service;
 package com.chuanghai.student_portrait.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.chuanghai.student_portrait.entity.FaceDiscern;
 import com.chuanghai.student_portrait.entity.Forewarning;
 import com.chuanghai.student_portrait.entity.Forewarning;
 import com.chuanghai.student_portrait.response.BaseResponse;
 import com.chuanghai.student_portrait.response.BaseResponse;
 
 
-import java.util.Date;
-import java.util.List;
-
 public interface ForewarningService extends IService<Forewarning> {
 public interface ForewarningService extends IService<Forewarning> {
 
 
 
 

+ 2 - 0
src/main/java/com/chuanghai/student_portrait/service/HotWaterService.java

@@ -9,4 +9,6 @@ public interface HotWaterService extends IService<HotWater> {
 
 
     BaseResponse personHotwaterEnergy(String id);
     BaseResponse personHotwaterEnergy(String id);
 
 
+
+
 }
 }

+ 0 - 2
src/main/java/com/chuanghai/student_portrait/service/LoginService.java

@@ -5,8 +5,6 @@ import com.chuanghai.student_portrait.entity.LoginUser;
 import com.chuanghai.student_portrait.entity.dto.UserLoginDTO;
 import com.chuanghai.student_portrait.entity.dto.UserLoginDTO;
 import com.chuanghai.student_portrait.response.BaseResponse;
 import com.chuanghai.student_portrait.response.BaseResponse;
 
 
-import javax.servlet.http.HttpServletRequest;
-
 public interface LoginService extends IService<LoginUser> {
 public interface LoginService extends IService<LoginUser> {
     BaseResponse dengru(UserLoginDTO userLoginDTO);
     BaseResponse dengru(UserLoginDTO userLoginDTO);
 }
 }

+ 3 - 0
src/main/java/com/chuanghai/student_portrait/service/OldSchooluserService.java

@@ -1,6 +1,7 @@
 package com.chuanghai.student_portrait.service;
 package com.chuanghai.student_portrait.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.chuanghai.student_portrait.entity.NewSchooluser;
 import com.chuanghai.student_portrait.entity.OldSchooluser;
 import com.chuanghai.student_portrait.entity.OldSchooluser;
 
 
 /**
 /**
@@ -11,4 +12,6 @@ import com.chuanghai.student_portrait.entity.OldSchooluser;
 public interface OldSchooluserService extends IService<OldSchooluser> {
 public interface OldSchooluserService extends IService<OldSchooluser> {
     Boolean addNewSchooluser(Integer i);
     Boolean addNewSchooluser(Integer i);
 
 
+    NewSchooluser getNewSchoolUser(OldSchooluser oldSchooluser) ;
+
 }
 }

+ 8 - 0
src/main/java/com/chuanghai/student_portrait/service/StructOfPeopleInSchoolService.java

@@ -0,0 +1,8 @@
+package com.chuanghai.student_portrait.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chuanghai.student_portrait.entity.StructOfPeopleInSchool;
+
+public interface StructOfPeopleInSchoolService extends IService<StructOfPeopleInSchool> {
+    StructOfPeopleInSchool getId(Integer id);
+}

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/service/impl/AccessServiceImpl.java

@@ -23,7 +23,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;

+ 0 - 1
src/main/java/com/chuanghai/student_portrait/service/impl/AffinityScoreServiceImpl.java

@@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

+ 0 - 3
src/main/java/com/chuanghai/student_portrait/service/impl/CapacityServiceImpl.java

@@ -1,8 +1,6 @@
 package com.chuanghai.student_portrait.service.impl;
 package com.chuanghai.student_portrait.service.impl;
 
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,7 +16,6 @@ import com.chuanghai.student_portrait.utils.JedisUtil;
 import com.chuanghai.student_portrait.utils.LogUtils;
 import com.chuanghai.student_portrait.utils.LogUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;

+ 4 - 1
src/main/java/com/chuanghai/student_portrait/service/impl/ColdWaterServiceImpl.java

@@ -38,7 +38,8 @@ public class ColdWaterServiceImpl extends ServiceImpl<ColdWaterMapper, ColdWater
     private Integer size = 8;
     private Integer size = 8;
 
 
     //    20秒钟运行一次
     //    20秒钟运行一次
-    @Scheduled(cron = "0/20 * * 1 * ? ")
+//    @Scheduled(cron = "0/20 * * 1 * ? ")
+    @Scheduled(cron = "0 0/1 * * * ? ")
     public void autoQueryOrder() {
     public void autoQueryOrder() {
         Page<Dorm> dormPage = dormService.page(new Page<Dorm>(page, size));
         Page<Dorm> dormPage = dormService.page(new Page<Dorm>(page, size));
         List<Dorm> records = dormPage.getRecords();
         List<Dorm> records = dormPage.getRecords();
@@ -64,10 +65,12 @@ public class ColdWaterServiceImpl extends ServiceImpl<ColdWaterMapper, ColdWater
 
 
 
 
     public ResultValue getColdWater(String dormNumber) {
     public ResultValue getColdWater(String dormNumber) {
+        String token="AqwxcdAxs4212pomk231qsxssaz";
         MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
         MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
         map.add("dom", dormNumber);
         map.add("dom", dormNumber);
         map.add("page", 1);
         map.add("page", 1);
         map.add("rows", 1);
         map.add("rows", 1);
+        map.add("token",token);
         RestTemplate restTemplate = new RestTemplate();
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);

+ 13 - 0
src/main/java/com/chuanghai/student_portrait/service/impl/CollegesInfoServiceImpl.java

@@ -0,0 +1,13 @@
+package com.chuanghai.student_portrait.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chuanghai.student_portrait.entity.CollegesInfo;
+import com.chuanghai.student_portrait.mapper.CollegesInfoMapper;
+import com.chuanghai.student_portrait.service.CollegesInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("mysql2")
+public class CollegesInfoServiceImpl extends ServiceImpl<CollegesInfoMapper, CollegesInfo> implements CollegesInfoService {
+}

+ 0 - 4
src/main/java/com/chuanghai/student_portrait/service/impl/ConsumeServicelmpl.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chuanghai.student_portrait.config.TokenConfig;
 import com.chuanghai.student_portrait.config.TokenConfig;
 import com.chuanghai.student_portrait.entity.*;
 import com.chuanghai.student_portrait.entity.*;
-import com.chuanghai.student_portrait.entity.dto.CapacityAllDto;
 import com.chuanghai.student_portrait.entity.dto.ConsumeDto;
 import com.chuanghai.student_portrait.entity.dto.ConsumeDto;
 import com.chuanghai.student_portrait.entity.dto.ConsumeTotalMoneyDto;
 import com.chuanghai.student_portrait.entity.dto.ConsumeTotalMoneyDto;
 import com.chuanghai.student_portrait.entity.dto.PersonConsumDto;
 import com.chuanghai.student_portrait.entity.dto.PersonConsumDto;
@@ -23,10 +22,7 @@ import com.chuanghai.student_portrait.utils.LogUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 
 
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.python.antlr.ast.If;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;

+ 0 - 3
src/main/java/com/chuanghai/student_portrait/service/impl/DormServiceImpl.java

@@ -6,14 +6,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chuanghai.student_portrait.entity.Dorm;
 import com.chuanghai.student_portrait.entity.Dorm;
 import com.chuanghai.student_portrait.mapper.DormMapper;
 import com.chuanghai.student_portrait.mapper.DormMapper;
 import com.chuanghai.student_portrait.service.DormService;
 import com.chuanghai.student_portrait.service.DormService;
-import com.chuanghai.student_portrait.utils.LogUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;

+ 5 - 12
src/main/java/com/chuanghai/student_portrait/service/impl/ElectricityServiceImpl.java

@@ -4,24 +4,19 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chuanghai.student_portrait.entity.ColdWater;
 import com.chuanghai.student_portrait.entity.Dorm;
 import com.chuanghai.student_portrait.entity.Dorm;
 import com.chuanghai.student_portrait.entity.Electricity;
 import com.chuanghai.student_portrait.entity.Electricity;
-import com.chuanghai.student_portrait.entity.HotWater;
-import com.chuanghai.student_portrait.entity.dto.EnergyDto;
 import com.chuanghai.student_portrait.exception.ResultValue;
 import com.chuanghai.student_portrait.exception.ResultValue;
 import com.chuanghai.student_portrait.mapper.ElectricityMapper;
 import com.chuanghai.student_portrait.mapper.ElectricityMapper;
-import com.chuanghai.student_portrait.response.BaseResponse;
-import com.chuanghai.student_portrait.response.enums.StatusEnum;
 import com.chuanghai.student_portrait.service.ColdWaterService;
 import com.chuanghai.student_portrait.service.ColdWaterService;
 import com.chuanghai.student_portrait.service.DormService;
 import com.chuanghai.student_portrait.service.DormService;
 import com.chuanghai.student_portrait.service.ElectricityService;
 import com.chuanghai.student_portrait.service.ElectricityService;
 import com.chuanghai.student_portrait.utils.LogUtils;
 import com.chuanghai.student_portrait.utils.LogUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.MediaType;
@@ -33,13 +28,8 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 
 
@@ -68,7 +58,8 @@ public class ElectricityServiceImpl extends ServiceImpl<ElectricityMapper, Elect
 
 
 
 
 
 
-    @Scheduled(cron = "0/20 * * 1 * ? ")
+//    @Scheduled(cron = "0/20 * * 1 * ?")
+    @Scheduled(cron = "0 0/1 * * * ? ")
     public void autoQueryOrder() {
     public void autoQueryOrder() {
         Page<Dorm> dormPage = dormService.page(new Page<Dorm>(page, size));
         Page<Dorm> dormPage = dormService.page(new Page<Dorm>(page, size));
         List<Dorm> records = dormPage.getRecords();
         List<Dorm> records = dormPage.getRecords();
@@ -94,10 +85,12 @@ public class ElectricityServiceImpl extends ServiceImpl<ElectricityMapper, Elect
 
 
 //    @Override
 //    @Override
     public ResultValue getElectrucity(String dormNumber) {
     public ResultValue getElectrucity(String dormNumber) {
+        String token="AqwxcdAxs4212pomk231qsxssaz";
         MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
         MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
         map.add("dom", dormNumber);
         map.add("dom", dormNumber);
         map.add("page", 1);
         map.add("page", 1);
         map.add("rows", 1);
         map.add("rows", 1);
+        map.add("token",token);
         RestTemplate restTemplate = new RestTemplate();
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);

+ 14 - 14
src/main/java/com/chuanghai/student_portrait/service/impl/FaceDiscernServiceImpl.java

@@ -217,13 +217,13 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
      */
      */
     @Override
     @Override
     public BaseResponse personalTrack(String id) {
     public BaseResponse personalTrack(String id) {
-        ObjectMapper objectMapper = new ObjectMapper();
-        //        redis 缓存
-        if (jedisUtil.exists("personalTrack" + id)) {
-            String address = jedisUtil.get("personalTrack" + id);
-            List<PersonalTrackDto> list = JSON.parseArray(address, PersonalTrackDto.class);
-            return BaseResponse.ok(StatusEnum.SUCCESS, list);
-        }
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        //        redis 缓存
+//        if (jedisUtil.exists("personalTrack" + id)) {
+//            String address = jedisUtil.get("personalTrack" + id);
+//            List<PersonalTrackDto> list = JSON.parseArray(address, PersonalTrackDto.class);
+//            return BaseResponse.ok(StatusEnum.SUCCESS, list);
+//        }
         if (ObjectUtils.isEmpty(id)) {
         if (ObjectUtils.isEmpty(id)) {
             return BaseResponse.error(StatusEnum.FAIL, "参数异常");
             return BaseResponse.error(StatusEnum.FAIL, "参数异常");
         }
         }
@@ -357,13 +357,13 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
         Collections.sort(personalTrackDtos, Comparator.comparing((h) -> {
         Collections.sort(personalTrackDtos, Comparator.comparing((h) -> {
             return h.getDateTime();
             return h.getDateTime();
         }));
         }));
-        String jsonStr = null;
-        try {
-            jsonStr = objectMapper.writeValueAsString(personalTrackDtos);    //areaList序列化为json字符串
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        jedisUtil.setnx("personalTrack" + id, jsonStr);
+//        String jsonStr = null;
+//        try {
+//            jsonStr = objectMapper.writeValueAsString(personalTrackDtos);    //areaList序列化为json字符串
+//        } catch (JsonProcessingException e) {
+//            e.printStackTrace();
+//        }
+//        jedisUtil.setnx("personalTrack" + id, jsonStr);
 
 
         return BaseResponse.ok(StatusEnum.SUCCESS, personalTrackDtos);
         return BaseResponse.ok(StatusEnum.SUCCESS, personalTrackDtos);
     }
     }

+ 0 - 5
src/main/java/com/chuanghai/student_portrait/service/impl/ForewarningServiceImpl.java

@@ -11,16 +11,11 @@ import com.chuanghai.student_portrait.response.enums.StatusEnum;
 import com.chuanghai.student_portrait.service.*;
 import com.chuanghai.student_portrait.service.*;
 import com.chuanghai.student_portrait.utils.DateUtils;
 import com.chuanghai.student_portrait.utils.DateUtils;
 import com.chuanghai.student_portrait.utils.LogUtils;
 import com.chuanghai.student_portrait.utils.LogUtils;
-import jdk.net.SocketFlow;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.text.ParseException;
-import java.text.ParsePosition;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
 
 

+ 34 - 4
src/main/java/com/chuanghai/student_portrait/service/impl/HotWaterServiceImpl.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chuanghai.student_portrait.entity.*;
-import com.chuanghai.student_portrait.entity.dto.AccessCountDto;
+import com.chuanghai.student_portrait.entity.ColdWater;
+import com.chuanghai.student_portrait.entity.Electricity;
+import com.chuanghai.student_portrait.entity.HotWater;
+import com.chuanghai.student_portrait.entity.NewSchooluser;
 import com.chuanghai.student_portrait.entity.dto.EnergyDto;
 import com.chuanghai.student_portrait.entity.dto.EnergyDto;
 import com.chuanghai.student_portrait.exception.ResultValue;
 import com.chuanghai.student_portrait.exception.ResultValue;
 import com.chuanghai.student_portrait.mapper.HotWaterMapper;
 import com.chuanghai.student_portrait.mapper.HotWaterMapper;
@@ -31,7 +33,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -530,6 +531,34 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
     @Value("${decisionEngine.url.waterUrl}")
     @Value("${decisionEngine.url.waterUrl}")
     private String waterUrl;
     private String waterUrl;
 
 
+
+    @Value("${decisionEngine.url.hotLogin}")
+    private String hotLogin;
+
+    /**
+     * 获取token
+     * @return
+     */
+    public String getToken(){
+        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
+//        账号
+        String userName="admin001";
+//        密码
+        String passWord="admin01";
+        map.add("number",userName);
+        map.add("password",passWord);
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        HttpEntity<MultiValueMap<String, Object>> request = new HttpEntity<>(map, headers);
+        ResponseEntity<String> response = restTemplate.postForEntity(hotLogin, request, String.class);
+        JSONObject jsonObject = JSONObject.parseObject(response.getBody());
+        String token = jsonObject.getString("access_token");
+
+        return token;
+    }
+
+
     /**
     /**
      * 用于记录当前获取热水信息的页码
      * 用于记录当前获取热水信息的页码
      */
      */
@@ -571,15 +600,16 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
      * @return
      * @return
      */
      */
     public ResultValue getWaterDetail(String today, String yestarday, Integer page, Integer rows) {
     public ResultValue getWaterDetail(String today, String yestarday, Integer page, Integer rows) {
+        String token = getToken();
         MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
         MultiValueMap<String, Object> map = new LinkedMultiValueMap<>();
         map.add("begin_time", yestarday);
         map.add("begin_time", yestarday);
         map.add("page", page);
         map.add("page", page);
         map.add("rows", rows);
         map.add("rows", rows);
         map.add("end_time", today);
         map.add("end_time", today);
+        map.add("token",token);
         RestTemplate restTemplate = new RestTemplate();
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-
         HttpEntity<MultiValueMap<String, Object>> request = new HttpEntity<>(map, headers);
         HttpEntity<MultiValueMap<String, Object>> request = new HttpEntity<>(map, headers);
         ResponseEntity<String> responseEntity = restTemplate.postForEntity(waterUrl, request, String.class);
         ResponseEntity<String> responseEntity = restTemplate.postForEntity(waterUrl, request, String.class);
         JSONObject jsonObj = JSON.parseObject(responseEntity.getBody());
         JSONObject jsonObj = JSON.parseObject(responseEntity.getBody());

+ 7 - 16
src/main/java/com/chuanghai/student_portrait/service/impl/LoginServiceImpl.java

@@ -1,8 +1,5 @@
 package com.chuanghai.student_portrait.service.impl;
 package com.chuanghai.student_portrait.service.impl;
 
 
-import com.alibaba.druid.util.Utils;
-import com.auth0.jwt.JWT;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,16 +11,7 @@ import com.chuanghai.student_portrait.response.enums.StatusEnum;
 import com.chuanghai.student_portrait.service.LoginService;
 import com.chuanghai.student_portrait.service.LoginService;
 import com.chuanghai.student_portrait.utils.JWTUtils;
 import com.chuanghai.student_portrait.utils.JWTUtils;
 import com.chuanghai.student_portrait.utils.Md5Utils;
 import com.chuanghai.student_portrait.utils.Md5Utils;
-import org.apache.tomcat.util.security.MD5Encoder;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import redis.clients.jedis.util.JedisClusterHashTagUtil;
-
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.util.HashMap;
 
 
 @Service
 @Service
 public class LoginServiceImpl extends ServiceImpl<LoginMapper, LoginUser> implements LoginService {
 public class LoginServiceImpl extends ServiceImpl<LoginMapper, LoginUser> implements LoginService {
@@ -44,10 +32,13 @@ public class LoginServiceImpl extends ServiceImpl<LoginMapper, LoginUser> implem
         if (!s1.equals(s)) {
         if (!s1.equals(s)) {
             return BaseResponse.error(StatusEnum.FAIL, "账号密码错误");
             return BaseResponse.error(StatusEnum.FAIL, "账号密码错误");
         }
         }
-        HashMap<String, String> map = new HashMap<>();
-        map.put("userName",userName);
-        map.put("passWord",s);
-        String token = JWTUtils.getToken(map);
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("userName",userName);
+//        map.put("passWord",s);
+        String token = JWTUtils.getToken(userName,s);
+
+//        Map<String, Claim> stringClaimMap = JWTUtils.verifyToken(token);
+//        System.out.println("stringClaimMap = " + stringClaimMap);
 
 
         return BaseResponse.ok(StatusEnum.SUCCESS,token,"登入成功");
         return BaseResponse.ok(StatusEnum.SUCCESS,token,"登入成功");
     }
     }

+ 2 - 2
src/main/java/com/chuanghai/student_portrait/service/impl/NewSchooluserServiceImpl.java

@@ -2,14 +2,14 @@ package com.chuanghai.student_portrait.service.impl;
 
 
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chuanghai.student_portrait.controller.GetSchoolUserController;
 import com.chuanghai.student_portrait.controller.GetSchoolUserController;
-import com.chuanghai.student_portrait.entity.*;
+import com.chuanghai.student_portrait.entity.AffinityScore;
+import com.chuanghai.student_portrait.entity.NewSchooluser;
 import com.chuanghai.student_portrait.entity.dto.CapacityDto;
 import com.chuanghai.student_portrait.entity.dto.CapacityDto;
 import com.chuanghai.student_portrait.entity.dto.FaceDisernDto;
 import com.chuanghai.student_portrait.entity.dto.FaceDisernDto;
 import com.chuanghai.student_portrait.mapper.NewSchooluserMapper;
 import com.chuanghai.student_portrait.mapper.NewSchooluserMapper;

+ 66 - 3
src/main/java/com/chuanghai/student_portrait/service/impl/OldSchooluserServiceImpl.java

@@ -9,9 +9,7 @@ import com.chuanghai.student_portrait.entity.OldSchooluser;
 import com.chuanghai.student_portrait.mapper.OldSchooluserMapper;
 import com.chuanghai.student_portrait.mapper.OldSchooluserMapper;
 import com.chuanghai.student_portrait.service.NewSchooluserService;
 import com.chuanghai.student_portrait.service.NewSchooluserService;
 import com.chuanghai.student_portrait.service.OldSchooluserService;
 import com.chuanghai.student_portrait.service.OldSchooluserService;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
@@ -33,7 +31,7 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
 
 
     Integer i = 0;
     Integer i = 0;
 
 
-//    @Scheduled(cron = "0 0/1 * * * ?")
+    //    @Scheduled(cron = "0 0/1 * * * ?")
     public void getSchoolUser() {
     public void getSchoolUser() {
         Page<OldSchooluser> page = this.page(new Page<>(i, 1000));
         Page<OldSchooluser> page = this.page(new Page<>(i, 1000));
         long pages = page.getPages();
         long pages = page.getPages();
@@ -149,6 +147,71 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
         return b;
         return b;
     }
     }
 
 
+    @Override
+    public NewSchooluser getNewSchoolUser(OldSchooluser oldSchooluser) {
+        NewSchooluser newSchooluser = new NewSchooluser();
+        String card = oldSchooluser.getIdCard();
+        String cardNumber = oldSchooluser.getCardNumber();
+        String name = oldSchooluser.getName();
+        String gender = oldSchooluser.getGender();
+        String grade = oldSchooluser.getGrade();
+        String identityType = oldSchooluser.getIdentityType();
+        String address = oldSchooluser.getAddress();
+        String organization = oldSchooluser.getOrganization();
+        String graduatedSchool = oldSchooluser.getGraduatedSchool();
+        String college = oldSchooluser.getCollege();
+        String profession = oldSchooluser.getProfession();
+        String clazz = oldSchooluser.getClazz();
+        String nation = oldSchooluser.getNation();
+//            身份证号码
+        newSchooluser.setIdCard(card);
+//电子卡号
+        newSchooluser.setCardNumber(cardNumber);
+//            学号
+        newSchooluser.setStudentId(oldSchooluser.getSerialNumber());
+//            名字
+        newSchooluser.setName(name);
+//            性别
+        newSchooluser.setGender(gender);
+//            年级
+        newSchooluser.setGrade(grade);
+//            身份类型
+        newSchooluser.setIdentityType(identityType);
+//            地址
+        newSchooluser.setAddress(address);
+//生源地
+        newSchooluser.setOriginPlace(organization);
+//            毕业学校
+        newSchooluser.setGraduatedSchool(graduatedSchool);
+//            学院
+        newSchooluser.setCollege(college);
+//            专业
+        newSchooluser.setProfession(profession);
+//            班级
+        newSchooluser.setClazz(clazz);
+//            名族
+        newSchooluser.setNation(nation);
+//            头像
+        newSchooluser.setHeadImage(oldSchooluser.getHeadImage());
+
+        if (card != null && card.length() == 18) {
+//                获取身份证前2位
+            String province = card.substring(0, 2);
+//                 获取身份证第3和第4位
+            String city = card.substring(2, 4);
+
+            String birthday = card.substring(10, 14);
+//                省
+            newSchooluser.setProvince(province);
+//                市
+            newSchooluser.setCity(city);
+//                生日
+            newSchooluser.setBirthday(birthday);
+        }
+        return newSchooluser;
+    }
+
+
     /**
     /**
      * 通过身份证号来判断该学生信息是否添加
      * 通过身份证号来判断该学生信息是否添加
      *
      *

+ 20 - 0
src/main/java/com/chuanghai/student_portrait/service/impl/StructOfPeopleInSchoolServiceImpl.java

@@ -0,0 +1,20 @@
+package com.chuanghai.student_portrait.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chuanghai.student_portrait.entity.StructOfPeopleInSchool;
+import com.chuanghai.student_portrait.mapper.StructOfPeopleInSchoolMapper;
+import com.chuanghai.student_portrait.service.StructOfPeopleInSchoolService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("mysql2")
+public class StructOfPeopleInSchoolServiceImpl extends ServiceImpl<StructOfPeopleInSchoolMapper, StructOfPeopleInSchool> implements StructOfPeopleInSchoolService {
+
+    @Override
+    public StructOfPeopleInSchool getId(Integer id) {
+
+        StructOfPeopleInSchool struct = this.getById(id);
+        return struct;
+    }
+}

+ 102 - 0
src/main/java/com/chuanghai/student_portrait/utils/AES.java

@@ -0,0 +1,102 @@
+package com.chuanghai.student_portrait.utils;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class AES {
+    public static void main(String args[]) throws Exception {
+        // app_key
+        String cKey = "1234567890123456";
+        // 需要加密的字串
+        String cSrc = "{\"code\":\"0\",\"error_msg\":\"密码错误\",\"weixiao_openid\":\"12345678\",\"student_num\":\"888888888888\",\"name\":\"洪丹丹测试\",\"sign\":\"5C6E844C23C8F0C15AF382081D0663DC\"}";
+        // app_secret 取前16位;
+        String cIv = "0123456789123456";
+        System.out.println(cSrc);
+        // 加密
+        long lStart = System.currentTimeMillis();
+        String enString = AES.Encrypt(cSrc, cKey, cIv);
+        System.out.println("加密后的字串是:" + enString);
+
+        long lUseTime = System.currentTimeMillis() - lStart;
+        System.out.println("加密耗时:" + lUseTime + "毫秒");
+        // 解密
+        lStart = System.currentTimeMillis();
+        String DeString = AES.Decrypt(enString, cKey, cIv);
+        System.out.println("解密后的字串是:" + DeString);
+        lUseTime = System.currentTimeMillis() - lStart;
+        System.out.println("解密耗时:" + lUseTime + "毫秒");
+
+    }
+
+    public static String Encrypt(String sSrc, String sKey, String sIv) throws Exception {
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+        int blockSize = cipher.getBlockSize();
+
+        byte[] dataBytes = sSrc.getBytes();
+        int plaintextLength = dataBytes.length;
+        if (plaintextLength % blockSize != 0) {
+            plaintextLength = plaintextLength + (blockSize - (plaintextLength % blockSize));
+        }
+
+        byte[] plaintext = new byte[plaintextLength];
+        System.arraycopy(dataBytes, 0, plaintext, 0, dataBytes.length);
+
+        SecretKeySpec keyspec = new SecretKeySpec(sKey.getBytes(), "AES");
+        IvParameterSpec ivspec = new IvParameterSpec(sIv.getBytes());
+
+        cipher.init(Cipher.ENCRYPT_MODE, keyspec, ivspec);
+        byte[] encrypted = cipher.doFinal(plaintext);
+
+        return byte2hex(encrypted).toLowerCase();
+    }
+
+    public static String Decrypt(String sSrc, String sKey, String sIv) throws Exception {
+
+        byte[] encrypted1 = hex2byte(sSrc);
+
+        Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+        SecretKeySpec keyspec = new SecretKeySpec(sKey.getBytes(), "AES");
+        IvParameterSpec ivspec = new IvParameterSpec(sIv.getBytes());
+
+        cipher.init(Cipher.DECRYPT_MODE, keyspec, ivspec);
+
+        byte[] original = cipher.doFinal(encrypted1);
+        String originalString = new String(original);
+
+        return originalString;
+    }
+
+    public static byte[] hex2byte(String strhex) {
+        if (strhex == null) {
+            return null;
+        }
+        int l = strhex.length();
+        if (l % 2 == 1) {
+            return null;
+        }
+        byte[] b = new byte[l / 2];
+        for (int i = 0; i != l / 2; i++) {
+            b[i] = (byte) Integer.parseInt(strhex.substring(i * 2, i * 2 + 2),
+                    16);
+        }
+
+        return b;
+    }
+
+    public static String byte2hex(byte[] b) {
+        String hs = "";
+        String stmp = "";
+        for (int n = 0; n < b.length; n++) {
+            stmp = (java.lang.Integer.toHexString(b[n] & 0XFF));
+            if (stmp.length() == 1) {
+                hs = hs + "0" + stmp;
+            } else {
+                hs = hs + stmp;
+            }
+        }
+
+        return hs.toUpperCase();
+    }
+}

+ 62 - 13
src/main/java/com/chuanghai/student_portrait/utils/JWTUtils.java

@@ -1,33 +1,66 @@
 package com.chuanghai.student_portrait.utils;
 package com.chuanghai.student_portrait.utils;
 
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWT;
-import com.auth0.jwt.JWTCreator;
+import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
 
 
+
 import java.util.Calendar;
 import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
+
+
+
 public class JWTUtils {
 public class JWTUtils {
     private static String SIGNATURE = "token!@#$%^7890";
     private static String SIGNATURE = "token!@#$%^7890";
 
 
     /**
     /**
-     * 生成token
-     * @param map //传入payload
+     * 生成token 有过期时间
+     * @param userName //传入payload
+     * @param passWord
      * @return 返回token
      * @return 返回token
      */
      */
-    public static String getToken(Map<String,String> map){
-
-        JWTCreator.Builder builder = JWT.create();
-        map.forEach((k,v)->{
-            builder.withClaim(k,v);
-        });
-        Calendar instance = Calendar.getInstance();
-        instance.add(Calendar.SECOND,7);
-        builder.withExpiresAt(instance.getTime());
-        return builder.sign(Algorithm.HMAC256(SIGNATURE)).toString();
+    public static String getToken(String userName, String passWord){
+
+        // 签发时间
+        Date iatDate = new Date();
+
+        // 过期时间
+        Calendar nowTime = Calendar.getInstance();
+        nowTime.add(Calendar.DAY_OF_WEEK, 3);
+        Date expiresDate = nowTime.getTime();
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("alg", "HMAC256");
+        map.put("typ", "JWT");
+        String token = JWT.create()
+                .withHeader(map) // header
+                .withClaim("username", userName) // payload
+                .withClaim("password", passWord)
+                .withExpiresAt(expiresDate) // 设置过期时间。过期时间要大于签发时间
+                .withIssuedAt(iatDate) // 设置签发时间
+                .sign(Algorithm.HMAC256(SIGNATURE)); // 加密
+
+        return token;
+
+//
+//        JWTCreator.Builder builder = JWT.create();
+//        map.forEach((k,v)->{
+//            builder.withClaim(k,v);
+//        });
+//        Calendar instance = Calendar.getInstance();
+//        instance.add(Calendar.SECOND,7);
+//        builder.withExpiresAt(instance.getTime());
+//        return builder.sign(Algorithm.HMAC256(SIGNATURE)).toString();
     }
     }
 
 
+
+
+
     /**
     /**
      * 验证token
      * 验证token
      * @param token
      * @param token
@@ -44,4 +77,20 @@ public class JWTUtils {
     public static DecodedJWT getToken(String token){
     public static DecodedJWT getToken(String token){
         return JWT.require(Algorithm.HMAC256(SIGNATURE)).build().verify(token);
         return JWT.require(Algorithm.HMAC256(SIGNATURE)).build().verify(token);
     }
     }
+
+    /*
+     * 解密Token
+     * */
+    public static Map<String, Claim> verifyToken(String token)  {
+        JWTVerifier verifier = JWT.require(Algorithm.HMAC256(SIGNATURE)).build();
+        DecodedJWT jwt = null;
+        try {
+            jwt = verifier.verify(token);
+        } catch (Exception e) {
+            throw new RuntimeException("登录凭证已过去,请重新登录");
+        }
+
+        return jwt.getClaims();
+    }
+
 }
 }

+ 30 - 7
src/main/resources/application.yml

@@ -9,15 +9,36 @@ spring:
 #    active: pro  #生产环境配置文件
 #    active: pro  #生产环境配置文件
   application:
   application:
     name: student_portrait
     name: student_portrait
-  datasource:
+#    单数据源配置
+#  datasource:
+##    driver-class-name: com.mysql.cj.jdbc.Driver
+##    url: jdbc:mysql://172.16.20.45:3306/activerecord?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+##    username: root
+##    password: Chuanghai_2021.
 #    driver-class-name: com.mysql.cj.jdbc.Driver
 #    driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://172.16.20.45:3306/activerecord?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://172.16.20.69:3306/student_portrait?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
 #    username: root
 #    username: root
-#    password: Chuanghai_2021.
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.16.20.69:3306/student_portrait?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
-    username: root
-    password: chuanghai@2022
+#    password: chuanghai@2022
+
+#多数据源配置
+  datasource:
+    dynamic:
+      primary: mysql1 #设置默认的数据源或者数据源组,默认值即为mysql1
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        mysql1:
+          url: jdbc:mysql://172.16.20.69:3306/student_portrait?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+          username: root
+          password: chuanghai@2022
+          driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        mysql2:
+          url: jdbc:mysql://172.16.20.45:3306/smartschool_bigdata?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+          username: root
+          password: Chuanghai_2021.
+          driver-class-name: com.mysql.cj.jdbc.Driver
+
+
+
   servlet:
   servlet:
     multipart:
     multipart:
       enabled: true
       enabled: true
@@ -84,6 +105,8 @@ decisionEngine:
     qrcode: https://chtech.ncjti.edu.cn/access-control/ncjtEntranceGuard/getTrafficRecordViewPageList
     qrcode: https://chtech.ncjti.edu.cn/access-control/ncjtEntranceGuard/getTrafficRecordViewPageList
     #热水使用记录
     #热水使用记录
     waterUrl: http://192.168.1.34:8080/HotWaters/waterfindConsume.action
     waterUrl: http://192.168.1.34:8080/HotWaters/waterfindConsume.action
+    #热水登入
+    hotLogin: http://192.168.1.34:8080/HotWaters/userlog.action
   nvr:
   nvr:
     nvrip: 172.22.45.25
     nvrip: 172.22.45.25
     nvrport: 80
     nvrport: 80

+ 30 - 7
target/classes/application.yml

@@ -9,15 +9,36 @@ spring:
 #    active: pro  #生产环境配置文件
 #    active: pro  #生产环境配置文件
   application:
   application:
     name: student_portrait
     name: student_portrait
-  datasource:
+#    单数据源配置
+#  datasource:
+##    driver-class-name: com.mysql.cj.jdbc.Driver
+##    url: jdbc:mysql://172.16.20.45:3306/activerecord?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+##    username: root
+##    password: Chuanghai_2021.
 #    driver-class-name: com.mysql.cj.jdbc.Driver
 #    driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://172.16.20.45:3306/activerecord?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+#    url: jdbc:mysql://172.16.20.69:3306/student_portrait?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
 #    username: root
 #    username: root
-#    password: Chuanghai_2021.
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.16.20.69:3306/student_portrait?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
-    username: root
-    password: chuanghai@2022
+#    password: chuanghai@2022
+
+#多数据源配置
+  datasource:
+    dynamic:
+      primary: mysql1 #设置默认的数据源或者数据源组,默认值即为mysql1
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        mysql1:
+          url: jdbc:mysql://172.16.20.69:3306/student_portrait?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+          username: root
+          password: chuanghai@2022
+          driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+        mysql2:
+          url: jdbc:mysql://172.16.20.45:3306/smartschool_bigdata?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+          username: root
+          password: Chuanghai_2021.
+          driver-class-name: com.mysql.cj.jdbc.Driver
+
+
+
   servlet:
   servlet:
     multipart:
     multipart:
       enabled: true
       enabled: true
@@ -84,6 +105,8 @@ decisionEngine:
     qrcode: https://chtech.ncjti.edu.cn/access-control/ncjtEntranceGuard/getTrafficRecordViewPageList
     qrcode: https://chtech.ncjti.edu.cn/access-control/ncjtEntranceGuard/getTrafficRecordViewPageList
     #热水使用记录
     #热水使用记录
     waterUrl: http://192.168.1.34:8080/HotWaters/waterfindConsume.action
     waterUrl: http://192.168.1.34:8080/HotWaters/waterfindConsume.action
+    #热水登入
+    hotLogin: http://192.168.1.34:8080/HotWaters/userlog.action
   nvr:
   nvr:
     nvrip: 172.22.45.25
     nvrip: 172.22.45.25
     nvrport: 80
     nvrport: 80

+ 1 - 1
target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
 #Generated by Maven
-#Tue Feb 07 10:28:25 CST 2023
+#Tue Feb 21 11:17:33 CST 2023
 version=0.0.1-SNAPSHOT
 version=0.0.1-SNAPSHOT
 groupId=com.chuanghai
 groupId=com.chuanghai
 artifactId=student_portrait
 artifactId=student_portrait

+ 13 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,7 +1,9 @@
+com\chuanghai\student_portrait\service\impl\CollegesInfoServiceImpl.class
 com\chuanghai\student_portrait\controller\GetSchoolUserController$3.class
 com\chuanghai\student_portrait\controller\GetSchoolUserController$3.class
 com\chuanghai\student_portrait\service\HotWaterService.class
 com\chuanghai\student_portrait\service\HotWaterService.class
 com\chuanghai\student_portrait\mapper\ColdWaterMapper.class
 com\chuanghai\student_portrait\mapper\ColdWaterMapper.class
 com\chuanghai\student_portrait\utils\ReturnValueUtil.class
 com\chuanghai\student_portrait\utils\ReturnValueUtil.class
+com\chuanghai\student_portrait\mapper\CollegesInfoMapper.class
 com\chuanghai\student_portrait\mapper\ProvinceMapper.class
 com\chuanghai\student_portrait\mapper\ProvinceMapper.class
 com\chuanghai\student_portrait\entity\dto\AccessCountDto.class
 com\chuanghai\student_portrait\entity\dto\AccessCountDto.class
 com\chuanghai\student_portrait\mapper\OldSchooluserMapper.class
 com\chuanghai\student_portrait\mapper\OldSchooluserMapper.class
@@ -14,15 +16,18 @@ com\chuanghai\student_portrait\utils\ExcelUtil.class
 com\chuanghai\student_portrait\service\impl\ConsumeServicelmpl$1.class
 com\chuanghai\student_portrait\service\impl\ConsumeServicelmpl$1.class
 com\chuanghai\student_portrait\entity\OldSchooluser.class
 com\chuanghai\student_portrait\entity\OldSchooluser.class
 com\chuanghai\student_portrait\config\TokenConfig.class
 com\chuanghai\student_portrait\config\TokenConfig.class
+com\chuanghai\student_portrait\mapper\StructOfPeopleInSchoolMapper.class
 com\chuanghai\student_portrait\service\CapacityService.class
 com\chuanghai\student_portrait\service\CapacityService.class
 com\chuanghai\student_portrait\exception\BaseErrorInfoInterface.class
 com\chuanghai\student_portrait\exception\BaseErrorInfoInterface.class
 com\chuanghai\student_portrait\service\OldSchooluserService.class
 com\chuanghai\student_portrait\service\OldSchooluserService.class
 com\chuanghai\student_portrait\service\impl\AirConditioningServiceImpl.class
 com\chuanghai\student_portrait\service\impl\AirConditioningServiceImpl.class
 com\chuanghai\student_portrait\service\AccessService.class
 com\chuanghai\student_portrait\service\AccessService.class
 com\chuanghai\student_portrait\utils\HMAC.class
 com\chuanghai\student_portrait\utils\HMAC.class
+com\chuanghai\student_portrait\service\CollegesInfoService.class
 com\chuanghai\student_portrait\entity\dto\FaceDisernDto.class
 com\chuanghai\student_portrait\entity\dto\FaceDisernDto.class
 com\chuanghai\student_portrait\entity\dto\PersonalTrackDto.class
 com\chuanghai\student_portrait\entity\dto\PersonalTrackDto.class
 com\chuanghai\student_portrait\mapper\CapacityMapper.class
 com\chuanghai\student_portrait\mapper\CapacityMapper.class
+com\chuanghai\student_portrait\controller\StructOfPeopleInSchoolController.class
 com\chuanghai\student_portrait\service\CityService.class
 com\chuanghai\student_portrait\service\CityService.class
 com\chuanghai\student_portrait\service\StallService.class
 com\chuanghai\student_portrait\service\StallService.class
 com\chuanghai\student_portrait\service\impl\CoordServiceImpl.class
 com\chuanghai\student_portrait\service\impl\CoordServiceImpl.class
@@ -66,7 +71,9 @@ com\chuanghai\student_portrait\service\impl\AffinityScoreServiceImpl.class
 com\chuanghai\student_portrait\service\impl\CityServiceImpl.class
 com\chuanghai\student_portrait\service\impl\CityServiceImpl.class
 com\chuanghai\student_portrait\utils\FileUtil.class
 com\chuanghai\student_portrait\utils\FileUtil.class
 com\chuanghai\student_portrait\mapper\AccessMapper.class
 com\chuanghai\student_portrait\mapper\AccessMapper.class
+com\chuanghai\student_portrait\service\StructOfPeopleInSchoolService.class
 com\chuanghai\student_portrait\controller\CapacityController.class
 com\chuanghai\student_portrait\controller\CapacityController.class
+com\chuanghai\student_portrait\service\impl\StructOfPeopleInSchoolServiceImpl.class
 com\chuanghai\student_portrait\exception\GlobalExceptionHandler.class
 com\chuanghai\student_portrait\exception\GlobalExceptionHandler.class
 com\chuanghai\student_portrait\controller\GetSchoolUserController$2.class
 com\chuanghai\student_portrait\controller\GetSchoolUserController$2.class
 com\chuanghai\student_portrait\entity\AirConditioning.class
 com\chuanghai\student_portrait\entity\AirConditioning.class
@@ -83,6 +90,7 @@ com\chuanghai\student_portrait\mapper\CityMapper.class
 com\chuanghai\student_portrait\entity\Coord.class
 com\chuanghai\student_portrait\entity\Coord.class
 com\chuanghai\student_portrait\mapper\HotWaterMapper.class
 com\chuanghai\student_portrait\mapper\HotWaterMapper.class
 com\chuanghai\student_portrait\service\AirConditioningService.class
 com\chuanghai\student_portrait\service\AirConditioningService.class
+com\chuanghai\student_portrait\utils\AES.class
 com\chuanghai\student_portrait\entity\ColdWater.class
 com\chuanghai\student_portrait\entity\ColdWater.class
 com\chuanghai\student_portrait\service\impl\ConsumeServicelmpl.class
 com\chuanghai\student_portrait\service\impl\ConsumeServicelmpl.class
 com\chuanghai\student_portrait\entity\dto\CapacityDto.class
 com\chuanghai\student_portrait\entity\dto\CapacityDto.class
@@ -106,7 +114,9 @@ com\chuanghai\student_portrait\service\ProvinceService.class
 com\chuanghai\student_portrait\entity\Consume.class
 com\chuanghai\student_portrait\entity\Consume.class
 com\chuanghai\student_portrait\controller\ForeWarningReportFormController.class
 com\chuanghai\student_portrait\controller\ForeWarningReportFormController.class
 com\chuanghai\student_portrait\utils\JedisUtil.class
 com\chuanghai\student_portrait\utils\JedisUtil.class
+com\chuanghai\student_portrait\controller\ReceiveController.class
 com\chuanghai\student_portrait\utils\JWTUtils.class
 com\chuanghai\student_portrait\utils\JWTUtils.class
+com\chuanghai\student_portrait\entity\StructOfPeopleInSchool.class
 com\chuanghai\student_portrait\entity\AffinityScore.class
 com\chuanghai\student_portrait\entity\AffinityScore.class
 com\chuanghai\student_portrait\config\PageConfig.class
 com\chuanghai\student_portrait\config\PageConfig.class
 com\chuanghai\student_portrait\utils\LogUtils.class
 com\chuanghai\student_portrait\utils\LogUtils.class
@@ -125,11 +135,14 @@ com\chuanghai\student_portrait\entity\Equipment.class
 com\chuanghai\student_portrait\utils\Base64Utils.class
 com\chuanghai\student_portrait\utils\Base64Utils.class
 com\chuanghai\student_portrait\controller\CountController.class
 com\chuanghai\student_portrait\controller\CountController.class
 com\chuanghai\student_portrait\service\impl\ProvinceServiceImpl.class
 com\chuanghai\student_portrait\service\impl\ProvinceServiceImpl.class
+com\chuanghai\student_portrait\entity\EventUser.class
 com\chuanghai\student_portrait\service\impl\LoginServiceImpl.class
 com\chuanghai\student_portrait\service\impl\LoginServiceImpl.class
 com\chuanghai\student_portrait\service\impl\FaceDiscernServiceImpl.class
 com\chuanghai\student_portrait\service\impl\FaceDiscernServiceImpl.class
 com\chuanghai\student_portrait\entity\Dorm.class
 com\chuanghai\student_portrait\entity\Dorm.class
 com\chuanghai\student_portrait\service\impl\OldSchooluserServiceImpl.class
 com\chuanghai\student_portrait\service\impl\OldSchooluserServiceImpl.class
+com\chuanghai\student_portrait\entity\CollegesInfo.class
 com\chuanghai\student_portrait\response\BaseResponse.class
 com\chuanghai\student_portrait\response\BaseResponse.class
+com\chuanghai\student_portrait\entity\EventOrg.class
 com\chuanghai\student_portrait\mapper\ElectricityMapper.class
 com\chuanghai\student_portrait\mapper\ElectricityMapper.class
 com\chuanghai\student_portrait\controller\DormController.class
 com\chuanghai\student_portrait\controller\DormController.class
 com\chuanghai\student_portrait\service\DormService.class
 com\chuanghai\student_portrait\service\DormService.class

+ 13 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -6,6 +6,7 @@ E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\ma
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\City.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\City.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\AirConditioningService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\AirConditioningService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ForewarningService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ForewarningService.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\ReceiveController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Stall.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Stall.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\OldSchooluserMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\OldSchooluserMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\ForeWarningReportFormController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\ForeWarningReportFormController.java
@@ -41,6 +42,7 @@ E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\se
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\ElectricityMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\ElectricityMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\DormService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\DormService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\config\PageConfig.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\config\PageConfig.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\StructOfPeopleInSchoolController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\ElectricityController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\ElectricityController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\AccessService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\AccessService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\ForewarningMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\ForewarningMapper.java
@@ -58,12 +60,16 @@ E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\ut
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\LoginService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\LoginService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\utils\ReturnValueUtil.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\utils\ReturnValueUtil.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ProvinceService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ProvinceService.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\EventUser.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\NewSchooluserController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\NewSchooluserController.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\StructOfPeopleInSchoolService.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\StructOfPeopleInSchoolMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\exception\BaseErrorInfoInterface.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\exception\BaseErrorInfoInterface.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\StallServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\StallServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\CapacityService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\CapacityService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\utils\Base64Utils.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\utils\Base64Utils.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Province.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Province.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\EventOrg.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\NewSchooluser.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\NewSchooluser.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\HotWaterController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\HotWaterController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Access.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Access.java
@@ -72,20 +78,25 @@ E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\en
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\ConsumeTotalMoneyDto.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\ConsumeTotalMoneyDto.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\User.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\User.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\AffinityScoreService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\AffinityScoreService.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\CollegesInfoServiceImpl.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\CollegesInfo.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\CapacityController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\CapacityController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\FaceDiscernServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\FaceDiscernServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\OldSchooluserService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\OldSchooluserService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\OldSchooluser.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\OldSchooluser.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ElectricityService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ElectricityService.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\StructOfPeopleInSchool.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\AccessServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\AccessServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\AccessCountDto.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\AccessCountDto.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Consume.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Consume.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\CollegesInfoMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\PersonalTrackDto.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\PersonalTrackDto.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\LoginServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\LoginServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\CoordMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\CoordMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\ConsumeController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\ConsumeController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Forewarning.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Forewarning.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ConsumeService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ConsumeService.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\StructOfPeopleInSchoolServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\AirConditioningServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\AirConditioningServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\AffinityScoreController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\AffinityScoreController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\utils\ExcelUtil.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\utils\ExcelUtil.java
@@ -120,11 +131,13 @@ E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\ut
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\AffinityScoreServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\AffinityScoreServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\EnergyDto.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\EnergyDto.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\OldSchooluserServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\OldSchooluserServiceImpl.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\CollegesInfoService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\response\enums\StatusEnum.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\response\enums\StatusEnum.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\exception\GlobalExceptionHandler.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\exception\GlobalExceptionHandler.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\utils\vo\SubscriptionVo.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\utils\vo\SubscriptionVo.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\StudentPortraitApplication.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\StudentPortraitApplication.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\response\BaseResponse.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\response\BaseResponse.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\utils\AES.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Student.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\Student.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\DormServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\DormServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ColdWaterService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\ColdWaterService.java

BIN
target/student_portrait-0.0.1-SNAPSHOT.jar.original