From 38841d26587e26db1af3f96923126de6a646532c Mon Sep 17 00:00:00 2001 From: xuquan <1099815072@qq.com> Date: Thu, 11 Apr 2024 16:08:51 +0800 Subject: [PATCH] 修改提交 --- cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java | 43 ++++++++++++++++++++++++++++++------------- cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java | 9 ++++++++- cloud/dahua/src/main/java/com/example/dahua/service/UserOperateService.java | 8 ++++++-- cloud/dahua/src/main/java/com/example/dahua/service/imp/BaseService.java | 50 +++++++++++++++++++++++++++++++++++++++++++------- cloud/dahua/src/main/java/com/example/dahua/service/imp/UserOperateServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++---- cloud/dahua/src/main/resources/mapper/usermapper.xml | 39 +++++++++++++++++++++++++++++++++++++++ cloud/fIle-center/src/main/resources/application.yml | 4 ++-- cloud/haikangface/src/main/java/com/sincere/haikangface/CMSServer.java | 35 +++++++++++++---------------------- cloud/haikangface/src/main/java/com/sincere/haikangface/control/UserOperateController.java | 11 ++++++++++- cloud/haikangface/src/main/java/com/sincere/haikangface/service/UserOperateService.java | 9 +++++++++ cloud/haikangface/src/main/java/com/sincere/haikangface/service/impl/UserOperateServiceImpl.java | 25 ++++++++++++++++++++++--- cloud/haikangface/src/main/resources/application.yaml | 16 ++++++++++++++++ cloud/haikangface/src/main/resources/mapper/usermapper.xml | 2 +- cloud/quartz/src/main/resources/application.yaml | 51 ++++++++++++++++++++++++--------------------------- 14 files changed, 259 insertions(+), 83 deletions(-) diff --git a/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java b/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java index 8d18a79..2839faf 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java +++ b/cloud/dahua/src/main/java/com/example/dahua/control/UserOperateController.java @@ -91,15 +91,25 @@ public class UserOperateController { } @ApiOperation(value = "按班级指定下发") - @RequestMapping(value = "sendFaceByClassId", method = RequestMethod.POST) + @RequestMapping(value = "sendFaceByClassId", method = RequestMethod.GET) public void exportFace(@RequestParam("schoolId") Integer schoolId, @RequestParam(value = "classIds",required = false) String classIds, @RequestParam(value = "deviceIds",required = false) String deviceIds){ - userOperateService.sendFaceByClassId(schoolId,classIds,deviceIds); + userOperateService.sendFaceByClassId(schoolId,classIds,deviceIds,"",null); + } + + @ApiOperation(value = "按班级指定下发") + @RequestMapping(value = "sendFaceByClassId2", method = RequestMethod.GET) + public void sendFaceByClassId2(@RequestParam("schoolId") Integer schoolId, + @RequestParam(value = "classIds",required = false) String classIds, + @RequestParam(value = "studentType",required = false) Integer studentType, + @RequestParam(value = "sex",required = false) String sex, + @RequestParam(value = "deviceIds",required = false) String deviceIds){ + userOperateService.sendFaceByClassId(schoolId,classIds,deviceIds,sex,studentType); } @ApiOperation(value = "删除指定学校下无效人脸") - @RequestMapping(value = "deleteFaceByClassId", method = RequestMethod.POST) + @RequestMapping(value = "deleteFaceByClassId", method = RequestMethod.GET) public void exportFace(@RequestParam("schoolId") Integer schoolId, @RequestParam(value = "deviceIds",required = false) String deviceIds){ userOperateService.deleteFaceByClassId(schoolId,deviceIds); @@ -133,7 +143,7 @@ public class UserOperateController { public void importExcel(@RequestParam("schoolId") Integer schoolId, HttpServletRequest request, HttpServletResponse response){ - List> sheetList = userOperateService.exportStudent(schoolId,"188368,188369,188370,188371"); + List> sheetList = userOperateService.exportStudent(schoolId,"188368,188369,188370,188371",null,""); ExcelUtil2.exportExcelByEasyPoi(sheetList,"中意",request,response); } @@ -144,18 +154,25 @@ public class UserOperateController { } @ApiOperation(value = "下方指定卡号") - @RequestMapping(value = "sendCard", method = RequestMethod.POST) + @RequestMapping(value = "sendCard", method = RequestMethod.GET) public void exportFace(@RequestParam("cardNum") String cardNum,@RequestParam("schoolId") Integer schoolId, @RequestParam("deviceIds") String deviceIds){ userOperateService.sendCard(cardNum,schoolId,deviceIds); } -// @ApiOperation(value = "按班级指定下发") -// @RequestMapping(value = "sendFaceByRoomId", method = RequestMethod.POST) -// public void exportFace(@RequestParam("schoolId") Integer schoolId, -// @RequestParam(value = "classIds",required = false) String classIds, -// @RequestParam(value = "deviceIds",required = false) String deviceIds){ -//// userOperateService.sendFaceByRoomId(schoolId,classIds,deviceIds); -// r -// } + @ApiOperation(value = "按班级指定下发") + @RequestMapping(value = "sendFaceByRoomId", method = RequestMethod.GET) + public void exportFace(@RequestParam("schoolId") Integer schoolId, + @RequestParam("roomId") Integer roomId, + @RequestParam(value = "deviceIds",required = false) String deviceIds){ + userOperateService.sendFaceByRoomId(schoolId,roomId,deviceIds); + } + + @ApiOperation(value = "按关键字指定下发") + @RequestMapping(value = "sendFaceByKeyword", method = RequestMethod.GET) + public void sendFaceByKeyword(@RequestParam("schoolId") Integer schoolId, + @RequestParam("keyword") String keyword, + @RequestParam(value = "deviceIds",required = false) String deviceIds){ + userOperateService.sendFaceByKeyword(schoolId,keyword,deviceIds); + } } diff --git a/cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java b/cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java index 8a7e3e3..3aa1e9c 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java +++ b/cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java @@ -282,10 +282,17 @@ public interface UserDao { List queryStudentIdList(@Param("schoolId") Integer schoolId,@Param("roomId")Integer roomId); - List getStudentByClassId(@Param("schoolId") int schoolId,@Param("classIds") List classIds); + List getStudentByClassId(@Param("schoolId") int schoolId,@Param("classIds") List classIds, + @Param("studentType")Integer studentType,@Param("sexList") List sexList); + + List getStudentByKeyword(@Param("schoolId") int schoolId, @Param("keyword") String keyword); List getGroupByClassId(@Param("classId") Integer classId); + List getRoomBySchoolId(@Param("schoolId") Integer schoolId,@Param("groupId") Integer groupId); + + List getStudentByRoomIds(@Param("schoolId") Integer schoolId,@Param("pIdList") List pIdList); + void insertStudent(ImportStudent studentBak); List selectYxStudentList(@Param("sceneName") String sceneName,@Param("schoolId") Integer schoolId); diff --git a/cloud/dahua/src/main/java/com/example/dahua/service/UserOperateService.java b/cloud/dahua/src/main/java/com/example/dahua/service/UserOperateService.java index 7dc84bd..fac39f3 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/service/UserOperateService.java +++ b/cloud/dahua/src/main/java/com/example/dahua/service/UserOperateService.java @@ -25,7 +25,11 @@ public interface UserOperateService { * @param classIds * @param deviceIds */ - void sendFaceByClassId(Integer schoolId,String classIds,String deviceIds); + void sendFaceByClassId(Integer schoolId,String classIds,String deviceIds,String sex,Integer studentType); + + void sendFaceByRoomId(Integer schoolId,Integer roomId,String deviceIds); + + void sendFaceByKeyword(Integer schoolId,String keyword,String deviceIds); void deleteFaceByClassId(Integer schoolId,String deviceIds); @@ -42,5 +46,5 @@ public interface UserOperateService { void sendCard(String cardNum,Integer schoolId,String deviceIds); - List> exportStudent(Integer schoolId, String deviceIds); + List> exportStudent(Integer schoolId, String deviceIds,Integer studentType,String sex); } diff --git a/cloud/dahua/src/main/java/com/example/dahua/service/imp/BaseService.java b/cloud/dahua/src/main/java/com/example/dahua/service/imp/BaseService.java index e6af6ae..5fb9a13 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/service/imp/BaseService.java +++ b/cloud/dahua/src/main/java/com/example/dahua/service/imp/BaseService.java @@ -9,6 +9,7 @@ import com.example.dahua.xiananDao.SendRecordDao; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.text.SimpleDateFormat; @@ -132,15 +133,17 @@ public class BaseService { } } - public List getStudentByClassId(Integer schoolId,String classIds) { - List list = new ArrayList<>(); + public List getStudentByClassId(Integer schoolId,String classIds,Integer studentType,String sex) { + List classList = null; if(!StringUtils.isEmpty(classIds)){ - String[] msg = classIds.split(","); - for(String s : msg){ - list.add(Integer.valueOf(s)); - } + classList = Arrays.asList(classIds.split(",")); + } + List sexList = null; + if(org.apache.commons.lang3.StringUtils.isNotBlank(sex)){ + sexList = Arrays.asList(sex.split(",")) + .stream().map(Integer::parseInt).collect(Collectors.toList()); } - List students = userDao.getStudentByClassId(schoolId,list); + List students = userDao.getStudentByClassId(schoolId,classList,studentType,sexList); //去重重复数据 List studentList = students.stream().collect(Collectors.collectingAndThen( Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(StudentBean::getStudent_num))), ArrayList::new)); @@ -176,4 +179,37 @@ public class BaseService { Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ImportStudent::getCardNum))), ArrayList::new)); return teacherist; } + + /** + * 获取宿舍分组管理学生 + * @param schoolId + * @param roomId + * @return + */ + public List getStudentListByRoomId(Integer schoolId,Integer roomId) { + List rooms = userDao.getRoomBySchoolId(schoolId,roomId); + if(!CollectionUtils.isEmpty(rooms)) { + List pIdlIst = rooms.stream().distinct().collect(Collectors.toList()); + List studentBeans = userDao.getStudentByRoomIds(schoolId,pIdlIst); + //去重重复数据 + List studentList = studentBeans.stream().collect(Collectors.collectingAndThen( + Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(StudentBean::getStudent_num))), ArrayList::new)); + return studentList; + } + return null; + } + + /** + * 根据班级关键字获取学生数据信息 + * @param schoolId + * @param keyword + * @return + */ + public List getStudentByKeyword(Integer schoolId,String keyword) { + List students = userDao.getStudentByKeyword(schoolId,keyword); + //去重重复数据 + List studentList = students.stream().collect(Collectors.collectingAndThen( + Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(StudentBean::getStudent_num))), ArrayList::new)); + return studentList; + } } diff --git a/cloud/dahua/src/main/java/com/example/dahua/service/imp/UserOperateServiceImpl.java b/cloud/dahua/src/main/java/com/example/dahua/service/imp/UserOperateServiceImpl.java index 0b75fd0..073369f 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/service/imp/UserOperateServiceImpl.java +++ b/cloud/dahua/src/main/java/com/example/dahua/service/imp/UserOperateServiceImpl.java @@ -70,7 +70,7 @@ public class UserOperateServiceImpl implements UserOperateService { @Override - public void sendFaceByClassId(Integer schoolId,String classIds,String deviceIds) { + public void sendFaceByClassId(Integer schoolId,String classIds,String deviceIds,String sex,Integer studentType) { //下发设备集合 List deviceList = new ArrayList<>(); if(StringUtils.isEmpty(deviceIds)){ @@ -80,7 +80,39 @@ public class UserOperateServiceImpl implements UserOperateService { deviceList= new ArrayList<>(Arrays.asList(deviceArr)); } //根据类型获取下发用户信息 - List studentBeanList = baseService.getStudentByClassId(schoolId,classIds); + List studentBeanList = baseService.getStudentByClassId(schoolId,classIds,studentType,sex); + log.info("统计共有下发用户数量：{}",studentBeanList.size()); + //下發人臉 + sendFace(studentBeanList,deviceList,schoolId,2); + } + + @Override + public void sendFaceByRoomId(Integer schoolId,Integer roomId,String deviceIds) { + //下发设备集合 + List deviceList = null; + if(StringUtils.isEmpty(deviceIds)){ + deviceList = userDao.selectDeviceBySchoolId(schoolId); + }else{ + deviceList= Arrays.asList( deviceIds.split(",")); + } + //根据类型获取下发用户信息 + List studentBeanList = baseService.getStudentListByRoomId(schoolId,roomId); + log.info("统计共有下发用户数量：{}",studentBeanList.size()); + //下發人臉 + sendFace(studentBeanList,deviceList,schoolId,2); + } + + @Override + public void sendFaceByKeyword(Integer schoolId,String keyword,String deviceIds) { + //下发设备集合 + List deviceList = null; + if(StringUtils.isEmpty(deviceIds)){ + deviceList = userDao.selectDeviceBySchoolId(schoolId); + }else{ + deviceList= Arrays.asList( deviceIds.split(",")); + } + //根据类型获取下发用户信息 + List studentBeanList = baseService.getStudentByKeyword(schoolId,keyword); log.info("统计共有下发用户数量：{}",studentBeanList.size()); //下發人臉 sendFace(studentBeanList,deviceList,schoolId,2); @@ -325,11 +357,11 @@ public class UserOperateServiceImpl implements UserOperateService { @Override - public List> exportStudent(Integer schoolId,String classIds) { + public List> exportStudent(Integer schoolId,String classIds,Integer studentType,String sex) { // 将sheet1、sheet2使用得map进行包装 List> sheetsList = new ArrayList<>(); //根据类型获取下发用户信息 - List studentBeanList = baseService.getStudentByClassId(schoolId,classIds); + List studentBeanList = baseService.getStudentByClassId(schoolId,classIds,studentType,sex); log.info("统计共有下发用户数量：{}",studentBeanList.size()); List studentBeans = studentBeanList.stream().map(s->{ diff --git a/cloud/dahua/src/main/resources/mapper/usermapper.xml b/cloud/dahua/src/main/resources/mapper/usermapper.xml index 6c6a715..abcf341 100644 --- a/cloud/dahua/src/main/resources/mapper/usermapper.xml +++ b/cloud/dahua/src/main/resources/mapper/usermapper.xml @@ -49,8 +49,39 @@ and StudentId in (select student_id from SZ_V_School_Student where school_id= #{schoolId}) order by newid() + + + + + + diff --git a/cloud/quartz/src/main/resources/application.yaml b/cloud/quartz/src/main/resources/application.yaml index 3c4d8c9..34843f5 100644 --- a/cloud/quartz/src/main/resources/application.yaml +++ b/cloud/quartz/src/main/resources/application.yaml @@ -4,26 +4,23 @@ server: spring: application: name: quartz-server + datasource: + master: ## 查询 + username: szjxtuser + password: RQminVCJota3H1u8bBYH + jdbc-url: jdbc:sqlserver://116.62.155.137:33419;database=SmartAdmin + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + slave: ## 短信 + username: sa + password: qaz!@#0401 + jdbc-url: jdbc:sqlserver://60.190.202.38:49469;database=XST + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + yxy: ## 翼学云 + username: szyxt + password: QWer123$%^ + jdbc-url: jdbc:sqlserver://47.110.50.251:33419;database=SZYXT + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -datasource: - master: ## 查询 - username: szjxtuser - password: RQminVCJota3H1u8bBYH - jdbcUrl: jdbc:sqlserver://116.62.155.137:33419;database=SmartAdmin - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - slave: ## 短信 - username: sa - password: qaz!@#0401 - jdbcUrl: jdbc:sqlserver://60.190.202.38:49469;database=XST - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - yxy: ## 翼学云 - username: szyxt - password: QWer123$%^ - jdbcUrl: jdbc:sqlserver://47.110.50.251:33419;database=SZYXT -# username: SZJXTUSER -# password: xst200919 -# jdbcUrl: jdbc:sqlserver://60.190.202.57:14333;database=SZYXT - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver ##mybatis mybatis: mapper-locations: classpath:mapper/*.xml @@ -32,12 +29,12 @@ mybatis: ribbon: ReadTimeout: 50000 ConnectTimeout: 5000 -#eureka: -# instance: -# hostname: localhost -# lease-expiration-duration-in-seconds: 60 -# lease-renewal-interval-in-seconds: 10 -# client: -# service-url: -# defaultZone: http://121.40.109.21:8761/eureka/,http://121.40.109.21:8762/eureka/ +eureka: + instance: + hostname: localhost + lease-expiration-duration-in-seconds: 60 + lease-renewal-interval-in-seconds: 10 + client: + service-url: + defaultZone: http://localhost:8761/eureka/,http://localhost:8762/eureka/ -- libgit2 0.21.0