版本迭代

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

@@ -103,13 +103,13 @@ public class CountController {
     @GetMapping("/provinceCount")
     @ApiOperation(value = "查询各省份人数")
     public BaseResponse provinceCount() {
-        ObjectMapper objectMapper = new ObjectMapper();
-        //        redis 缓存
-        if (jedisUtil.exists("provinceCount")) {
-            String count = jedisUtil.get("provinceCount");
-            List<DistrictDto> districtDtos = com.alibaba.fastjson.JSON.parseArray(count, DistrictDto.class);
-            return BaseResponse.ok(StatusEnum.SUCCESS, districtDtos);
-        }
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        //        redis 缓存
+//        if (jedisUtil.exists("provinceCount")) {
+//            String count = jedisUtil.get("provinceCount");
+//            List<DistrictDto> districtDtos = com.alibaba.fastjson.JSON.parseArray(count, DistrictDto.class);
+//            return BaseResponse.ok(StatusEnum.SUCCESS, districtDtos);
+//        }
         List<DistrictDto> districtDtos = new ArrayList<>();
         Calendar calendar = Calendar.getInstance();
         // 获取当前年
@@ -129,32 +129,34 @@ public class CountController {
         );
         if (ObjectUtils.isNotEmpty(list) && list.size() > 0) {
             for (NewSchooluser newSchooluser : list) {
+                if (ObjectUtils.isNotEmpty(newSchooluser)) {
                 DistrictDto districtDto = new DistrictDto();
 //                省份
-                String province = newSchooluser.getProvince();
-                long count = newSchooluserService.count(Wrappers.<NewSchooluser>lambdaQuery()
-                        .between(NewSchooluser::getGrade, oldYear, year)
-                        .eq(NewSchooluser::getProvince, province)
-                );
-                districtDto.setCount(count);
-                Province one = provinceService.getOne(Wrappers.<Province>lambdaQuery().eq(Province::getProvinceCode, province));
-
-                if (ObjectUtils.isNotEmpty(one)) {
-                    String provinceName = one.getProvinceName();
-                    districtDto.setProvince(provinceName);
-                    districtDtos.add(districtDto);
-                }
 
+                    String province = newSchooluser.getProvince();
+                    long count = newSchooluserService.count(Wrappers.<NewSchooluser>lambdaQuery()
+                            .between(NewSchooluser::getGrade, oldYear, year)
+                            .eq(NewSchooluser::getProvince, province)
+                    );
+                    districtDto.setCount(count);
+                    Province one = provinceService.getOne(Wrappers.<Province>lambdaQuery().eq(Province::getProvinceCode, province));
+
+                    if (ObjectUtils.isNotEmpty(one)) {
+                        String provinceName = one.getProvinceName();
+                        districtDto.setProvince(provinceName);
+                        districtDtos.add(districtDto);
+                    }
 
+                }
             }
         }
-        String jsonStr = null;
-        try {
-            jsonStr = objectMapper.writeValueAsString(districtDtos);	//areaList序列化为json字符串
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-        }
-        jedisUtil.setnx("provinceCount", jsonStr);
+//        String jsonStr = null;
+//        try {
+//            jsonStr = objectMapper.writeValueAsString(districtDtos);	//areaList序列化为json字符串
+//        } catch (JsonProcessingException e) {
+//            e.printStackTrace();
+//        }
+//        jedisUtil.setnx("provinceCount", jsonStr);
         return BaseResponse.ok(StatusEnum.SUCCESS, districtDtos);
     }
 

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

@@ -3,6 +3,7 @@ package com.chuanghai.student_portrait.controller;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.chuanghai.student_portrait.entity.OldSchooluser;
@@ -115,7 +116,7 @@ public class GetSchoolUserController {
 
     //获取组织架构成员
     @GetMapping("/list")
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     public List<String> getMessong(Integer page) throws JsonProcessingException {
         String token = this.token();
         String url = "https://open.wecard.qq.com/cgi-bin/user/get-org-users";
@@ -238,7 +239,7 @@ public class GetSchoolUserController {
     Integer i = 0;
 
     //
-//    @Scheduled(cron = "0 0/1 * * * ?  ")
+//    @Scheduled(cron = "0 0/1 * * * ? ")
     public void getSchoolUser() {
         i = i + 1;
         try {

src/main/java/com/chuanghai/student_portrait/entity/DormRx.java

@@ -4,7 +4,8 @@ import lombok.Data;
 
 @Data
 public class DormRx {
-    private int id;
+
+    private Integer id;
 
     private String build;
 

src/main/java/com/chuanghai/student_portrait/entity/NewSchooluser.java

@@ -60,6 +60,7 @@ private String dormNumber;
 //    准考证号
     private String headImage;
 
+
     @TableField(exist = false)
     private String[] label;
 

src/main/java/com/chuanghai/student_portrait/entity/VDzxxzlb.java

@@ -0,0 +1,21 @@
+package com.chuanghai.student_portrait.entity;
+
+import lombok.Data;
+
+@Data
+public class VDzxxzlb {
+    private String dzbh  ; // | 读者编号
+    private String dzzh  ; // | 读者账号
+    private String dzzhangh; //  | 读者证号
+    private String dzxm  ; // | 读者姓名
+    private Integer xb    ; // | 性别（0=男 1=女）
+    private String dwmc  ; // | 单位名称
+    private String yxmc  ; // | 院系名称
+    private String bjmc  ; // | 班级名称
+    private String zymc  ; // | 专业名称
+    private Integer dzlx  ; // | 读者类型
+    private String bzrq  ; // | 办证日期
+    private Integer dzzt  ; // | 读者状态（0注销, 1 正常, 2 挂失）
+    private String gxri  ; //  | 读者信息更新日期
+    private String zy    ;  // 职业
+}

src/main/java/com/chuanghai/student_portrait/entity/VJyls.java

@@ -0,0 +1,21 @@
+package com.chuanghai.student_portrait.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ *读者借阅历史 mysql3
+ */
+@Data
+public class VJyls {
+    public String dzbh;   //    读者编号
+    public Integer tsbh;   //   图书编号
+    public Date jcsk;   //    借出时间
+    public Date yhsk;  //     应还时间
+    public Date shsk;  //     实还时间
+    public Date xjrq;  //     续借日期
+    public Integer dzlxdm; //   读者类型代码
+    public Integer gcd;    //   馆藏地代码
+    public Integer jyid;  //    借阅记录唯一标识id
+}

src/main/java/com/chuanghai/student_portrait/mapper/VDzxxzlbMapper.java

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

src/main/java/com/chuanghai/student_portrait/mapper/VJylsMapper.java

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

src/main/java/com/chuanghai/student_portrait/service/VDzxxzlbService.java

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

src/main/java/com/chuanghai/student_portrait/service/VJylsService.java

@@ -0,0 +1,12 @@
+package com.chuanghai.student_portrait.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chuanghai.student_portrait.entity.VJyls;
+import com.chuanghai.student_portrait.entity.dto.PersonalTrackDto;
+
+import java.util.List;
+
+
+public interface VJylsService extends IService<VJyls> {
+    List<PersonalTrackDto> getDtos(String studentId, String beginTime, String endTime);
+}

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

@@ -39,7 +39,8 @@ public class ColdWaterServiceImpl extends ServiceImpl<ColdWaterMapper, ColdWater
     private Integer size = 8;
 
     //    20秒钟运行一次
-    @Scheduled(cron = "0 0/2 0 1 * ? ")
+//    @Scheduled(cron = "0 0/2 0 1 * ? ")
+    @Scheduled(cron = "* 0/2 * 1 * ? ")
 //    @Scheduled(cron = "0 0/1 * * * ? ")
     public void autoQueryOrder() {
         Page<Dorm> dormPage = dormService.page(new Page<Dorm>(page, size));
@@ -144,9 +145,10 @@ public class ColdWaterServiceImpl extends ServiceImpl<ColdWaterMapper, ColdWater
      * @param dateTime
      * @return
      */
-    public Boolean chackColdWaterActiveDateTime(String dateTime) {
+    public Boolean chackColdWaterActiveDateTime(String dateTime,String dom) {
         LambdaQueryWrapper<ColdWater> query = new LambdaQueryWrapper<>();
         query.eq(ColdWater::getDataTime, dateTime);
+        query.eq(ColdWater::getDom,dom);
         boolean exists = this.getBaseMapper().exists(query);
         return exists;
     }

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

@@ -600,7 +600,6 @@ public class ConsumeServicelmpl extends ServiceImpl<ConsumeMapper, Consume> impl
                 try {
                     Map<String, Object> jsonMap = mapper.readValue(JSONObject.toJSON(array).toString(), new TypeReference<Map<String, Object>>() {
                     });
-                    System.out.println("jsonMap = " + jsonMap);
                     Consume consume = new Consume();
                     String idCard = jsonMap.get("user_no").toString();
 //                    通过身份证号，查询该身份证号对应的id

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

@@ -2,9 +2,13 @@ package com.chuanghai.student_portrait.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.DormRx;
 import com.chuanghai.student_portrait.entity.Electricity;
 import com.chuanghai.student_portrait.mapper.DormRxMapper;
@@ -32,6 +36,9 @@ public class DormRxServiceImpl extends ServiceImpl<DormRxMapper, DormRx> impleme
     @Autowired
     ColdWaterServiceImpl coldWaterService;
 
+    private Integer page = 1;
+    private Integer size = 8;
+
 
     //完善瑞信房间表
     public void saveDormRx() {
@@ -69,8 +76,13 @@ public class DormRxServiceImpl extends ServiceImpl<DormRxMapper, DormRx> impleme
 
     }
 
+
+
+
+
     //  获取瑞信上个月的电费
-    @Scheduled(cron = "0 0 0 1 * ? ")
+//    @Scheduled(cron = "3 35 10 * * ? ")
+    @Scheduled(cron = "17 5 1 1 * ? ")
     public void electricitie() {
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime now = LocalDateTime.now();
@@ -80,7 +92,7 @@ public class DormRxServiceImpl extends ServiceImpl<DormRxMapper, DormRx> impleme
         String endTime = end.format(dateTimeFormatter);
 
         List<DormRx> list = this.list();
-
+        System.out.println("list.size() = " + list.size());
         ArrayList<Electricity> electricities = new ArrayList<>();
         for (DormRx dormRx : list) {
             String addrId = dormRx.getAddrId();
@@ -122,7 +134,7 @@ public class DormRxServiceImpl extends ServiceImpl<DormRxMapper, DormRx> impleme
         DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM");
         String format = end.format(dateTimeFormatter2);
 
-        Boolean aBoolean = electricityService.chackElectricityActiveDateTime(format);
+        Boolean aBoolean = electricityService.chackElectricityActiveDateTime(format,"17-101");
         if (!aBoolean) {
             electricityService.saveBatch(electricities);
         }
@@ -133,7 +145,8 @@ public class DormRxServiceImpl extends ServiceImpl<DormRxMapper, DormRx> impleme
     /**
      * 瑞信上月水费
      */
-    @Scheduled(cron = "0 0 1 1 * ? ")
+    @Scheduled(cron = "17 0 1 1 * ? ")
+//    @Scheduled(cron = "3 40 10 * * ? ")
     public void coldWater() {
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime now = LocalDateTime.now();
@@ -143,7 +156,7 @@ public class DormRxServiceImpl extends ServiceImpl<DormRxMapper, DormRx> impleme
         String endTime = end.format(dateTimeFormatter);
 
         List<DormRx> list = this.list();
-
+        System.out.println("list.size() = " + list.size());
         ArrayList<ColdWater> coldWaters = new ArrayList<>();
         for (DormRx dormRx : list) {
             String addrId = dormRx.getAddrId();
@@ -185,7 +198,7 @@ public class DormRxServiceImpl extends ServiceImpl<DormRxMapper, DormRx> impleme
         DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM");
         String format = end.format(dateTimeFormatter2);
 
-        Boolean aBoolean = coldWaterService.chackColdWaterActiveDateTime(format);
+        Boolean aBoolean = coldWaterService.chackColdWaterActiveDateTime(format,"17-101");
         if (!aBoolean) {
             coldWaterService.saveBatch(coldWaters);
         }

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

@@ -2,6 +2,7 @@ package com.chuanghai.student_portrait.service.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chuanghai.student_portrait.entity.Dorm;
 import com.chuanghai.student_portrait.mapper.DormMapper;
@@ -42,7 +43,7 @@ public class DormServiceImpl extends ServiceImpl<DormMapper, Dorm> implements Do
 //    }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     public List<Dorm> saveDorm() throws JsonProcessingException {
         List<Map<String, String>> doms = this.getDoms();
         ArrayList<Dorm> dorms = new ArrayList<>();

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

@@ -57,7 +57,8 @@ public class ElectricityServiceImpl extends ServiceImpl<ElectricityMapper, Elect
 
 
 
-    @Scheduled(cron = "0 0/3 0 1 * ? ")
+//    @Scheduled(cron = "0 0/3 0 1 * ? ")
+    @Scheduled(cron = "* 0/3 * 1 * ? ")
 //    @Scheduled(cron = "0 0/1 * * * ? ")
     public void autoQueryOrder() {
         Page<Dorm> dormPage = dormService.page(new Page<Dorm>(page, size));
@@ -163,9 +164,10 @@ public class ElectricityServiceImpl extends ServiceImpl<ElectricityMapper, Elect
      * @param dateTime
      * @return
      */
-    public Boolean chackElectricityActiveDateTime(String dateTime) {
+    public Boolean chackElectricityActiveDateTime(String dateTime,String dom) {
         LambdaQueryWrapper<Electricity> query = new LambdaQueryWrapper<>();
         query.eq(Electricity::getDateTime, dateTime);
+        query.eq(Electricity::getDom,dom);
         boolean exists = this.getBaseMapper().exists(query);
         return exists;
 

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

@@ -221,6 +221,8 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
         return BaseResponse.ok(StatusEnum.SUCCESS, accessCountDtos);
     }
 
+    @Autowired
+    VJylsService vJylsService;
     /**
      * 个人轨迹
      *
@@ -245,14 +247,19 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
         }
         DateTimeFormatter pattern = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime now = LocalDateTime.now();
-////        前七天
-//        String oldDay = now.minusDays(7).withHour(0).withMinute(0).withSecond(0).format(pattern);
-////        今天凌晨
-//        String nowDay = now.withHour(0).withMinute(0).withSecond(0).format(pattern);
+//        前七天
+        String oldDay = now.minusDays(7).withHour(0).withMinute(0).withSecond(0).format(pattern);
+//        今天凌晨
+        String nowDay = now.withHour(0).withMinute(0).withSecond(0).format(pattern);
 
-        ArrayList<PersonalTrackDto> personalTrackDtos = new ArrayList<>();
+        //获取图文信息
+        List<PersonalTrackDto> personalTrackDtos = vJylsService.getDtos(byId.getStudentId(), oldDay, nowDay);
+//        RestTemplate restTemplate = new RestTemplate();
+//        ResponseEntity<PersonalTrackDto> forEntity = restTemplate.getForEntity("http://192.168.161.224:8082/call/VJyls/getDto?studentId=" + byId.getStudentId() + "&beginTime=" + oldDay + "&endTime=" + nowDay, PersonalTrackDto.class);
+//
+//        ArrayList<PersonalTrackDto> personalTrackDtos = new ArrayList<>();
 //        获取人脸轨迹
-        List<FaceDiscern> list = this.list(Wrappers.<FaceDiscern>lambdaQuery()/*.between(FaceDiscern::getFacediscernTime, oldDay, nowDay)*/.eq(FaceDiscern::getShooluserId, id));
+        List<FaceDiscern> list = this.list(Wrappers.<FaceDiscern>lambdaQuery().between(FaceDiscern::getFacediscernTime, oldDay, nowDay).eq(FaceDiscern::getShooluserId, id));
         if (ObjectUtils.isNotEmpty(list) && list.size() > 0) {
             for (FaceDiscern faceDiscern : list) {
                 PersonalTrackDto dto = new PersonalTrackDto();
@@ -282,7 +289,7 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
                 personalTrackDtos.add(dto);
             }
         }
-        List<Access> accessList = accessService.list(Wrappers.<Access>lambdaQuery()/*.between(Access::getAccessTime, oldDay, nowDay)*/.eq(Access::getCardNumber, id));
+        List<Access> accessList = accessService.list(Wrappers.<Access>lambdaQuery().between(Access::getAccessTime, oldDay, nowDay).eq(Access::getCardNumber, id));
         if (ObjectUtils.isNotEmpty(accessList) && accessList.size() > 0) {
             for (Access access : accessList) {
                 PersonalTrackDto dto = new PersonalTrackDto();
@@ -304,7 +311,7 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
                 personalTrackDtos.add(dto);
             }
         }
-        List<HotWater> hotWaterList = hotWaterService.list(Wrappers.<HotWater>lambdaQuery()/*.between(HotWater::getHotwaterTime, oldDay, nowDay)*/.eq(HotWater::getCardNumber, id));
+        List<HotWater> hotWaterList = hotWaterService.list(Wrappers.<HotWater>lambdaQuery().between(HotWater::getHotwaterTime, oldDay, nowDay).eq(HotWater::getCardNumber, id));
         if (ObjectUtils.isNotEmpty(hotWaterList) && hotWaterList.size() > 0) {
             for (HotWater hotWater : hotWaterList) {
                 PersonalTrackDto dto = new PersonalTrackDto();
@@ -328,7 +335,7 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
                 personalTrackDtos.add(dto);
             }
         }
-        List<Consume> consumeList = consumeService.list(Wrappers.<Consume>lambdaQuery()/*.between(Consume::getConsumeTime, oldDay, nowDay)*/.eq(Consume::getIdCard, id));
+        List<Consume> consumeList = consumeService.list(Wrappers.<Consume>lambdaQuery().between(Consume::getConsumeTime, oldDay, nowDay).eq(Consume::getIdCard, id));
         if (ObjectUtils.isNotEmpty(consumeList) && consumeList.size() > 0) {
             for (Consume consume : consumeList) {
                 PersonalTrackDto dto = new PersonalTrackDto();
@@ -366,6 +373,11 @@ public class FaceDiscernServiceImpl extends ServiceImpl<FaceDiscernMapper, FaceD
                 personalTrackDtos.add(dto);
             }
         }
+//        获取图书信息
+
+
+
+
         Collections.sort(personalTrackDtos, Comparator.comparing((h) -> {
             return h.getDateTime();
         }));

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

@@ -1,5 +1,6 @@
 package com.chuanghai.student_portrait.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -32,7 +33,7 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
 
     Integer i = 0;
 
-//        @Scheduled(cron = "0 0/1 * * * ?")
+//    @Scheduled(cron = "0 0/1 * * * ?")
     public void getSchoolUser() {
         Page<OldSchooluser> page = this.page(new Page<>(i, 1000));
         long pages = page.getPages();
@@ -46,14 +47,17 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
 
     }
 
+
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
+    //只获取墨轩湖的学生，本科到大三都是墨轩湖
     public Boolean addNewSchooluser(Integer pg) {
         Calendar calendar = Calendar.getInstance();
         // 获取当前年份
         int year = calendar.get(Calendar.YEAR);
 // 获取当前月份
         int month = calendar.get(Calendar.MONTH) + 1;
+//      获取的是从本科大一到大四
         int oldYear = 0;
 
         if (month >= 7) {
@@ -63,7 +67,10 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
         }
         Page<OldSchooluser> page = this.page(new Page<OldSchooluser>(pg, 1000), Wrappers.<OldSchooluser>lambdaQuery()
                 .eq(OldSchooluser::getIdentityType, 1)
-                .between(OldSchooluser::getGrade, oldYear, year)
+                .between(OldSchooluser::getGrade, oldYear + 1, year)
+                .ne(OldSchooluser::getCollege, "继续教育学院")
+                .notLike(OldSchooluser::getProfession, "专")
+
         );
 //        总页数
         long pages = page.getPages();
@@ -117,6 +124,7 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
 //            头像
             newSchooluser.setHeadImage(oldSchooluser.getHeadImage());
 
+
             if (card != null && card.length() == 18) {
 //                获取身份证前2位
                 String province = card.substring(0, 2);
@@ -141,7 +149,6 @@ public class OldSchooluserServiceImpl extends ServiceImpl<OldSchooluserMapper, O
 
         }
 
-
         boolean b = newSchooluserService.saveBatch(newSchoolusers);
 
 

src/main/java/com/chuanghai/student_portrait/service/impl/VDzxxzlbServiceImpl.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.VDzxxzlb;
+import com.chuanghai.student_portrait.mapper.VDzxxzlbMapper;
+import com.chuanghai.student_portrait.service.VDzxxzlbService;
+import org.springframework.stereotype.Service;
+
+@Service
+@DS("mysql3")
+public class VDzxxzlbServiceImpl extends ServiceImpl<VDzxxzlbMapper, VDzxxzlb> implements VDzxxzlbService {
+}

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

@@ -0,0 +1,86 @@
+package com.chuanghai.student_portrait.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chuanghai.student_portrait.entity.VDzxxzlb;
+import com.chuanghai.student_portrait.entity.VJyls;
+import com.chuanghai.student_portrait.entity.dto.PersonConsumDto;
+import com.chuanghai.student_portrait.entity.dto.PersonalTrackDto;
+import com.chuanghai.student_portrait.mapper.VJylsMapper;
+import com.chuanghai.student_portrait.service.VDzxxzlbService;
+import com.chuanghai.student_portrait.service.VJylsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@DS("mysql3")
+public class VJylsServiceImpl extends ServiceImpl<VJylsMapper, VJyls> implements VJylsService {
+
+    @Autowired
+    VDzxxzlbService vDzxxzlbService;
+
+    /**
+     * 根据学号查询查阅图书内容
+     *
+     * @param studentId
+     * @return
+     */
+    @Override
+    public List<PersonalTrackDto> getDtos(String studentId, String beginTime, String endTime) {
+        ArrayList<PersonalTrackDto> personalTrackDtos = new ArrayList<>();
+        LambdaQueryWrapper<VDzxxzlb> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(VDzxxzlb::getDzzh, studentId);
+        VDzxxzlb one = vDzxxzlbService.getOne(wrapper);
+//        获取读者编号
+        if (ObjectUtils.isNotEmpty(one)) {
+            String dzbh = one.getDzbh();
+//            根据读者的编号获取借书
+            LambdaQueryWrapper<VJyls> Jwrapper = new LambdaQueryWrapper<>();
+            Jwrapper.eq(VJyls::getDzbh, dzbh)
+                    .between(VJyls::getJcsk, beginTime, endTime)
+                    .or()
+                    .eq(VJyls::getDzbh, dzbh)
+                    .between(VJyls::getXjrq, beginTime, endTime);
+            List<VJyls> list = this.list(Jwrapper);
+            if (ObjectUtils.isNotEmpty(list) && list.size() > 0) {
+                for (VJyls vJyls : list) {
+                    PersonalTrackDto personalTrackDto = new PersonalTrackDto();
+                    personalTrackDto.setDateTime(vJyls.getJcsk());
+                    personalTrackDto.setLongitude("897");
+                    personalTrackDto.setLatitude("421");
+                    personalTrackDto.setAffair("图文信息中心");
+                    personalTrackDto.setName("借书");
+                    personalTrackDtos.add(personalTrackDto);
+                }
+            }
+//            获取还书,实际还书时间
+            LambdaQueryWrapper<VJyls> Hwrapper=new LambdaQueryWrapper<>();
+            Hwrapper.eq(VJyls::getDzbh, dzbh)
+                    .between(VJyls::getShsk, beginTime, endTime);
+            List<VJyls> list1 = this.list(Hwrapper);
+            if (ObjectUtils.isNotEmpty(list1) && list1.size() > 0) {
+                for (VJyls vJyls : list1) {
+                    PersonalTrackDto personalTrackDto = new PersonalTrackDto();
+                    personalTrackDto.setDateTime(vJyls.getJcsk());
+                    personalTrackDto.setLongitude("897");
+                    personalTrackDto.setLatitude("421");
+                    personalTrackDto.setAffair("图文信息中心");
+                    personalTrackDto.setName("还书");
+                    personalTrackDtos.add(personalTrackDto);
+                }
+            }
+
+        }
+
+
+        return personalTrackDtos;
+    }
+
+
+}

src/main/resources/application.yml

@@ -38,6 +38,11 @@ spring:
           username: root
           password: Chuanghai_2021.
           driver-class-name: com.mysql.cj.jdbc.Driver
+        mysql3:
+          url: jdbc:mysql://172.16.40.249:3306/db_libsp_sync?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+          username: ods
+          password: '@ods123456'
+          driver-class-name: com.mysql.cj.jdbc.Driver
 
 
 

target/classes/application.yml

@@ -38,6 +38,11 @@ spring:
           username: root
           password: Chuanghai_2021.
           driver-class-name: com.mysql.cj.jdbc.Driver
+        mysql3:
+          url: jdbc:mysql://172.16.40.249:3306/db_libsp_sync?characterEncoding=utf-8&useSSL=FALSE&useAffectedRows=TRUE&allowMultiQueries=true&serverTimezone=GMT%2B8
+          username: ods
+          password: '@ods123456'
+          driver-class-name: com.mysql.cj.jdbc.Driver
 
 
 

target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Wed Sep 27 18:06:42 CST 2023
+#Wed Oct 25 09:15:51 CST 2023
 version=0.0.1-SNAPSHOT
 groupId=com.chuanghai
 artifactId=student_portrait

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

@@ -16,6 +16,7 @@ com\chuanghai\student_portrait\config\ChannelDetailInfos.class
 com\chuanghai\student_portrait\service\ConsumeService.class
 com\chuanghai\student_portrait\utils\ExcelUtil.class
 com\chuanghai\student_portrait\service\impl\ConsumeServicelmpl$1.class
+com\chuanghai\student_portrait\service\VDzxxzlbService.class
 com\chuanghai\student_portrait\utils\ReturnWXPush.class
 com\chuanghai\student_portrait\entity\OldSchooluser.class
 com\chuanghai\student_portrait\config\TokenConfig.class
@@ -38,11 +39,15 @@ com\chuanghai\student_portrait\service\impl\CoordServiceImpl.class
 com\chuanghai\student_portrait\service\CoordService.class
 com\chuanghai\student_portrait\service\impl\HotWaterServiceImpl.class
 com\chuanghai\student_portrait\mapper\NewSchooluserMapper.class
+com\chuanghai\student_portrait\mapper\VDzxxzlbMapper.class
 com\chuanghai\student_portrait\service\impl\AccessServiceImpl.class
 com\chuanghai\student_portrait\entity\Stall.class
 com\chuanghai\student_portrait\config\ScheduledTaskConfig.class
 com\chuanghai\student_portrait\service\impl\HotWaterServiceImpl$1.class
+com\chuanghai\student_portrait\service\VJylsService.class
 com\chuanghai\student_portrait\mapper\DormMapper.class
+com\chuanghai\student_portrait\service\impl\VDzxxzlbServiceImpl.class
+com\chuanghai\student_portrait\mapper\VJylsMapper.class
 com\chuanghai\student_portrait\service\impl\CapacityServiceImpl.class
 com\chuanghai\student_portrait\entity\ForeWarningEntity.class
 com\chuanghai\student_portrait\config\BaseClass.class
@@ -52,6 +57,7 @@ com\chuanghai\student_portrait\utils\vo\UniviewVO.class
 com\chuanghai\student_portrait\controller\LoginController.class
 com\chuanghai\student_portrait\entity\dto\DistrictDto.class
 com\chuanghai\student_portrait\mapper\AffinityScoreMapper.class
+com\chuanghai\student_portrait\entity\VJyls.class
 com\chuanghai\student_portrait\entity\dto\PersonConsumDto.class
 com\chuanghai\student_portrait\exception\ResultValue.class
 com\chuanghai\student_portrait\mapper\FaceDiscernMapper.class
@@ -65,6 +71,7 @@ com\chuanghai\student_portrait\controller\GetSchoolUserController$1.class
 com\chuanghai\student_portrait\exception\BizException.class
 com\chuanghai\student_portrait\controller\AffinityScoreController.class
 com\chuanghai\student_portrait\service\impl\DormServiceImpl.class
+com\chuanghai\student_portrait\service\impl\VJylsServiceImpl.class
 com\chuanghai\student_portrait\entity\City.class
 com\chuanghai\student_portrait\mapper\ConsumeMapper.class
 com\chuanghai\student_portrait\service\impl\NewSchooluserServiceImpl.class
@@ -131,6 +138,7 @@ com\chuanghai\student_portrait\utils\vo\SubscribePersonCondition.class
 com\chuanghai\student_portrait\entity\StructOfPeopleInSchool.class
 com\chuanghai\student_portrait\entity\AffinityScore.class
 com\chuanghai\student_portrait\entity\DormRx.class
+com\chuanghai\student_portrait\entity\VDzxxzlb.class
 com\chuanghai\student_portrait\config\PageConfig.class
 com\chuanghai\student_portrait\utils\LogUtils.class
 com\chuanghai\student_portrait\service\LoginService.class

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

@@ -3,6 +3,7 @@ E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\ex
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\AffinityScore.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\ProvinceMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\LoginMapper.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\VJylsMapper.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\ForewarningService.java
@@ -13,8 +14,10 @@ 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\config\ScheduledTaskConfig.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\utils\vo\UniviewVO.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\VJylsService.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\config\BaseClass.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\PersonConsumDto.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\VDzxxzlbMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\ColdWaterServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\DormMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\ConsumeMapper.java
@@ -68,6 +71,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\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\service\impl\VJylsServiceImpl.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\utils\ReturnWXPush.java
@@ -127,11 +131,13 @@ E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\co
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\CircumferenceController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\config\FacePassRecord.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\CapacityServiceImpl.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\VJyls.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\AirConditioningMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\ProvinceServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\config\ChannelDetailInfos.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\CityMapper.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\CityServiceImpl.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\service\impl\VDzxxzlbServiceImpl.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\controller\AirConditioningController.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\DormRx.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\dto\WeixiaoPushDTO.java
@@ -155,6 +161,8 @@ E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\ex
 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\entity\SecondFloorCanteen.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\service\VDzxxzlbService.java
+E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\entity\VDzxxzlb.java
 E:\company\student_portraits_api\src\main\java\com\chuanghai\student_portrait\mapper\SecondFloorCanteenMapper.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