From 49d72e07df4a4c166417608ff5181b88baf2d48f Mon Sep 17 00:00:00 2001 From: 1099815072@qq.com <1099815072@qq.com> Date: Wed, 11 Nov 2020 13:56:10 +0800 Subject: [PATCH] 考勤代码修改 --- cloud/dahua/src/main/java/com/example/dahua/MyTask.java | 24 +++++++++++++----------- cloud/dahua/src/main/java/com/example/dahua/dao/SearchDao.java | 55 ------------------------------------------------------- cloud/dahua/src/main/java/com/example/dahua/dao/UserDao.java | 43 +++++++++++++++++++++++++++++++++++++++++++ cloud/dahua/src/main/java/com/example/dahua/dbconfig/MessageDataSourceConfig.java | 6 ------ cloud/dahua/src/main/java/com/example/dahua/xiananDao/SearchMapper.java | 13 +++++++++++++ cloud/dahua/src/main/resources/application.yml | 5 +++++ 6 files changed, 74 insertions(+), 72 deletions(-) delete mode 100644 cloud/dahua/src/main/java/com/example/dahua/dao/SearchDao.java create mode 100644 cloud/dahua/src/main/java/com/example/dahua/xiananDao/SearchMapper.java diff --git a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java index 84c3a93..cd0bba3 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/MyTask.java +++ b/cloud/dahua/src/main/java/com/example/dahua/MyTask.java @@ -1,20 +1,20 @@ package com.example.dahua; import com.example.dahua.bean.*; -import com.example.dahua.dao.SearchDao; import com.example.dahua.dao.UserDao; import com.example.dahua.lib.NetSDKLib; import com.example.dahua.lib.ToolKits; import com.example.dahua.lib.Utils; import com.example.dahua.module.AutoRegisterModule; -import com.example.dahua.module.FaceRecognitionModule; import com.example.dahua.module.GateModule; import com.example.dahua.module.LoginModule; import com.example.dahua.service.AttendanceService; import com.example.dahua.utils.DateUtils; import com.example.dahua.utils.FileUtils; +import com.example.dahua.xiananDao.SearchMapper; import com.example.dahua.xiananDao.SendRecordDao; import com.sun.jna.Pointer; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -32,6 +32,7 @@ import java.util.*; import java.util.List; @Component +@Slf4j public class MyTask implements ApplicationRunner { // 主动注册监听回调 @@ -59,7 +60,7 @@ public class MyTask implements ApplicationRunner { SendRecordDao sendRecordDao; @Autowired - SearchDao searchDao; + SearchMapper searchMapper; @Autowired UserDao userDao; @@ -390,7 +391,7 @@ public class MyTask implements ApplicationRunner { checkIn.setFunNo(8); checkIn.setFlag(eventType == 2 ? 1 : 0); checkIn.setCheckTime(eventTime); - searchDao.checkIn(checkIn); + searchMapper.checkIn(checkIn); if (checkIn.getIsSuccess() == 1) { //考勤成功 String content = "考勤成功！，设备：" + deviceId + "卡号：" + cardNo + "方向：" + (eventType == 1 ? "进门" : "出门") + "______" + eventTime; @@ -404,10 +405,10 @@ public class MyTask implements ApplicationRunner { } } else { //判断是否请假 - String studentNum = searchDao.checkLeave(cardNo); + String studentNum = userDao.checkLeave(cardNo); if (org.apache.commons.lang.StringUtils.isNotBlank(studentNum)) { //短信信息 - Message mobileMessage = searchDao.selectByParentMobile(cardNo); + Message mobileMessage = userDao.selectByParentMobile(cardNo); if (mobileMessage.getSchoolId() == 4) { //才发送短信 ShortMsg shortMsg = new ShortMsg(); @@ -421,18 +422,19 @@ public class MyTask implements ApplicationRunner { } else { shortMsg.setMsg(mobileMessage.getName() + "家长您好，你的孩子于" + DateUtils.date2String(new Date(), DateUtils.format2) + "请假后进校，请知晓；"); } - searchDao.insertMessage(shortMsg.getTableName(),shortMsg.getSchoolId()+"",shortMsg.getMobile(),shortMsg.getMsg()); + userDao.insertMessage(shortMsg.getTableName(),shortMsg.getSchoolId()+"",shortMsg.getMobile(),shortMsg.getMsg()); } } else { //若即不成功，也不是请假，则按刷卡异常处理 - User user = searchDao.selectUserByCardNum(cardNo).get(0); + User user = userDao.selectUserByCardNum(cardNo).get(0); if(user ==null ){ System.out.println("卡号"+cardNo+"没找到对应学生或老师"); } + int deviceType; if (deviceId.startsWith("ytj")){ - deviceId = "29"; + deviceType = 29; }else { - deviceId = "22"; + deviceType = 22; } //失败记录 SendRecordBean sendRecordBean = new SendRecordBean(); @@ -448,7 +450,7 @@ public class MyTask implements ApplicationRunner { sendRecordBean.setFailContent("人脸认证失败"); sendRecordBean.setDeviceID(deviceId); sendRecordDao.addFaceFail(sendRecordBean.getCustomerid(), sendRecordBean.getDeviceID(), sendRecordBean.getNum(), sendRecordBean.getName(), sendRecordBean.getTime(), - sendRecordBean.getSchoolName(), sendRecordBean.getImgPath(), sendRecordBean.getSchoolId(), sendRecordBean.getFailContent(), sendRecordBean.getFailType(), sendRecordBean.getUserType(), 22); + sendRecordBean.getSchoolName(), sendRecordBean.getImgPath(), sendRecordBean.getSchoolId(), sendRecordBean.getFailContent(), sendRecordBean.getFailType(), sendRecordBean.getUserType(), deviceType); } } } diff --git a/cloud/dahua/src/main/java/com/example/dahua/dao/SearchDao.java b/cloud/dahua/src/main/java/com/example/dahua/dao/SearchDao.java deleted file mode 100644 index 295a4a3..0000000 --- a/cloud/dahua/src/main/java/com/example/dahua/dao/SearchDao.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.example.dahua.dao; - -import com.example.dahua.bean.CheckIn; -import com.example.dahua.bean.Message; -import com.example.dahua.bean.User; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface SearchDao { - /** - * 考勤推送存储过程 - * @param checkIn - * @return - */ - int checkIn(CheckIn checkIn); - - /** - * 获取学生信息 - * @param cardNum - * @return - */ - List selectUserByCardNum(String cardNum); - - /** - * 获取卡号 - * @param cardNo - * @return - */ - @Select("select Top(1) StudentNum from HS_LeaveExaminePassList where StudentNum= #{cardNo} and GETDATE() ]]> LeaveTime and GETDATE() ReturnTime") - String checkLeave(@Param("cardNo") String cardNo); - - /** - * 获取学生父母电话 - * @param cardNo - * @return - */ - @Select("select school_id , ParentMobile , name from SZ_V_School_Student where student_num = #{cardNo}") - Message selectByParentMobile(@Param("cardNo") String cardNo); - - /** - * 插入短信发送表 - * @param tableName - * @param schoolId - * @param mobile - * @param msg - */ - @Select("insert into ${tableName} (SchoolID,Mobile,Msg,tdtype,Status,IsNeedSend,SendTime,intime) values (#{schoolId},#{mobile},#{msg},1,0,1,GETDATE(),GETDATE())") - void insertMessage(@Param("tableName") String tableName,@Param("schoolId") String schoolId,@Param("mobile") String mobile,@Param("msg") String msg); - - -} 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 8cd70d8..547fb6a 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 @@ -169,4 +169,47 @@ public interface UserDao { " where studentcode = #{studentcode} and school_id = #{school_id}\n" + ")") void updateStu(@Param("studentcode") String studentCode,@Param("httpUrl") String httpUrl,@Param("school_id")String school_id); + + /** + * 获取学生信息 + * @param cardNum + * @return + */ + @Select(" select school_id , class_id ,name ,student_id from\n" + + " (select top 1 b.school_id, b.class_id, b.name, student_id from SZ_V_Card a\n" + + " inner join SZ_V_School_Student b on a.user_id = b.student_id\n" + + " and b.role_state = 1 where a.type = 2 and a.num = #{cardNum}\n" + + " union\n" + + " select top 1 b.school_id, 0 as class_id, b.name,b.teacher_id as student_id from SZ_V_Card a\n" + + " inner join SZ_V_School_Teacher b on a.user_id = b.teacher_id\n" + + " and b.role_state = 1 where a.type = 0 and a.num = #{cardNum}\n" + + " ) x ") + List selectUserByCardNum(@Param("studentcode") String cardNum); + + /** + * 获取卡号 + * @param cardNo + * @return + */ + @Select("select Top(1) StudentNum from HS_LeaveExaminePassList where StudentNum= #{cardNo} and GETDATE() ]]> LeaveTime and GETDATE() ReturnTime") + String checkLeave(@Param("cardNo") String cardNo); + + /** + * 获取学生父母电话 + * @param cardNo + * @return + */ + @Select("select school_id , ParentMobile , name from SZ_V_School_Student where student_num = #{cardNo}") + Message selectByParentMobile(@Param("cardNo") String cardNo); + + /** + * 插入短信发送表 + * @param tableName + * @param schoolId + * @param mobile + * @param msg + */ + @Insert("insert into ${tableName} (SchoolID,Mobile,Msg,tdtype,Status,IsNeedSend,SendTime,intime) values (#{schoolId},#{mobile},#{msg},1,0,1,GETDATE(),GETDATE())") + void insertMessage(@Param("tableName") String tableName, @Param("schoolId") String schoolId, @Param("mobile") String mobile, @Param("msg") String msg); + } diff --git a/cloud/dahua/src/main/java/com/example/dahua/dbconfig/MessageDataSourceConfig.java b/cloud/dahua/src/main/java/com/example/dahua/dbconfig/MessageDataSourceConfig.java index ff010b6..1b80374 100644 --- a/cloud/dahua/src/main/java/com/example/dahua/dbconfig/MessageDataSourceConfig.java +++ b/cloud/dahua/src/main/java/com/example/dahua/dbconfig/MessageDataSourceConfig.java @@ -10,7 +10,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; @@ -35,9 +34,4 @@ public class MessageDataSourceConfig { } - @Bean - public JdbcTemplate campusJdbcTemplate(@Qualifier("messageDataSource") DataSource dataSource) { - return new JdbcTemplate(dataSource); - } - } diff --git a/cloud/dahua/src/main/java/com/example/dahua/xiananDao/SearchMapper.java b/cloud/dahua/src/main/java/com/example/dahua/xiananDao/SearchMapper.java new file mode 100644 index 0000000..6ae88d1 --- /dev/null +++ b/cloud/dahua/src/main/java/com/example/dahua/xiananDao/SearchMapper.java @@ -0,0 +1,13 @@ +package com.example.dahua.xiananDao; + +import com.example.dahua.bean.CheckIn; + +public interface SearchMapper { + /** + * 考勤推送存储过程 + * @param checkIn + * @return + */ + void checkIn(CheckIn checkIn); + +} diff --git a/cloud/dahua/src/main/resources/application.yml b/cloud/dahua/src/main/resources/application.yml index 33e9be8..98ca74f 100644 --- a/cloud/dahua/src/main/resources/application.yml +++ b/cloud/dahua/src/main/resources/application.yml @@ -41,8 +41,13 @@ mybatis: xiaoan: type-aliases-package: com.example.dahua.xiananDao mapper-locations: classpath:xiaoanmapper/*.xml + message: + type-aliases-package: com.example.dahua.dao + mapper-locations: classpath:mapper/*.xml config-location: classpath:mybatis-config.xml +#logging: +# config: classpath:logback-spring.xml #haikangpic: E:\wwwhtdocs\HFface\FaceLogs\ -- libgit2 0.21.0