修改bug后的版本

pom.xml

@@ -93,7 +93,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
-            <version>1.1.23</version>
+            <version>1.1.22</version>
         </dependency>
 
         <!--    集成easypoi组件 .导出excel http://easypoi.mydoc.io/ -->

src/main/java/com/chuanghai/student_portrait/config/FacePassRecord.java

@@ -85,7 +85,11 @@ public class FacePassRecord extends BaseClass {
                     JSONObject compareInfo = JSONObject.parseObject(jsonArray.getJSONObject(i).get("CompareInfo").toString());
                     JSONObject snapshotImage = JSONObject.parseObject(compareInfo.get("SnapshotImage").toString());
                     JSONObject bigImage = JSONObject.parseObject(snapshotImage.get("BigImage").toString());
-                    String dataBase ="data:image/jpeg;base64,"+bigImage.getString("Data");
+                    StringBuilder builder = new StringBuilder();
+                    builder.append("data:image/jpeg;base64,");
+                    builder.append(bigImage.getString("Data"));
+                    String dataBase = builder.toString();
+
 
                     JSONObject personInfo = JSONObject.parseObject(compareInfo.get("PersonInfo").toString());
                     String personName = personInfo.getString("PersonName");

src/main/java/com/chuanghai/student_portrait/controller/CountController.java

@@ -9,8 +9,6 @@ import com.chuanghai.student_portrait.entity.City;
 import com.chuanghai.student_portrait.entity.Forewarning;
 import com.chuanghai.student_portrait.entity.NewSchooluser;
 import com.chuanghai.student_portrait.entity.Province;
-import com.chuanghai.student_portrait.entity.dto.CapacityAllDto;
-import com.chuanghai.student_portrait.entity.dto.ConsumeDto;
 import com.chuanghai.student_portrait.entity.dto.DistrictDto;
 import com.chuanghai.student_portrait.response.BaseResponse;
 import com.chuanghai.student_portrait.response.enums.StatusEnum;
@@ -50,6 +48,8 @@ public class CountController {
     @Autowired
     JedisUtil jedisUtil;
 
+
+
     @GetMapping("/count")
     @ApiOperation(value = "查询院系数量，在校学生，预警数量")
     public BaseResponse count() {
@@ -74,11 +74,7 @@ public class CountController {
         }
 
         HashMap<String, Object> mapCount = new HashMap<>();
-////        查询所有院校
-//        long countCollege = newSchooluserService.count(Wrappers.<NewSchooluser>lambdaQuery()
-//                .select(NewSchooluser::getCollege)
-//                .groupBy(NewSchooluser::getCollege)
-//        );
+
 //查询在校人数
         long countSchoolUser = newSchooluserService.count(Wrappers.<NewSchooluser>lambdaQuery()
                 .between(NewSchooluser::getGrade, oldYear, year)

src/main/java/com/chuanghai/student_portrait/exception/BaseErrorInfoInterface.java

@@ -5,7 +5,6 @@ package com.chuanghai.student_portrait.exception;
  * @Description: 基础接口
  * 自定义的错误描述枚举类需实现该接口
  * @Version:1.0.0
- * @Author: bingo
  * @Date: 2022/4/11 星期一 19:20
  */
 public interface BaseErrorInfoInterface {

src/main/java/com/chuanghai/student_portrait/service/impl/AccessServiceImpl.java

@@ -63,7 +63,7 @@ public class AccessServiceImpl extends ServiceImpl<AccessMapper, Access> impleme
     /**
      * 每3小时拉取一次门禁的数据
      */
-    @Scheduled(cron = "0 0 0/2 * * ? ")
+    @Scheduled(cron = "0 0/10 * * * ? ")
     public void autoQueryOrder() {
         getQRCode();
     }

src/main/java/com/chuanghai/student_portrait/service/impl/ColdWaterServiceImpl.java

@@ -38,7 +38,7 @@ public class ColdWaterServiceImpl extends ServiceImpl<ColdWaterMapper, ColdWater
     private Integer size = 8;
 
     //    20秒钟运行一次
-    @Scheduled(cron = "0/20 * * 1 * ?  ")
+    @Scheduled(cron = "0/20 * * 1 * ? ")
     public void autoQueryOrder() {
         Page<Dorm> dormPage = dormService.page(new Page<Dorm>(page, size));
         List<Dorm> records = dormPage.getRecords();

src/main/java/com/chuanghai/student_portrait/service/impl/FaceDiscernServiceImpl.java

@@ -10,7 +10,6 @@ import com.chuanghai.student_portrait.config.ChannelDetailInfos;
 import com.chuanghai.student_portrait.config.FacePassRecord;
 import com.chuanghai.student_portrait.entity.*;
 import com.chuanghai.student_portrait.entity.dto.AccessCountDto;
-import com.chuanghai.student_portrait.entity.dto.ConsumeTotalMoneyDto;
 import com.chuanghai.student_portrait.entity.dto.FaceDisernDto;
 import com.chuanghai.student_portrait.entity.dto.PersonalTrackDto;
 import com.chuanghai.student_portrait.mapper.FaceDiscernMapper;
@@ -23,28 +22,17 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import net.sf.jsqlparser.statement.select.Select;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.python.antlr.ast.If;
-import org.python.antlr.ast.Name;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.client.RestTemplate;
-import org.apache.http.impl.client.CloseableHttpClient;
-
 
 import java.io.IOException;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 
-import static com.chuanghai.student_portrait.config.BaseClass.*;
 
 /**
  * @Author:liu
@@ -394,7 +382,14 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
         List<FaceDisernDto> dtoList = baseMapper.getStudentCount(startTime, endTime);
         ArrayList<FaceDisernDto> faceDisernDtos = new ArrayList<>();
         for (int i = 0; i <= 9; i++) {
-            faceDisernDtos.add(dtoList.get(i));
+            if (i<dtoList.size()) {
+                faceDisernDtos.add(dtoList.get(i));
+            }else {
+                FaceDisernDto faceDisernDto = new FaceDisernDto();
+                faceDisernDto.setSchoolUserID(i+3+"");
+                faceDisernDtos.add(faceDisernDto);
+            }
+
         }
         return faceDisernDtos;
     }
@@ -575,13 +570,17 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
             String[] split = string.split(",");
             String s = split[0];
             String s1 = split[1];
-            Coord coord = coordService.list(Wrappers.<Coord>lambdaQuery().eq(Coord::getLongitude, s).eq(Coord::getLatitude, s1)).get(0);
-            List<PersonalTrackDto> personalTrackDtos1 = map.get(string);
-            map1.put("name",coord.getBuildingName());
-            map1.put("date",personalTrackDtos1);
-            map1.put("longitude",s);
-            map1.put("latitude",s1);
-            mapArrayList.add(map1);
+            List<Coord> list1 = coordService.list(Wrappers.<Coord>lambdaQuery().eq(Coord::getLongitude, s).eq(Coord::getLatitude, s1));
+            if (ObjectUtils.isNotEmpty(list1)&&list1.size()>0) {
+                Coord coord = list1.get(0);
+                List<PersonalTrackDto> personalTrackDtos1 = map.get(string);
+                map1.put("name",coord.getBuildingName());
+                map1.put("date",personalTrackDtos1);
+                map1.put("longitude",s);
+                map1.put("latitude",s1);
+                mapArrayList.add(map1);
+            }
+
         }
 
             String jsonStr = null;
@@ -759,7 +758,7 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
     /**
      * 2小时拉取一次宇视人脸识别记录
      */
-    @Scheduled(cron = "0 0 0/2 * * ? ")
+    @Scheduled(cron = "0 0/10 * * * ? ")
     public void autoQueryOrder() {
         try {
             DateUtils dateUtils = new DateUtils();

src/main/java/com/chuanghai/student_portrait/service/impl/HotWaterServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -61,7 +62,7 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
     JedisUtil jedisUtil;
 
 
-//    @Override
+    //    @Override
 //    public BaseResponse hotWaterEnergy1() {
 //        HashMap<Object, Object> hashMap = new HashMap<>();
 //        HashMap<Object, Object> map = new HashMap<>();
@@ -212,14 +213,22 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
 //        hashMap.put("electricityAndColdWater", map2);
 //        return BaseResponse.ok(StatusEnum.SUCCESS, hashMap);
 //    }
+    public static void main(String[] args) {
+
+        Date date = new Date();
+        Date firstMonthDay = getFirstMonthDay(date, 1);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        String format = sdf.format(firstMonthDay);
+        System.out.println("format = " + format);
+    }
 
     @Override
     public BaseResponse hotWaterEnergy() {
         ObjectMapper objectMapper = new ObjectMapper();
         //        redis 缓存
         if (jedisUtil.exists("hotWaterEnergy")) {
-            String hotWaterEnergy= jedisUtil.get("hotWaterEnergy");
-            Map list=JSON.parseObject(hotWaterEnergy,Map.class);
+            String hotWaterEnergy = jedisUtil.get("hotWaterEnergy");
+            Map list = JSON.parseObject(hotWaterEnergy, Map.class);
             return BaseResponse.ok(StatusEnum.SUCCESS, list);
         }
         HashMap<Object, Object> hashMap = new HashMap<>();
@@ -232,6 +241,9 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
         for (int i = 1; i <= 5; i++) {
             Date date = new Date();
             Date firstMonthDay = getFirstMonthDay(date, i);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+            String firstTime = sdf.format(firstMonthDay);
+
             Date lastMonthDay = getLastMonthDay(date, i);
             String dateTime = getDateTime(i);
 //           热水
@@ -250,23 +262,27 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
                 String hotwaterAmount = hotWater.getHotwaterAmount();
                 double money = Double.parseDouble(hotwaterAmount);
                 if ("女".equals(genderDorm)) {
-                    girlTotalHotWaterMoney = girlTotalHotWaterMoney + money;
+                    BigDecimal bigDecimal = new BigDecimal(girlTotalHotWaterMoney + "");
+                    BigDecimal decimal = new BigDecimal(money + "");
+                    girlTotalHotWaterMoney = bigDecimal.add(decimal).doubleValue();
+
                 } else if ("男".equals(genderDorm)) {
-                    boyTotalMoney = boyTotalMoney + money;
+                    BigDecimal bigDecimal = new BigDecimal(boyTotalMoney + "");
+                    BigDecimal decimal = new BigDecimal(money + "");
+                    boyTotalMoney = bigDecimal.add(decimal).doubleValue();
                 }
             }
-
             //            热水
             girlEnergyDtoHotWater.setGenderDrom("女生");
             girlEnergyDtoHotWater.setTotalMoney(girlTotalHotWaterMoney);
-            girlEnergyDtoHotWater.setDate(firstMonthDay);
+            girlEnergyDtoHotWater.setDate(firstTime);
             girlEnergyDtoHotWater.setName("热水");
             hotWaterEnergyDtos.add(girlEnergyDtoHotWater);
 
             //            热水
             boyEnergyDto.setGenderDrom("男生");
             boyEnergyDto.setTotalMoney(boyTotalMoney);
-            boyEnergyDto.setDate(firstMonthDay);
+            boyEnergyDto.setDate(firstTime);
             boyEnergyDto.setName("热水");
             hotWaterEnergyDtos.add(boyEnergyDto);
 
@@ -284,9 +300,14 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
                 String genderDorm = getGenderDorm(electricity.getDom());
                 Double money = electricity.getTotalMoney();
                 if ("女".equals(genderDorm)) {
-                    girlTotalElectricityAndColdWaterMoney = girlTotalElectricityAndColdWaterMoney + money;
+                    BigDecimal bigDecimal = new BigDecimal(girlTotalElectricityAndColdWaterMoney + "");
+                    BigDecimal decimal = new BigDecimal(money + "");
+                    girlTotalElectricityAndColdWaterMoney = bigDecimal.add(decimal).doubleValue();
+
                 } else if ("男".equals(genderDorm)) {
-                    boyTotalElectricityAndColdWaterMoney = boyTotalElectricityAndColdWaterMoney + money;
+                    BigDecimal bigDecimal = new BigDecimal(boyTotalElectricityAndColdWaterMoney + "");
+                    BigDecimal decimal = new BigDecimal(money + "");
+                    boyTotalElectricityAndColdWaterMoney = bigDecimal.add(decimal).doubleValue();
                 }
             }
 //                水费
@@ -297,9 +318,13 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
                 String genderDorm = getGenderDorm(coldWater.getDom());
                 Double money = coldWater.getTotalMoney();
                 if ("女".equals(genderDorm)) {
-                    girlTotalElectricityAndColdWaterMoney = girlTotalElectricityAndColdWaterMoney + money;
+                    BigDecimal bigDecimal = new BigDecimal(girlTotalElectricityAndColdWaterMoney + "");
+                    BigDecimal decimal = new BigDecimal(money + "");
+                    girlTotalElectricityAndColdWaterMoney = bigDecimal.add(decimal).doubleValue();
                 } else if ("男".equals(genderDorm)) {
-                    boyTotalElectricityAndColdWaterMoney = boyTotalElectricityAndColdWaterMoney + money;
+                    BigDecimal bigDecimal = new BigDecimal(boyTotalElectricityAndColdWaterMoney + "");
+                    BigDecimal decimal = new BigDecimal(money + "");
+                    boyTotalElectricityAndColdWaterMoney = bigDecimal.add(decimal).doubleValue();
                 }
             }
 
@@ -316,14 +341,16 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
             boyEnergyElectricityAndColdWaterDto.setDate(dateTime);
             boyEnergyElectricityAndColdWaterDto.setName("水电");
             hotWaterEnergyDtos2.add(boyEnergyElectricityAndColdWaterDto);
+
         }
         map.put("list", hotWaterEnergyDtos);
         map2.put("list", hotWaterEnergyDtos2);
         hashMap.put("hotWater", map);
         hashMap.put("electricityAndColdWater", map2);
+
         String jsonStr = null;
         try {
-            jsonStr = objectMapper.writeValueAsString(hashMap);	//areaList序列化为json字符串
+            jsonStr = objectMapper.writeValueAsString(hashMap);    //areaList序列化为json字符串
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }
@@ -365,9 +392,9 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
     public BaseResponse personHotwaterEnergy(String id) {
         ObjectMapper objectMapper = new ObjectMapper();
         //        redis 缓存
-        if (jedisUtil.exists("personHotwaterEnergy"+id)) {
-            String hotWaterEnergy= jedisUtil.get("personHotwaterEnergy"+id);
-            Map list=JSON.parseObject(hotWaterEnergy,Map.class);
+            if (jedisUtil.exists("personHotwaterEnergy" + id)) {
+            String hotWaterEnergy = jedisUtil.get("personHotwaterEnergy" + id);
+            Map list = JSON.parseObject(hotWaterEnergy, Map.class);
             return BaseResponse.ok(StatusEnum.SUCCESS, list);
         }
 //        参数校验
@@ -389,6 +416,9 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
             Date firstMonthDay = getFirstMonthDay(date, i);
             Date lastMonthDay = getLastMonthDay(date, i);
 
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+            String format = sdf.format(firstMonthDay);
+
             EnergyDto personEnergyDto = new EnergyDto();
             List<HotWater> list = this.list(Wrappers.<HotWater>lambdaQuery()
                     .eq(HotWater::getCardNumber, id)
@@ -397,10 +427,12 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
             Double personMonTotalMoney = 0.0;
             for (HotWater hotWater : list) {
                 String hotwaterAmount = hotWater.getHotwaterAmount();
-                double money = Double.parseDouble(hotwaterAmount);
-                personMonTotalMoney = personMonTotalMoney + money;
+                BigDecimal bigDecimal = new BigDecimal(hotwaterAmount);
+                BigDecimal decimal = new BigDecimal(personMonTotalMoney + "");
+                personMonTotalMoney = bigDecimal.add(decimal).doubleValue();
+
             }
-            personEnergyDto.setDate(firstMonthDay);
+            personEnergyDto.setDate(format);
             personEnergyDto.setTotalMoney(personMonTotalMoney);
             hotWaterEnergyDtos.add(personEnergyDto);
         }
@@ -411,34 +443,39 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
             for (int i = 1; i <= 5; i++) {
                 String dateTime = getDateTime(i);
                 EnergyDto personEnergyDto = new EnergyDto();
-                Double electricityAndColdWaterMoney=0.0;
+                Double electricityAndColdWaterMoney = 0.0;
 
 //                电费
                 List<Electricity> electricityList = electricityService.list(Wrappers.<Electricity>lambdaQuery()
                         .eq(Electricity::getDateTime, dateTime)
-                        .eq(Electricity::getDom,dormNumber)
+                        .eq(Electricity::getDom, dormNumber)
                 );
                 for (Electricity electricity : electricityList) {
                     Double totalMoney = electricity.getTotalMoney();
-                    electricityAndColdWaterMoney=electricityAndColdWaterMoney+totalMoney;
+                    BigDecimal bigDecimal = new BigDecimal(electricityAndColdWaterMoney + "");
+                    BigDecimal decimal = new BigDecimal(totalMoney + "");
+                    electricityAndColdWaterMoney = bigDecimal.add(decimal).doubleValue();
+
                 }
 
 //                水费
                 List<ColdWater> list1 = coldWaterService.list(Wrappers.<ColdWater>lambdaQuery()
                         .eq(ColdWater::getDataTime, dateTime)
-                        .eq(ColdWater::getDom,dormNumber)
+                        .eq(ColdWater::getDom, dormNumber)
                 );
                 for (ColdWater coldWater : list1) {
                     Double totalMoney = coldWater.getTotalMoney();
-                    electricityAndColdWaterMoney=electricityAndColdWaterMoney+totalMoney;
+                    BigDecimal bigDecimal = new BigDecimal(electricityAndColdWaterMoney + "");
+                    BigDecimal decimal = new BigDecimal(totalMoney + "");
+                    electricityAndColdWaterMoney = bigDecimal.add(decimal).doubleValue();
                 }
-                BigDecimal b1 = new BigDecimal(electricityAndColdWaterMoney/4);
+                BigDecimal b1 = new BigDecimal(electricityAndColdWaterMoney / 4);
                 double f2 = b1.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
                 personEnergyDto.setDate(dateTime);
                 personEnergyDto.setTotalMoney(f2);
                 electricityAndColdWaterDtos.add(personEnergyDto);
             }
-        }else {
+        } else {
             for (int i = 1; i <= 5; i++) {
                 String dateTime = getDateTime(i);
                 EnergyDto personEnergyDto = new EnergyDto();
@@ -454,11 +491,11 @@ public class HotWaterServiceImpl extends ServiceImpl<HotWaterMapper, HotWater> i
 
         String jsonStr = null;
         try {
-            jsonStr = objectMapper.writeValueAsString(hashMap);	//areaList序列化为json字符串
+            jsonStr = objectMapper.writeValueAsString(hashMap);    //areaList序列化为json字符串
         } catch (JsonProcessingException e) {
             e.printStackTrace();
         }
-        jedisUtil.setnx("personHotwaterEnergy"+id, jsonStr);
+        jedisUtil.setnx("personHotwaterEnergy" + id, jsonStr);
         return BaseResponse.ok(StatusEnum.SUCCESS, hashMap);
     }
 

src/main/resources/application.yml

@@ -17,7 +17,7 @@ spring:
     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: 1234
+    password: chuanghai@2022
   servlet:
     multipart:
       enabled: true

target/classes/application.yml

@@ -17,7 +17,7 @@ spring:
     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: 1234
+    password: chuanghai@2022
   servlet:
     multipart:
       enabled: true

target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Fri Dec 09 17:29:30 CST 2022
+#Fri Jan 06 17:23:55 CST 2023
 version=0.0.1-SNAPSHOT
 groupId=com.chuanghai
 artifactId=student_portrait