溪鸭夏 %!s(int64=2) %!d(string=hai) anos
pai
achega
aea817c48f
Modificáronse 84 ficheiros con 1035 adicións e 816 borrados
  1. 359 282
      .idea/workspace.xml
  2. 7 3
      src/main/java/com/template/aop/LoginCheckAspect.java
  3. 4 1
      src/main/java/com/template/common/jh/SectionUtil.java
  4. 5 1
      src/main/java/com/template/common/utils/AesTestOne.java
  5. 7 2
      src/main/java/com/template/common/utils/AesUtils.java
  6. 7 2
      src/main/java/com/template/common/utils/ClassYear.java
  7. 9 5
      src/main/java/com/template/common/utils/CommonUtil.java
  8. 9 4
      src/main/java/com/template/common/utils/DBUtil.java
  9. 10 6
      src/main/java/com/template/common/utils/DateUtils.java
  10. 6 2
      src/main/java/com/template/common/utils/ExcelUtils.java
  11. 58 54
      src/main/java/com/template/common/utils/ExcelUtils2.java
  12. 5 1
      src/main/java/com/template/common/utils/GetCameraPreviewURL.java
  13. 5 3
      src/main/java/com/template/common/utils/HttpClientUtils.java
  14. 10 6
      src/main/java/com/template/common/utils/HttpsClient.java
  15. 5 3
      src/main/java/com/template/common/utils/Message.java
  16. 6 3
      src/main/java/com/template/common/utils/Message2.java
  17. 13 10
      src/main/java/com/template/common/utils/RSAUtils.java
  18. 10 4
      src/main/java/com/template/common/utils/RequestUtils.java
  19. 9 6
      src/main/java/com/template/common/utils/SendSms.java
  20. 13 8
      src/main/java/com/template/common/utils/TimeExchange.java
  21. 14 9
      src/main/java/com/template/common/utils/TimeExchange2.java
  22. 6 2
      src/main/java/com/template/common/utils/WxUtil.java
  23. 1 1
      src/main/java/com/template/common/utils/smsUtil.java
  24. 6 2
      src/main/java/com/template/controller/ExcelController.java
  25. 3 3
      src/main/java/com/template/controller/HikvisionController.java
  26. 4 1
      src/main/java/com/template/controller/RepairAdminController.java
  27. 8 4
      src/main/java/com/template/controller/ScheduleController.java
  28. 5 2
      src/main/java/com/template/controller/SmartAttendanceController.java
  29. 4 1
      src/main/java/com/template/controller/SmartAuthorGroupController.java
  30. 11 7
      src/main/java/com/template/controller/SmartClassController.java
  31. 5 1
      src/main/java/com/template/controller/SmartEvaluateStudentController.java
  32. 4 1
      src/main/java/com/template/controller/SmartFaceDiscernController.java
  33. 45 41
      src/main/java/com/template/controller/SmartUserController.java
  34. 32 29
      src/main/java/com/template/controller/SmartVisitorController.java
  35. 7 2
      src/main/java/com/template/controller/Task.java
  36. 12 9
      src/main/java/com/template/controller/WechatScanLoginController.java
  37. 5 2
      src/main/java/com/template/controller/WxGzhController.java
  38. 2 2
      src/main/java/com/template/services/impl/SmartFaceDiscernServiceImpl.java
  39. 4 2
      src/main/java/com/template/services/impl/SmartScoreManageServiceImpl.java
  40. 18 13
      src/main/java/com/template/services/impl/SmartUploadServiceImpl.java
  41. 11 8
      src/test/java/com/template/MybatisPlusApplicationTests.java
  42. 8 5
      src/test/java/com/template/WrapperTest.java
  43. BIN=BIN
      target/mybatis_plus-0.0.1-SNAPSHOT.jar.original
  44. 3 3
      wanzai/src/main/java/com/template/aop/LoginCheckAspect.java
  45. 1 1
      wanzai/src/main/java/com/template/common/jh/SectionUtil.java
  46. 1 1
      wanzai/src/main/java/com/template/common/utils/AesTestOne.java
  47. 2 2
      wanzai/src/main/java/com/template/common/utils/AesUtils.java
  48. 2 2
      wanzai/src/main/java/com/template/common/utils/ClassYear.java
  49. 5 5
      wanzai/src/main/java/com/template/common/utils/CommonUtil.java
  50. 4 4
      wanzai/src/main/java/com/template/common/utils/DBUtil.java
  51. 6 6
      wanzai/src/main/java/com/template/common/utils/DateUtils.java
  52. 2 2
      wanzai/src/main/java/com/template/common/utils/ExcelUtils.java
  53. 54 54
      wanzai/src/main/java/com/template/common/utils/ExcelUtils2.java
  54. 1 1
      wanzai/src/main/java/com/template/common/utils/GetCameraPreviewURL.java
  55. 2 2
      wanzai/src/main/java/com/template/common/utils/HttpClientUtils.java
  56. 6 6
      wanzai/src/main/java/com/template/common/utils/HttpsClient.java
  57. 2 2
      wanzai/src/main/java/com/template/common/utils/Message.java
  58. 3 3
      wanzai/src/main/java/com/template/common/utils/Message2.java
  59. 10 10
      wanzai/src/main/java/com/template/common/utils/RSAUtils.java
  60. 4 4
      wanzai/src/main/java/com/template/common/utils/RequestUtils.java
  61. 5 5
      wanzai/src/main/java/com/template/common/utils/SendSms.java
  62. 6 6
      wanzai/src/main/java/com/template/common/utils/TimeExchange.java
  63. 9 9
      wanzai/src/main/java/com/template/common/utils/TimeExchange2.java
  64. 2 2
      wanzai/src/main/java/com/template/common/utils/WxUtil.java
  65. 1 1
      wanzai/src/main/java/com/template/common/utils/smsUtil.java
  66. 2 2
      wanzai/src/main/java/com/template/controller/ExcelController.java
  67. 3 3
      wanzai/src/main/java/com/template/controller/HikvisionController.java
  68. 1 1
      wanzai/src/main/java/com/template/controller/RepairAdminController.java
  69. 4 4
      wanzai/src/main/java/com/template/controller/ScheduleController.java
  70. 2 2
      wanzai/src/main/java/com/template/controller/SmartAttendanceController.java
  71. 1 1
      wanzai/src/main/java/com/template/controller/SmartAuthorGroupController.java
  72. 7 7
      wanzai/src/main/java/com/template/controller/SmartClassController.java
  73. 1 1
      wanzai/src/main/java/com/template/controller/SmartEvaluateStudentController.java
  74. 1 1
      wanzai/src/main/java/com/template/controller/SmartFaceDiscernController.java
  75. 39 39
      wanzai/src/main/java/com/template/controller/SmartUserController.java
  76. 29 29
      wanzai/src/main/java/com/template/controller/SmartVisitorController.java
  77. 2 2
      wanzai/src/main/java/com/template/controller/Task.java
  78. 9 9
      wanzai/src/main/java/com/template/controller/WechatScanLoginController.java
  79. 2 2
      wanzai/src/main/java/com/template/controller/WxGzhController.java
  80. 2 2
      wanzai/src/main/java/com/template/services/impl/SmartFaceDiscernServiceImpl.java
  81. 1 1
      wanzai/src/main/java/com/template/services/impl/SmartScoreManageServiceImpl.java
  82. 13 13
      wanzai/src/main/java/com/template/services/impl/SmartUploadServiceImpl.java
  83. 8 8
      wanzai/src/test/java/com/template/MybatisPlusApplicationTests.java
  84. 5 5
      wanzai/src/test/java/com/template/WrapperTest.java

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 359 - 282
.idea/workspace.xml


+ 7 - 3
src/main/java/com/template/aop/LoginCheckAspect.java

@@ -5,6 +5,8 @@ import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
@@ -19,9 +21,11 @@ import org.springframework.stereotype.Component;
 @Order(0)//order的值越小,优先级越高 order如果不标注数字,默认最低优先级,因为其默认值是int最大值
 public class LoginCheckAspect {
 
+    private static Logger logger = LoggerFactory.getLogger(LoginCheckAspect.class);
+
     @Around("@annotation(com.template.annotation.UserLoginCheck)")
     public Object userLoginCheck(ProceedingJoinPoint process) throws Throwable {
-        System.out.println("用户登录检测机制");
+        logger.info("用户登录检测机制");
         if(1 == 1){
            //通过抛异常方式拦截
            // throw new Exception("非法登录");
@@ -34,12 +38,12 @@ public class LoginCheckAspect {
 
     @After("@annotation(com.template.annotation.UserLoginCheck)")
     public void test(){
-        System.out.println("测试After");
+        logger.info("测试After");
     }
 
     @Before("@annotation(com.template.annotation.UserLoginCheck)")
     public void test1(){
-        System.out.println("测试Before");
+        logger.info("测试Before");
     }
 
 }

+ 4 - 1
src/main/java/com/template/common/jh/SectionUtil.java

@@ -1,5 +1,8 @@
 package com.template.common.jh;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +13,7 @@ import java.util.List;
  * @time: 2020/3/1 15:05
  */
 public class SectionUtil {
+    private static Logger logger = LoggerFactory.getLogger(SectionUtil.class);
     //最小值
     private String min_entity;
     //最大值
@@ -236,7 +240,6 @@ public class SectionUtil {
         all.add(re3);
         all.add(re4);
         all.add(re5);
-        System.out.println(compareSection(all));
     }
 }
 

+ 5 - 1
src/main/java/com/template/common/utils/AesTestOne.java

@@ -2,6 +2,8 @@ package com.template.common.utils;
 
 import com.template.config.ControlConfig;
 import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.annotation.Resource;
 import javax.crypto.Cipher;
@@ -39,6 +41,8 @@ public class AesTestOne {
 
     private static IvParameterSpec iv;
 
+    private static Logger logger = LoggerFactory.getLogger(AesTestOne.class);
+
     /**
      * 解密方法
      * @param cipherStr Base64编码的加密字符串
@@ -80,6 +84,6 @@ public class AesTestOne {
 
     public static void main(String[] args) throws Exception {
         // URL解码
-        System.out.println("");
+        logger.info("");
     }
 }

+ 7 - 2
src/main/java/com/template/common/utils/AesUtils.java

@@ -1,7 +1,10 @@
 package com.template.common.utils;
 
+import com.template.controller.SmartUserController;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.util.encoders.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -20,6 +23,8 @@ import java.security.NoSuchAlgorithmException;
 @Slf4j
 public class AesUtils {
     private static String password = "52D04DC20036DBD8";
+
+    private static Logger logger = LoggerFactory.getLogger(AesUtils.class);
     /**
      * @Author liujun
      * @Description:
@@ -191,9 +196,9 @@ public class AesUtils {
                 "}";
         //加密
         String encryptString = AesUtils.encrypt("548903");
-        System.out.println("加密后字符串:"+encryptString);
+        logger.info("加密后字符串:"+encryptString);
         //解密
         String decryptString = AesUtils.decrypt(encryptString);
-        System.out.println("解密后字符串:"+decryptString);
+        logger.info("解密后字符串:"+decryptString);
     }
 }

+ 7 - 2
src/main/java/com/template/common/utils/ClassYear.java

@@ -1,9 +1,14 @@
 package com.template.common.utils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.time.LocalDate;
 import java.time.Year;
 
 public class ClassYear {
+    private static Logger logger = LoggerFactory.getLogger(ClassYear.class);
+
     public static void main(String[] args) {
         Integer stage = 9; // 替换为你想要获取入学年份的学段
         int currentYear = Year.now().getValue();
@@ -12,9 +17,9 @@ public class ClassYear {
         // 获取当前日期
         int admissionYear = getAdmissionYear(stage, currentYear, currentDate);
         if (admissionYear != -1) {
-            System.out.println("入学年份:" + admissionYear);
+            logger.info("入学年份:" + admissionYear);
         } else {
-            System.out.println("无法获取入学年份");
+            logger.info("无法获取入学年份");
         }
     }
 

+ 9 - 5
src/main/java/com/template/common/utils/CommonUtil.java

@@ -7,6 +7,8 @@ import com.template.model.pojo.RepairAdmin;
 import com.template.model.pojo.SmartDataSourceLog;
 import com.template.model.result.CommonResult;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
@@ -24,6 +26,8 @@ import java.util.regex.Pattern;
  **/
 @Slf4j
 public class CommonUtil {
+    private static Logger logger = LoggerFactory.getLogger(CommonUtil.class);
+
     /**
      * 检查字符串是否符合正则表达式
      */
@@ -106,18 +110,18 @@ public class CommonUtil {
         String ipAddress = null;
         try {
             ipAddress = request.getHeader("x-forwarded-for");
-            System.out.println("x-forwarded-for=" + ipAddress);
+            logger.info("x-forwarded-for=" + ipAddress);
             if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
                 ipAddress = request.getHeader("Proxy-Client-IP");
-                System.out.println("Proxy-Client-IP=" + ipAddress);
+                logger.info("Proxy-Client-IP=" + ipAddress);
             }
             if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
                 ipAddress = request.getHeader("WL-Proxy-Client-IP");
-                System.out.println("WL-Proxy-Client-IP=" + ipAddress);
+                logger.info("WL-Proxy-Client-IP=" + ipAddress);
             }
             if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
                 ipAddress = request.getRemoteAddr();
-                System.out.println("getRemoteAddr=" + ipAddress);
+                logger.info("getRemoteAddr=" + ipAddress);
                 if (ipAddress.equals("127.0.0.1")) {
                     // 根据网卡取本机配置的IP
                     InetAddress inet = null;
@@ -127,7 +131,7 @@ public class CommonUtil {
                         e.printStackTrace();
                     }
                     ipAddress = inet.getHostAddress();
-                    System.out.println("getHostAddress=" + ipAddress);
+                    logger.info("getHostAddress=" + ipAddress);
                 }
             }
             // 对于通过多个代理的情况,第一个IP为客户端真实IP,多个IP按照','分割

+ 9 - 4
src/main/java/com/template/common/utils/DBUtil.java

@@ -1,6 +1,10 @@
 package com.template.common.utils;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,6 +25,7 @@ public class DBUtil {
             "&rewriteBatchedStatements=true" +
             "&serverTimezone=Asia/Shanghai";
 
+    private static Logger logger = LoggerFactory.getLogger(DBUtil.class);
 
     public DBUtil(String url, String user, String password, String driver, String charset) {
         this.url = url;
@@ -159,7 +164,7 @@ public class DBUtil {
             while (tables.next()) {
                 String tableName = tables.getString("TABLE_NAME");
                 String comment = getTableComment(metaData, tableName);
-                System.out.println(tableName + "[" + comment + "]");
+                logger.info(tableName + "[" + comment + "]");
                 list.add(tableName + "[" + comment + "]");
             }
 
@@ -240,7 +245,7 @@ public class DBUtil {
                 rs.close();
             } catch (SQLException e) {
                 e.printStackTrace();
-                System.out.println(e.getMessage());
+                logger.info(e.getMessage());
             }
         }
     }
@@ -251,7 +256,7 @@ public class DBUtil {
                 stmt.close();
             } catch (SQLException e) {
                 e.printStackTrace();
-                System.out.println(e.getMessage());
+                logger.info(e.getMessage());
             }
         }
     }
@@ -262,7 +267,7 @@ public class DBUtil {
                 conn.close();
             } catch (SQLException e) {
                 e.printStackTrace();
-                System.out.println(e.getMessage());
+                logger.info(e.getMessage());
             }
         }
     }

+ 10 - 6
src/main/java/com/template/common/utils/DateUtils.java

@@ -1,5 +1,7 @@
 package com.template.common.utils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.sql.Timestamp;
@@ -12,7 +14,7 @@ import java.util.GregorianCalendar;
 /**
  * <p>Title: DateUtils</p>
  * <p>Description:日期工具类 </p>
- * 
+ *
  * @author fengyong
  * @date 2018年9月7日
  */
@@ -24,9 +26,11 @@ public class DateUtils {
 	 */
 	public static final String DEFAULT_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
+	private static Logger logger = LoggerFactory.getLogger(DateUtils.class);
+
 	/**
 	 * 如2018 0901 232211(年月日时分秒)
-	 * 
+	 *
 	 * @return
 	 */
 	public String yyyyMMddHHmmss() {
@@ -36,7 +40,7 @@ public class DateUtils {
 
 	/**
 	 * 如20180901
-	 * 
+	 *
 	 * @return
 	 */
 	public static String getYYYYMMdd() {
@@ -111,7 +115,7 @@ public class DateUtils {
 
 	/**
 	 * 字符串转换成日期
-	 * 
+	 *
 	 * @param str 字符串
 	 * @param format 日期格式
 	 * @return 日期
@@ -234,8 +238,8 @@ public class DateUtils {
 	}
 
 	public static void main(String[] args) {
-		System.out.println(getrightDate("2018-09", 4));
-		System.out.println(date2Str(getnextLast("2018-09", 4), "yyyy-MM"));
+		logger.info(getrightDate("2018-09", 4));
+		logger.info(date2Str(getnextLast("2018-09", 4), "yyyy-MM"));
 	}
 
 }

+ 6 - 2
src/main/java/com/template/common/utils/ExcelUtils.java

@@ -2,6 +2,8 @@ package com.template.common.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.system.ApplicationHome;
 
 import javax.servlet.http.HttpServletResponse;
@@ -17,6 +19,8 @@ import java.net.URLEncoder;
  */
 @Slf4j
 public class ExcelUtils {
+    private static Logger logger = LoggerFactory.getLogger(ExcelUtils.class);
+
     public static void fileDownload(String fileName, HttpServletResponse response) {
         try {
             ApplicationHome applicationHome = new ApplicationHome(ExcelUtils.class);
@@ -42,7 +46,7 @@ public class ExcelUtils {
             out.close();
             inputStream.close();
         } catch (IOException ex) {
-            System.out.println("模板导出失败:" + ex.getMessage());
+            logger.info("模板导出失败:" + ex.getMessage());
             ex.printStackTrace();
         }
     }
@@ -57,7 +61,7 @@ public class ExcelUtils {
             out.flush();
             out.close();
         } catch (IOException ex) {
-            System.out.println("模板导出失败:" + ex.getMessage());
+            logger.info("模板导出失败:" + ex.getMessage());
             ex.printStackTrace();
         }
     }

+ 58 - 54
src/main/java/com/template/common/utils/ExcelUtils2.java

@@ -1,9 +1,10 @@
 package com.template.common.utils;
- 
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.template.annotation.ExcelExport;
 import com.template.annotation.ExcelImport;
+import com.template.controller.SmartFaceDiscernController;
 import org.apache.poi.hssf.usermodel.HSSFDataValidation;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@@ -14,8 +15,10 @@ import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
- 
+
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -28,17 +31,18 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
- 
+
 /**
  * Excel导入导出工具类
- * 
+ *
  *
  * @author sunnyzyq
  * @date 2021/12/17
  */
 @SuppressWarnings("unused")
 public class ExcelUtils2 {
- 
+
+    private static Logger logger = LoggerFactory.getLogger(ExcelUtils2.class);
     private static final String XLSX = ".xlsx";
     private static final String XLS = ".xls";
     public static final String ROW_MERGE = "row_merge";
@@ -55,34 +59,34 @@ public class ExcelUtils2 {
     private static final char LEAN_LINE = '/';
     private static final int BYTES_DEFAULT_LENGTH = 10240;
     private static final NumberFormat NUMBER_FORMAT = NumberFormat.getNumberInstance();
- 
- 
+
+
     public static <T> List<T> readFile(File file, Class<T> clazz) throws Exception {
         JSONArray array = readFile(file);
         return getBeanList(array, clazz);
     }
- 
+
     public static <T> List<T> readMultipartFile(MultipartFile mFile, Class<T> clazz) throws Exception {
         JSONArray array = readMultipartFile(mFile);
         return getBeanList(array, clazz);
     }
- 
+
     public static JSONArray readFile(File file) throws Exception {
         return readExcel(null, file);
     }
- 
+
     public static JSONArray readMultipartFile(MultipartFile mFile) throws Exception {
         return readExcel(mFile, null);
     }
- 
+
     public static Map<String, JSONArray> readFileManySheet(File file) throws Exception {
         return readExcelManySheet(null, file);
     }
- 
+
     public static Map<String, JSONArray> readFileManySheet(MultipartFile file) throws Exception {
         return readExcelManySheet(file, null);
     }
- 
+
     private static <T> List<T> getBeanList(JSONArray array, Class<T> clazz) throws Exception {
         List<T> list = new ArrayList<>();
         Map<Integer, String> uniqueMap = new HashMap<>(16);
@@ -91,7 +95,7 @@ public class ExcelUtils2 {
         }
         return list;
     }
- 
+
     /**
      * 获取每个对象的数据
      */
@@ -159,7 +163,7 @@ public class ExcelUtils2 {
         }
         return t;
     }
- 
+
     private static <T> void setFieldValue(T t, Field field, JSONObject obj, StringBuilder uniqueBuilder, List<String> errMsgList) {
         // 获取 ExcelImport 注解属性
         ExcelImport annotation = field.getAnnotation(ExcelImport.class);
@@ -245,7 +249,7 @@ public class ExcelUtils2 {
             e.printStackTrace();
         }
     }
- 
+
     private static Map<String, JSONArray> readExcelManySheet(MultipartFile mFile, File file) throws IOException {
         Workbook book = getWorkbook(mFile, file);
         if (book == null) {
@@ -260,7 +264,7 @@ public class ExcelUtils2 {
         book.close();
         return map;
     }
- 
+
     private static JSONArray readExcel(MultipartFile mFile, File file) throws IOException {
         Workbook book = getWorkbook(mFile, file);
         if (book == null) {
@@ -270,7 +274,7 @@ public class ExcelUtils2 {
         book.close();
         return array;
     }
- 
+
     private static Workbook getWorkbook(MultipartFile mFile, File file) throws IOException {
         boolean fileNotExist = (file == null || !file.exists());
         if (mFile == null && fileNotExist) {
@@ -300,7 +304,7 @@ public class ExcelUtils2 {
         in.close();
         return book;
     }
- 
+
     private static JSONArray readSheet(Sheet sheet) {
         // 首行下标
         int rowStart = sheet.getFirstRowNum();
@@ -358,7 +362,7 @@ public class ExcelUtils2 {
         }
         return array;
     }
- 
+
     private static String getCellValue(Cell cell) {
         // 空白或空
         if (cell == null || cell.getCellTypeEnum() == CellType.BLANK) {
@@ -389,21 +393,21 @@ public class ExcelUtils2 {
         // 错误类型
         return cell.getCellFormula();
     }
- 
+
     public static <T> void exportTemplate(HttpServletResponse response, String fileName, Class<T> clazz) {
         exportTemplate(response, fileName, fileName, clazz, false);
     }
- 
+
     public static <T> void exportTemplate(HttpServletResponse response, String fileName, String sheetName,
                                           Class<T> clazz) {
         exportTemplate(response, fileName, sheetName, clazz, false);
     }
- 
+
     public static <T> void exportTemplate(HttpServletResponse response, String fileName, Class<T> clazz,
                                           boolean isContainExample) {
         exportTemplate(response, fileName, fileName, clazz, isContainExample);
     }
- 
+
     public static <T> void exportTemplate(HttpServletResponse response, String fileName, String sheetName,
                                           Class<T> clazz, boolean isContainExample) {
         // 获取表头字段
@@ -429,7 +433,7 @@ public class ExcelUtils2 {
         // 导出数据
         export(response, fileName, sheetName, sheetDataList, selectMap);
     }
- 
+
     private static <T> List<ExcelClassField> getExcelClassFieldList(Class<T> clazz) {
         // 解析所有字段
         Field[] fields = clazz.getDeclaredFields();
@@ -467,7 +471,7 @@ public class ExcelUtils2 {
         }
         return headFieldList;
     }
- 
+
     private static ExcelClassField getExcelClassField(Field field) {
         ExcelClassField cf = new ExcelClassField();
         String fieldName = field.getName();
@@ -499,7 +503,7 @@ public class ExcelUtils2 {
         cf.setKvMap(getKvMap(kv));
         return cf;
     }
- 
+
     private static LinkedHashMap<String, String> getKvMap(String kv) {
         LinkedHashMap<String, String> kvMap = new LinkedHashMap<>();
         if (kv.isEmpty()) {
@@ -523,7 +527,7 @@ public class ExcelUtils2 {
         }
         return kvMap;
     }
- 
+
     /**
      * 导出表格到本地
      *
@@ -532,7 +536,7 @@ public class ExcelUtils2 {
      */
     public static void exportFile(File file, List<List<Object>> sheetData) {
         if (file == null) {
-            System.out.println("文件创建失败");
+            logger.info("文件创建失败");
             return;
         }
         if (sheetData == null) {
@@ -542,7 +546,7 @@ public class ExcelUtils2 {
         map.put(file.getName(), sheetData);
         export(null, file, file.getName(), map, null);
     }
- 
+
     /**
      * 导出表格到本地
      *
@@ -558,7 +562,7 @@ public class ExcelUtils2 {
         exportFile(file, sheetData);
         return file;
     }
- 
+
     /**
      * 获取文件
      *
@@ -587,7 +591,7 @@ public class ExcelUtils2 {
                 fileFullPath = dirPath + LEAN_LINE + fileName + XLSX;
             }
         }
-        System.out.println(fileFullPath);
+        logger.info(fileFullPath);
         File file = new File(fileFullPath);
         if (!file.exists()) {
             boolean result = file.createNewFile();
@@ -597,7 +601,7 @@ public class ExcelUtils2 {
         }
         return file;
     }
- 
+
     private static <T> List<List<Object>> getSheetData(List<T> list) {
         // 获取表头字段
         List<ExcelClassField> excelClassFieldList = getExcelClassFieldList(list.get(0).getClass());
@@ -645,7 +649,7 @@ public class ExcelUtils2 {
         }
         return sheetDataList;
     }
- 
+
     private static <T> Map<String, Object> getFieldDataMap(T t) {
         Map<String, Object> map = new HashMap<>();
         Field[] fields = t.getClass().getDeclaredFields();
@@ -661,7 +665,7 @@ public class ExcelUtils2 {
         }
         return map;
     }
- 
+
     public static void exportEmpty(HttpServletResponse response, String fileName) {
         List<List<Object>> sheetDataList = new ArrayList<>();
         List<Object> headList = new ArrayList<>();
@@ -669,29 +673,29 @@ public class ExcelUtils2 {
         sheetDataList.add(headList);
         export(response, fileName, sheetDataList);
     }
- 
+
     public static void export(HttpServletResponse response, String fileName, List<List<Object>> sheetDataList) {
         export(response, fileName, fileName, sheetDataList, null);
     }
- 
+
     public static void exportManySheet(HttpServletResponse response, String fileName, Map<String, List<List<Object>>> sheetMap) {
         export(response, null, fileName, sheetMap, null);
     }
- 
- 
+
+
     public static void export(HttpServletResponse response, String fileName, String sheetName,
                               List<List<Object>> sheetDataList) {
         export(response, fileName, sheetName, sheetDataList, null);
     }
- 
+
     public static void export(HttpServletResponse response, String fileName, String sheetName,
                               List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
- 
+
         Map<String, List<List<Object>>> map = new HashMap<>();
         map.put(sheetName, sheetDataList);
         export(response, null, fileName, map, selectMap);
     }
- 
+
     public static <T, K> void export(HttpServletResponse response, String fileName, List<T> list, Class<K> template) {
         // list 是否为空
         boolean lisIsEmpty = list == null || list.isEmpty();
@@ -709,11 +713,11 @@ public class ExcelUtils2 {
         List<List<Object>> sheetDataList = getSheetData(list);
         export(response, fileName, sheetDataList);
     }
- 
+
     public static void export(HttpServletResponse response, String fileName, List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
         export(response, fileName, fileName, sheetDataList, selectMap);
     }
- 
+
     private static void export(HttpServletResponse response, File file, String fileName,
                                Map<String, List<List<Object>>> sheetMap, Map<Integer, List<String>> selectMap) {
         // 整个 Excel 表格 book 对象
@@ -791,7 +795,7 @@ public class ExcelUtils2 {
             }
         }
     }
- 
+
     /**
      * 合并当前Sheet页的单元格
      *
@@ -855,7 +859,7 @@ public class ExcelUtils2 {
             }
         }
     }
- 
+
     private static void write(HttpServletResponse response, SXSSFWorkbook book, String fileName) throws IOException {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
@@ -866,7 +870,7 @@ public class ExcelUtils2 {
         out.flush();
         out.close();
     }
- 
+
     private static int setCellValue(Cell cell, Object o, CellStyle style) {
         // 设置样式
         cell.setCellStyle(style);
@@ -925,7 +929,7 @@ public class ExcelUtils2 {
         cell.setCellValue(o.toString());
         return CELL_OTHER;
     }
- 
+
     private static void setCellPicture(SXSSFWorkbook wb, Row sr, Drawing<?> patriarch, int x, int y, URL url) {
         // 设置图片宽高
         sr.setHeight((short) (IMG_WIDTH * IMG_HEIGHT));
@@ -945,7 +949,7 @@ public class ExcelUtils2 {
             e.printStackTrace();
         }
     }
- 
+
     private static String formatDate(Date date) {
         if (date == null) {
             return "";
@@ -953,7 +957,7 @@ public class ExcelUtils2 {
         SimpleDateFormat format = new SimpleDateFormat(DATE_FORMAT);
         return format.format(date);
     }
- 
+
     private static void setSelect(Sheet sheet, Map<Integer, List<String>> selectMap) {
         if (selectMap == null || selectMap.isEmpty()) {
             return;
@@ -982,7 +986,7 @@ public class ExcelUtils2 {
             sheet.addValidationData(dv);
         }
     }
- 
+
     private static boolean isNumeric(String str) {
         if (Objects.nonNull(str) && "0.0".equals(str)) {
             return true;
@@ -994,7 +998,7 @@ public class ExcelUtils2 {
         }
         return true;
     }
- 
+
     private static String getString(String s) {
         if (s == null) {
             return "";
@@ -1004,5 +1008,5 @@ public class ExcelUtils2 {
         }
         return s.trim();
     }
- 
-}
+
+}

+ 5 - 1
src/main/java/com/template/common/utils/GetCameraPreviewURL.java

@@ -9,6 +9,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,6 +19,8 @@ import java.util.Map;
  * 调用海康接口工具类
  */
 public class GetCameraPreviewURL {
+    private static Logger logger = LoggerFactory.getLogger(GetCameraPreviewURL.class);
+
     public GetCameraPreviewURL() {
     }
 
@@ -107,6 +111,6 @@ public class GetCameraPreviewURL {
 //        String result = CameraPreviewURL("/api/eventService/v1/eventUnSubscriptionByEventTypes", jsonBody);
 
 
-        System.out.println("result结果示例: " + result);
+        logger.info("result结果示例: " + result);
     }
 }

+ 5 - 3
src/main/java/com/template/common/utils/HttpClientUtils.java

@@ -15,6 +15,8 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.URL;
@@ -29,7 +31,7 @@ import java.util.Map;
  * @date 2018年9月7日
  */
 public class HttpClientUtils {
-
+	private static Logger logger = LoggerFactory.getLogger(HttpClientUtils.class);
 	/**
 	 * 默认参数设置
 	 * setConnectTimeout:设置连接超时时间,单位毫秒。
@@ -117,12 +119,12 @@ public class HttpClientUtils {
 			long execStart = System.currentTimeMillis();
 			response = httpClient.execute(httpPost);
 			long execEnd = System.currentTimeMillis();
-			System.out.println("=================执行post请求耗时:"+(execEnd-execStart)+"ms");
+			logger.info("=================执行post请求耗时:"+(execEnd-execStart)+"ms");
 			long getStart = System.currentTimeMillis();
 			entity = response.getEntity();
 			responseContent = EntityUtils.toString(entity, "UTF-8");
 			long getEnd = System.currentTimeMillis();
-			System.out.println("=================获取响应结果耗时:"+(getEnd-getStart)+"ms");
+			logger.info("=================获取响应结果耗时:"+(getEnd-getStart)+"ms");
 		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {

+ 10 - 6
src/main/java/com/template/common/utils/HttpsClient.java

@@ -18,6 +18,8 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
@@ -54,6 +56,8 @@ public class HttpsClient {
      */
     private static Integer READ_TIMEOUT = WxConfig.readTimeout;
 
+    private static Logger logger = LoggerFactory.getLogger( HttpsClient.class);
+
     /**
      * 发起https请求
      * @param requestUrl 请求地址
@@ -63,7 +67,7 @@ public class HttpsClient {
      */
     public static JSONObject httpsRequestReturnJSONObject(String requestUrl, String requestMethod, String postData) throws Exception{
         JSONObject  jsonObject = JSONObject.parseObject(HttpsClient.httpsRequestReturnString(requestUrl,requestMethod,postData));
-        System.out.println("jsonObjectDate:  " + jsonObject);
+        logger.info("jsonObjectDate:  " + jsonObject);
         return jsonObject;
     }
 
@@ -200,7 +204,7 @@ public class HttpsClient {
                 url.openConnection();
         httpConn.setRequestMethod("GET");
         httpConn.connect();
-        System.out.println("bbb: "+httpConn.getResponseCode());
+        logger.info("bbb: "+httpConn.getResponseCode());
         BufferedReader reader = new BufferedReader(new InputStreamReader(
                 httpConn.getInputStream(),"utf-8"));
         String line;
@@ -320,7 +324,7 @@ public class HttpsClient {
                 result += line;
             }
         } catch (Exception e) {
-            System.out.println("发送 请求出现异常!" + e);
+            logger.info("发送 请求出现异常!" + e);
             e.printStackTrace();
         }
         // 使用finally块来关闭输出流、输入流
@@ -385,7 +389,7 @@ public class HttpsClient {
                 result = "获取输入流异常!";
             }
         } catch (Exception e) {
-            System.out.println("发送 请求出现异常!" + e);
+            logger.info("发送 请求出现异常!" + e);
             e.printStackTrace();
         }
         // 使用finally块来关闭输出流、输入流
@@ -449,7 +453,7 @@ public class HttpsClient {
             // 读取响应
             is = connection.getInputStream();
             int length = (int) connection.getContentLength();// 获取字节长度
-//            System.out.println(length);
+//            logger.info(length);
             if (length != -1) {
                 byte[] data = new byte[length];
                 byte[] temp = new byte[512];
@@ -525,6 +529,6 @@ public class HttpsClient {
         json.put("energyType", "2");
         json.put("updateTime", "2021-09-09 10:15:33");
         String msg = sendJson2("https://chtech.ncjti.edu.cn/bigdata-api/api/energy/energyDataUpload", json);
-        System.out.println(msg);
+        logger.info(msg);
     }
 }

+ 5 - 3
src/main/java/com/template/common/utils/Message.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 import java.util.ArrayList;
@@ -12,7 +14,7 @@ import java.util.Map;
 
 // 小程序消息通知
 public class Message {
-
+    private static Logger logger = LoggerFactory.getLogger(Message.class);
     /**
      * hotel_name酒店名称
      * order_status订单状态,用中文表示
@@ -67,7 +69,7 @@ public class Message {
         data.put("thing27",thing27);
         message.put("data", data);
         String msg = HttpsClient.sendJson("https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+token, message);
-        System.out.println("小程序端消息发生:"+msg);
+        logger.info("小程序端消息发生:"+msg);
         return msg;
     }
 
@@ -542,7 +544,7 @@ public class Message {
 
 
     public static void main(String[] args) throws Exception {
-        System.out.println(send("ou2uV5DGDxJ7BouxiAZZigGQFIHU","测试","测试",
+        logger.info(send("ou2uV5DGDxJ7BouxiAZZigGQFIHU","测试","测试",
                 "2023-08-25","2023-08-26","cesss"));
     }
 }

+ 6 - 3
src/main/java/com/template/common/utils/Message2.java

@@ -17,6 +17,8 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 import java.io.IOException;
@@ -27,6 +29,7 @@ import java.util.HashMap;
  */
 public class Message2 {
 
+    private static Logger logger = LoggerFactory.getLogger(Message2.class);
 //小程序
 //    static String appId="wx2fc3f45732fae5d3";
 //    static String secret="7eee4a49a4470a77f9222995e8511547";
@@ -86,7 +89,7 @@ public class Message2 {
         message.put("data",data);
 
         String s1 = HttpsClient.sendJson("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + access_token, message);
-        System.out.println("s1 = " + s1);
+        logger.info("s1 = " + s1);
         return s1;
     }
 
@@ -96,7 +99,7 @@ public class Message2 {
 
         String s = HttpsClient.httpsRequestReturnString(url, "GET", "");
         JSONObject jsonObject = JSONObject.parseObject(s);
-        System.out.println("jsonObject = " + jsonObject);
+        logger.info("jsonObject = " + jsonObject);
         String access_token = jsonObject.getString("access_token");
 //        HttpsClient.httpsRequestReturnString("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+access_token, "POST", message.toJSONString());
         return access_token;
@@ -108,6 +111,6 @@ public class Message2 {
     public static void main(String[] args) throws Exception {
         String o9MsY67wqvQ__o_pOzF7oeN4MQPM = send("o9MsY67wqvQ__o_pOzF7oeN4MQPM","进入区域","IPCamera 01","2024-01-29 16:16:14");
 //        String token = getToken();
-//        System.out.println("token = " + token);
+//        logger.info("token = " + token);
     }
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 13 - 10
src/main/java/com/template/common/utils/RSAUtils.java


+ 10 - 4
src/main/java/com/template/common/utils/RequestUtils.java

@@ -1,5 +1,9 @@
 package com.template.common.utils;
 
+import com.template.controller.WechatScanLoginController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
 import java.net.*;
@@ -13,6 +17,8 @@ import java.util.Map;
  * @Version: 1.0
  */
 public class RequestUtils {
+    private static Logger logger = LoggerFactory.getLogger(RequestUtils.class);
+
     /**
      * GET请求
      *
@@ -39,7 +45,7 @@ public class RequestUtils {
             Map<String, List<String>> map = connection.getHeaderFields();
             // 遍历所有的响应头字段
             for (String key : map.keySet()) {
-                System.out.println(key + "--->" + map.get(key));
+                logger.info(key + "--->" + map.get(key));
             }
             // 定义 BufferedReader输入流来读取URL的响应
             in = new BufferedReader(new InputStreamReader(
@@ -49,7 +55,7 @@ public class RequestUtils {
                 result += line;
             }
         } catch (Exception e) {
-            System.out.println("发送GET请求出现异常!" + e);
+            logger.info("发送GET请求出现异常!" + e);
             e.printStackTrace();
         }
         // 使用finally块来关闭输入流
@@ -105,7 +111,7 @@ public class RequestUtils {
                 result += line;
             }
         } catch (Exception e) {
-            System.out.println("发送 POST 请求出现异常!" + e);
+            logger.info("发送 POST 请求出现异常!" + e);
             e.printStackTrace();
         }
         //使用finally块来关闭输出流、输入流
@@ -153,7 +159,7 @@ public class RequestUtils {
             os.close();
             // 获取响应码
             int responseCode = connection.getResponseCode();
-            System.out.println("POST Response Code :: " + responseCode);
+            logger.info("POST Response Code :: " + responseCode);
 
             // 读取响应内容
             if (responseCode == HttpsURLConnection.HTTP_OK) {

+ 9 - 6
src/main/java/com/template/common/utils/SendSms.java

@@ -1,6 +1,7 @@
 package com.template.common.utils;
 
 
+import com.template.services.impl.SmartUploadServiceImpl;
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 
@@ -15,6 +16,8 @@ import com.tencentcloudapi.sms.v20210111.SmsClient;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
 import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
 import com.tencentcloudapi.sms.v20210111.models.SendStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 
@@ -24,7 +27,7 @@ import java.util.Date;
  * Tencent Cloud Sms Sendsms
  */
 public class SendSms {
-
+    private static Logger logger = LoggerFactory.getLogger(SendSms.class);
 
     //腾讯云上的签名
 //    private static String secretID="AKIDDPo13qZCZqtgJsGQL7AyYu1wc7QVMyLl";
@@ -148,10 +151,10 @@ public class SendSms {
             SendSmsResponse res = client.SendSms(req);
 
             // 输出json格式的字符串回包
-//            System.out.println(SendSmsResponse.toJsonString(res));
+//            logger.info(SendSmsResponse.toJsonString(res));
 
             // 也可以取出单个值,你可以通过官网接口文档或跳转到response对象的定义处查看返回字段的定义
-            // System.out.println(res.getRequestId());
+            // logger.info(res.getRequestId());
 
             /* 当出现以下错误码时,快速解决方案参考
              * [FailedOperation.SignatureIncorrectOrUnapproved](https://cloud.tencent.com/document/product/382/9558#.E7.9F.AD.E4.BF.A1.E5.8F.91.E9.80.81.E6.8F.90.E7.A4.BA.EF.BC.9Afailedoperation.signatureincorrectorunapproved-.E5.A6.82.E4.BD.95.E5.A4.84.E7.90.86.EF.BC.9F)
@@ -161,8 +164,8 @@ public class SendSms {
              * 更多错误,可咨询[腾讯云助手](https://tccc.qcloud.com/web/im/index.html#/chat?webAppId=8fa15978f85cb41f7e2ea36920cb3ae1&title=Sms)
              */
             SendStatus sendStatus = res.getSendStatusSet()[0];
-            System.out.println(sendStatus.getMessage());
-//            System.out.println("sendStatus = " + sendStatus);
+            logger.info(sendStatus.getMessage());
+//            logger.info("sendStatus = " + sendStatus);
             returString = sendStatus.getMessage();
         } catch (TencentCloudSDKException e) {
             e.printStackTrace();
@@ -194,7 +197,7 @@ public class SendSms {
             req.setPhoneNumberSet(phoneNumbers);
             SendSmsResponse res = client.SendSms(req);
             SendStatus sendStatus = res.getSendStatusSet()[0];
-            System.out.println(sendStatus.getMessage());
+            logger.info(sendStatus.getMessage());
             returString = sendStatus.getMessage();
         } catch (TencentCloudSDKException e) {
             e.printStackTrace();

+ 13 - 8
src/main/java/com/template/common/utils/TimeExchange.java

@@ -1,11 +1,14 @@
 package com.template.common.utils;
 
 import com.alibaba.druid.sql.visitor.functions.Char;
+import com.template.controller.SmartClassController;
 import com.template.model.enumModel.eWeekStatu;
 import com.template.model.pojo.UnitTimeHelpModel;
 import com.template.model.vo.ClassSettingDateVo;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.Array;
 import java.sql.Timestamp;
@@ -26,6 +29,8 @@ import java.util.regex.Pattern;
  */
 public class TimeExchange {
 
+    private static Logger logger = LoggerFactory.getLogger(TimeExchange.class);
+
     /**
      * String(yyyy-MM-dd HH:mm:ss) 转 Date
      *
@@ -59,7 +64,7 @@ public class TimeExchange {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             dateStr = dateFormat.format(time);
-            System.out.println(dateStr);
+            logger.info(dateStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -94,7 +99,7 @@ public class TimeExchange {
             e.printStackTrace();
         }
         if (times == 0) {
-            System.out.println("String转10位时间戳失败");
+            logger.info("String转10位时间戳失败");
         }
         return times;
 
@@ -115,7 +120,7 @@ public class TimeExchange {
         try {
             //方法一
             tsStr = dateFormat.format(ts);
-            System.out.println(tsStr);
+            logger.info(tsStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -134,7 +139,7 @@ public class TimeExchange {
         Date date = new Date();
         try {
             date = ts;
-            //System.out.println(date);
+            //logger.info(date);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -234,7 +239,7 @@ public class TimeExchange {
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calendar.getTime());
     }
 
-    public static String addYear(int yearNum){
+    public static String addYear(int yearNum) {
         Calendar calendar = Calendar.getInstance();
         Date date = new Date();//当前时间
         calendar.setTime(date);
@@ -432,7 +437,7 @@ public class TimeExchange {
         DateFormat dateFormat = new SimpleDateFormat(formatStr);
         try {
             date = dateFormat.parse(time);
-            System.out.println(date.toString());
+            logger.info(date.toString());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -750,7 +755,7 @@ public class TimeExchange {
         return new SimpleDateFormat("EEEE").format(c.getTime());
     }
 
-    public static boolean vertify(String pwd){
+    public static boolean vertify(String pwd) {
         //密码至少包含:大小写英文字母、数字,密码长度大于8位,小于20位
         String regex = "^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z]).{8,20}$";
         return Pattern.matches(regex, pwd);
@@ -758,7 +763,7 @@ public class TimeExchange {
 
     public static void main(String[] args) {
         boolean result = vertify("Stc.123456");
-        System.out.println(result);
+        logger.info(String.valueOf(result));
 
     }
 

+ 14 - 9
src/main/java/com/template/common/utils/TimeExchange2.java

@@ -1,5 +1,8 @@
 package com.template.common.utils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -14,6 +17,8 @@ import java.util.*;
  */
 public class TimeExchange2 {
 
+    private static Logger logger = LoggerFactory.getLogger(TimeExchange2.class);
+
     /**
      * String(yyyy-MM-dd HH:mm:ss) 转 Date
      *
@@ -29,7 +34,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             date = dateFormat.parse(time);
-            System.out.println(date.toString());
+            logger.info(date.toString());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -44,7 +49,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             date = dateFormat.parse(time);
-            System.out.println(date.toString());
+            logger.info(date.toString());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -87,7 +92,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH/mm/ss");
         try {
             dateStr = dateFormat.format(time);
-            System.out.println(dateStr);
+            logger.info(dateStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -119,7 +124,7 @@ public class TimeExchange2 {
             e.printStackTrace();
         }
         if(times==0){
-            System.out.println("String转10位时间戳失败");
+            logger.info("String转10位时间戳失败");
         }
         return times;
 
@@ -138,7 +143,7 @@ public class TimeExchange2 {
         try {
             //方法一
             tsStr = dateFormat.format(ts);
-            System.out.println(tsStr);
+            logger.info(tsStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -155,7 +160,7 @@ public class TimeExchange2 {
         Date date = new Date();
         try {
             date = ts;
-            //System.out.println(date);
+            //logger.info(date);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -419,7 +424,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat(formatStr);
         try {
             date = dateFormat.parse(time);
-            System.out.println(date.toString());
+            logger.info(date.toString());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -456,7 +461,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat(FormatStr);
         try {
             dateStr = dateFormat.format(time);
-            System.out.println(dateStr);
+            logger.info(dateStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -621,7 +626,7 @@ public class TimeExchange2 {
             ans = ans * 26 + num;
         }
 
-        System.out.println(ans);
+        logger.info(String.valueOf(ans));
     }
 
 }

+ 6 - 2
src/main/java/com/template/common/utils/WxUtil.java

@@ -1,6 +1,8 @@
 package com.template.common.utils;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
@@ -27,6 +29,8 @@ import java.util.*;
  */
 public class WxUtil {
 
+	private static Logger logger = LoggerFactory.getLogger( WxUtil.class);
+
 	/**
 	 * 加密/校验流程如下:
 	 * 1. 将token、timestamp、nonce三个参数进行字典序排序<br>
@@ -118,9 +122,9 @@ public class WxUtil {
         sb.append("timestamp");
         sb.append(data.get("timestamp").trim());
         sb.append(apikey);
-		System.out.println(sb);
+		logger.info(sb.toString());
 		if (signType.equals(WxConstants.SING_MD5)) {
-			System.out.println(MD5(sb.toString()).toUpperCase());
+			logger.info(MD5(sb.toString()).toUpperCase());
 			return MD5(sb.toString()).toLowerCase();
 		}
 		else if (signType.equals(WxConstants.SING_HMACSHA256)) {

+ 1 - 1
src/main/java/com/template/common/utils/smsUtil.java

@@ -20,6 +20,6 @@ public class smsUtil {
 //        String[] params = {smmCode,Integer.toString(smsConfig.getSmsMin())};
 //        SmsSingleSender ssender = new SmsSingleSender(smsConfig.getSdkAppid(), smsConfig.getAppKey());
 //        SmsSingleSenderResult result = ssender.sendWithParam("86", phoneNumber, smsConfig.getTemplateId(), params, smsConfig.getSmsSign(), "", "");
-//        System.out.println(result);
+//        logger.info(result);
 //    };
 }

+ 6 - 2
src/main/java/com/template/controller/ExcelController.java

@@ -9,6 +9,8 @@ import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -19,6 +21,8 @@ import java.io.IOException;
 //返回参数加密注解
 @DESRespondSecret
 public class ExcelController implements ExcelControllerAPI {
+
+    private static Logger logger = LoggerFactory.getLogger(ExcelController.class);
     @Autowired
     SystemUserService systemUserService;
 
@@ -41,7 +45,7 @@ public class ExcelController implements ExcelControllerAPI {
         //遍历工作簿中的所有数据
         for (int i = 0; i < sheetNum; i++) {
             //读取第i个工作表
-            System.out.println("读取第"+(i+1)+"个sheet");
+            logger.info("读取第"+(i+1)+"个sheet");
             XSSFSheet sheet = xssfWorkbook.getSheetAt(i);
             //获取最后一行的num,即总行数。此处从0开始
             int maxRow = sheet.getLastRowNum();
@@ -49,7 +53,7 @@ public class ExcelController implements ExcelControllerAPI {
             for (int row = 1; row <= maxRow; row++) {
                 //获取最后单元格num,即总单元格数 ***注意:此处从1开始计数***
                 int maxRol = sheet.getRow(row).getLastCellNum();
-                System.out.println("--------第" + row + "行的数据如下--------");
+                logger.info("--------第" + row + "行的数据如下--------");
 //                for (int rol = 0; rol < maxRol; rol++){
 //                    System.out.print(sheet.getRow(row).getCell(rol) + "  ");
 //                }

+ 3 - 3
src/main/java/com/template/controller/HikvisionController.java

@@ -60,7 +60,7 @@ public class HikvisionController implements HikvisionAPI {
                 responseStrBuilder.append(inputStr);
             }
             JSONObject jsonObject = JSONObject.parseObject(responseStrBuilder.toString());
-//            System.out.println("jsonObject = " + jsonObject);
+//            logger.info("jsonObject = " + jsonObject);
             JSONObject params = jsonObject.getJSONObject("params");
 
             JSONArray events = params.getJSONArray("events");
@@ -187,7 +187,7 @@ public class HikvisionController implements HikvisionAPI {
             }
             JSONObject jsonObject = JSONObject.parseObject(responseStrBuilder.toString());
 
-//            System.out.println("jsonObject = " + jsonObject);
+//            logger.info("jsonObject = " + jsonObject);
 
             JSONObject params = jsonObject.getJSONObject("params");
 
@@ -268,7 +268,7 @@ public class HikvisionController implements HikvisionAPI {
             }
             JSONObject jsonObject = JSONObject.parseObject(responseStrBuilder.toString());
 
-//            System.out.println("jsonObject = " + jsonObject);
+//            logger.info("jsonObject = " + jsonObject);
 
             JSONObject params = jsonObject.getJSONObject("params");
 

+ 4 - 1
src/main/java/com/template/controller/RepairAdminController.java

@@ -13,6 +13,8 @@ import com.template.model.request.updateRepairAdminRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.services.RepairAdminService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 @DESRespondSecret
 public class RepairAdminController implements RepairAdminControllerAPI {
 
+    private static Logger logger = LoggerFactory.getLogger(RepairAdminController.class);
     @Autowired
     private RepairAdminService repairAdminService;
 
@@ -109,7 +112,7 @@ public class RepairAdminController implements RepairAdminControllerAPI {
         ra.setId(frar.getId());
         ra.setStatu(frar.getStatu());
         int result = repairAdminService.updateRepairAdmin(ra);
-        System.out.println(result);
+        logger.info(String.valueOf(result));
         return result > 0 ? CommonResult.ok(success) : CommonResult.fail(fail);
     }
 

+ 8 - 4
src/main/java/com/template/controller/ScheduleController.java

@@ -15,6 +15,8 @@ import com.template.model.seewo.*;
 import com.template.services.SmartAttendanceService;
 import com.template.services.SmartClassService;
 import com.template.services.SmartUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -32,6 +34,8 @@ import java.util.Optional;
 //@EnableAsync
 public class ScheduleController {
 
+    private static Logger logger = LoggerFactory.getLogger(ScheduleController.class);
+
     @Resource
     private SeewoConfig seewoConfig;
 
@@ -115,10 +119,10 @@ public class ScheduleController {
                 // 该接口需要数据权限,请将授权资源id替换至下方,请妥善保管好授权资源id,避免泄露
                 // permissionId位置: 控制台 -> 应用详情 -> 我申请的 -> 已通过的接口 -> 调用范围 -> 审批信息 中查看授权资源的「学校id」或「区域id」
                 request.setPermissionId("");
-                System.out.println("入参:" +request);
+                logger.info("入参:" +request);
                 //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
                 AttendanceRuleListEventByClazzResult result = seewoClient.invoke(request);
-                System.out.println("出参:" +result);
+                logger.info("出参:" +result);
                 //endregion
 
                 //考勤事件ID
@@ -158,12 +162,12 @@ public class ScheduleController {
                     kRequestBody.setQuery(kQuery);
                     kParam.setRequestBody(kRequestBody);
                     AttendanceServiceListAttendClassRecordsRequest kRequest = new AttendanceServiceListAttendClassRecordsRequest(kParam);
-                    System.out.println("入参:" + request);
+                    logger.info("入参:" + request);
                     //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
                     //request.setServerUrl("https://openapi.test.seewo.com")
                     //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
                     AttendanceServiceListAttendClassRecordsResult kResult = seewoClient.invoke(kRequest);
-                    System.out.println("出参:" + result);
+                    logger.info("出参:" + result);
 
                     if (result != null && result.getResponseBody().getCode().equals("000000")) {
                         String userUid = "";

+ 5 - 2
src/main/java/com/template/controller/SmartAttendanceController.java

@@ -23,6 +23,8 @@ import com.template.model.seewo.PersonalLeaveListSchoolPeriodRecordsResult;
 import com.template.model.vo.*;
 import com.template.services.SmartAttendanceService;
 import com.template.services.SmartUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 
@@ -51,6 +53,7 @@ import static com.template.common.utils.AesTestOne.decrypt;
 //返回参数加密注解
 @DESRespondSecret
 public class SmartAttendanceController implements SmartAttendanceControllerAPI {
+    private static Logger logger = LoggerFactory.getLogger(SmartAttendanceController.class);
 
     @Resource
     private SeewoConfig seewoConfig;
@@ -290,12 +293,12 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
         requestBody.setQuery(query);
         param.setRequestBody(requestBody);
         PersonalLeaveListSchoolPeriodRecordsRequest request = new PersonalLeaveListSchoolPeriodRecordsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         PersonalLeaveListSchoolPeriodRecordsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
 
         return result;

+ 4 - 1
src/main/java/com/template/controller/SmartAuthorGroupController.java

@@ -17,6 +17,8 @@ import com.template.model.weixin.AuthorAndGroup2;
 import com.template.model.weixin.AuthorListGroup;
 import com.template.model.weixin.userAuthor;
 import com.template.services.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -38,6 +40,7 @@ import java.util.stream.Collectors;
 @DESRespondSecret
 public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI {
 
+    private static Logger logger = LoggerFactory.getLogger(SmartAuthorGroupController.class);
     @Autowired
     private SmartAuthorGroupService smartAuthorGroupService;
     @Autowired
@@ -226,7 +229,7 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
                     if (smartAuthorityC.size() > 0) {
                         SmartAuthority smartAuthority = smartAuthorityC.get(0);
                         smartAuthority.setDeleted(1);
-                        System.out.println(")))" + smartAuthority.getId());
+                        logger.info(")))" + smartAuthority.getId());
                         smartAuthorityService.updateSmartAuthority(smartAuthority);
                     }
                 }

+ 11 - 7
src/main/java/com/template/controller/SmartClassController.java

@@ -21,6 +21,8 @@ import com.template.model.seewo.*;
 import com.template.model.vo.*;
 import com.template.services.SmartClassService;
 import com.template.services.SmartGradeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -52,6 +54,8 @@ import static com.template.common.utils.AesTestOne.decrypt;
 @DESRespondSecret
 public class SmartClassController implements SmartClassControllerAPI {
 
+    private static Logger logger = LoggerFactory.getLogger(SmartClassController.class);
+
     @Resource
     private SeewoConfig seewoConfig;
     @Resource
@@ -348,12 +352,12 @@ public class SmartClassController implements SmartClassControllerAPI {
         kQuery.setClassList(java.util.Collections.singletonList(kClassList));
         kParam.setRequestBody(kRequestBody);
         OrganizationNodeServiceInitSchoolClassesRequest kRequest = new OrganizationNodeServiceInitSchoolClassesRequest(kParam);
-        System.out.println("入参:" + kRequest);
+        logger.info("入参:" + kRequest);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         OrganizationNodeServiceInitSchoolClassesResult kResult = seewoClient.invoke(kRequest);
-        System.out.println("出参:" + kResult);
+        logger.info("出参:" + kResult);
     }
 
     //新增班级和年级
@@ -384,13 +388,13 @@ public class SmartClassController implements SmartClassControllerAPI {
         query.setClassList(java.util.Collections.singletonList(classList));
         param.setRequestBody(requestBody);
         ClassServiceBatchSaveClassRequest request = new ClassServiceBatchSaveClassRequest(param);
-        System.out.println("入参:" + request);
-        System.out.println("入参body:" + JSON.toJSON(requestBody));
+        logger.info("入参:" + request);
+        logger.info("入参body:" + JSON.toJSON(requestBody));
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         // request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ClassServiceBatchSaveClassResult xwResult = seewoClient.invoke(request);
-        System.out.println("出参:" + xwResult);
+        logger.info("出参:" + xwResult);
 
         if (xwResult == null) {
             return CommonResult.fail("希沃班级数据新增失败!");
@@ -434,12 +438,12 @@ public class SmartClassController implements SmartClassControllerAPI {
         query.setClassList(java.util.Collections.singletonList(classList));
         param.setRequestBody(requestBody);
         OrganizationNodeServiceInitSchoolClassesRequest request = new OrganizationNodeServiceInitSchoolClassesRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         OrganizationNodeServiceInitSchoolClassesResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         return null;
     }

+ 5 - 1
src/main/java/com/template/controller/SmartEvaluateStudentController.java

@@ -18,6 +18,8 @@ import com.template.services.SmartEvaluateSdetailService;
 import com.template.services.SmartEvaluateStudentService;
 import com.template.services.SmartSubjectManageService;
 import com.template.services.SmartSubjectRuleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -29,6 +31,8 @@ import java.util.stream.Collectors;
 @DESRespondSecret
 public class SmartEvaluateStudentController implements SmartEvaluateStudentControllerAPI {
 
+    private static Logger logger = LoggerFactory.getLogger(SmartEvaluateStudentController.class);
+
     @Autowired
     public SmartSubjectManageService smartSubjectManageService;
     @Autowired
@@ -47,7 +51,7 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             return CommonResult.errorMsg("参数格式错误");
         }
         List<SmartSubjectManage> allList = subjectManageList.getSubjectList();
-        System.out.println("===" + allList);
+        logger.info("===" + allList);
         List<String> subjectLists = allList.stream().filter(e -> e.getDeleted() == 0).map(m -> m.getTerm() + m.getName()).collect(Collectors.toList());
         Set<String> mainScoreSet = new HashSet<>(subjectLists);
         if (subjectLists.size() != mainScoreSet.size()) {

+ 4 - 1
src/main/java/com/template/controller/SmartFaceDiscernController.java

@@ -20,6 +20,8 @@ import com.template.services.SmartCarAccessService;
 import com.template.services.SmartFaceDiscernService;
 import com.template.services.SmartQrcodeService;
 import com.template.services.SmartUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -48,6 +50,7 @@ import static com.template.common.utils.AesTestOne.decrypt;
 //返回参数加密注解
 @DESRespondSecret
 public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI {
+    private static Logger logger = LoggerFactory.getLogger(SmartFaceDiscernController.class);
 
     @Autowired
     SmartFaceDiscernService smartFaceDiscernService;
@@ -133,7 +136,7 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
         for (int i = 1; i <= 30; i++) {
             LocalDateTime endTime = now.minusDays(i);
             String dateTime = endTime.format(dateTimeFormatter);
-            System.out.println("dateTime = " + dateTime);
+            logger.info("dateTime = " + dateTime);
 
         }
     }

+ 45 - 41
src/main/java/com/template/controller/SmartUserController.java

@@ -35,6 +35,8 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 
@@ -106,6 +108,8 @@ public class SmartUserController implements SmartUserControllerAPI {
     @Autowired
     private SmartFamilyIndexService smartFamilyIndexService;
 
+    private static Logger logger = LoggerFactory.getLogger(SmartUserController.class);
+
     @Override
     @DESRespondSecret(validated = true)
     public CommonResult logoffAccount(useridsRequest ur, BindingResult bindingResult) {
@@ -529,12 +533,12 @@ public class SmartUserController implements SmartUserControllerAPI {
                         param.setRequestBody(requestBody);
                         ParentServiceBatchSaveOrUpdateParentsRequest request = new ParentServiceBatchSaveOrUpdateParentsRequest(param);
                         String jsonString = JSON.toJSONString(request);
-                        System.out.println("入参:" + request);
+                        logger.info("入参:" + request);
                         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
                         //request.setServerUrl("https://openapi.test.seewo.com")
                         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
                         ParentServiceBatchSaveOrUpdateParentsResult parentResult = seewoClient.invoke(request);
-                        System.out.println("出参:" + parentResult);
+                        logger.info("出参:" + parentResult);
 
 
                         if (parentResult == null) {
@@ -3035,11 +3039,11 @@ public class SmartUserController implements SmartUserControllerAPI {
         // 该接口需要数据权限,请将授权资源id替换至下方,请妥善保管好授权资源id,避免泄露
         // permissionId位置: 控制台 -> 应用详情 -> 我申请的 -> 已通过的接口 -> 调用范围 -> 审批信息 中查看授权资源的「学校id」或「区域id」
         //request.setPermissionId(seewoConfig.getSchoolId());
-        System.out.println("入参:" + request);
-        System.out.println("入参:" + JSON.toJSON(request));
+        logger.info("入参:" + request);
+        logger.info("入参:" + JSON.toJSON(request));
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         PhotoServiceSavePhotosResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         ObjectMapper objectMapper = new ObjectMapper();
         XwBodyVo xwResult = objectMapper.readValue(result.getBody(), XwBodyVo.class);
@@ -3076,12 +3080,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setInPlaceOld(false);// 是否删除旧学生再保存
         param.setRequestBody(requestBody);
         StudentServiceBatchSaveClassStudentsRequest request = new StudentServiceBatchSaveClassStudentsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         StudentServiceBatchSaveClassStudentsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生数据新增失败!");
@@ -3124,12 +3128,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setInPlaceOld(false);// 是否删除旧学生再保存
         param.setRequestBody(requestBody);
         StudentServiceBatchSaveClassStudentsRequest request = new StudentServiceBatchSaveClassStudentsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         StudentServiceBatchSaveClassStudentsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生数据新增失败!");
@@ -3165,12 +3169,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         requestBody.setQuery(query);
         param.setRequestBody(requestBody);
         StudentServiceUpdateStudentInfoRequest request = new StudentServiceUpdateStudentInfoRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         StudentServiceUpdateStudentInfoResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生数据更新失败!");
@@ -3204,12 +3208,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         deleteRequestBody.setQuery(deleteQuery);
         deleteParam.setRequestBody(deleteRequestBody);
         StudentServiceRemoveClassStudentsRequest deleteRequest = new StudentServiceRemoveClassStudentsRequest(deleteParam);
-        System.out.println("入参:" + deleteRequest);
+        logger.info("入参:" + deleteRequest);
         //如果想要调用沙箱环境,请通过设置 deleteRequest 对象的 serverUrl 属性,如:
         //deleteRequest.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         StudentServiceRemoveClassStudentsResult deleteResult = seewoClient.invoke(deleteRequest);
-        System.out.println("出参:" + deleteResult);
+        logger.info("出参:" + deleteResult);
 
         if (deleteResult == null) {
             return CommonResult.fail("希沃删除学生数据失败!");
@@ -3253,12 +3257,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setTeachers(java.util.Collections.singletonList(teachers));
         param.setRequestBody(requestBody);
         TeacherServiceBatchSaveOrUpdateTeacherRequest request = new TeacherServiceBatchSaveOrUpdateTeacherRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchSaveOrUpdateTeacherResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃教师数据新增失败!");
@@ -3300,12 +3304,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setTeachers(teachers);
         param.setRequestBody(requestBody);
         TeacherServiceBatchSaveOrUpdateTeacherRequest request = new TeacherServiceBatchSaveOrUpdateTeacherRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchSaveOrUpdateTeacherResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃教师数据新增失败!");
@@ -3352,12 +3356,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setTeachers(java.util.Collections.singletonList(teachers));
         param.setRequestBody(requestBody);
         TeacherServiceBatchSaveOrUpdateTeacherRequest request = new TeacherServiceBatchSaveOrUpdateTeacherRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchSaveOrUpdateTeacherResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃教师数据更新失败!");
@@ -3397,12 +3401,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         requestBody.setQuery(query);
         param.setRequestBody(requestBody);
         TeacherServiceBatchRemoveTeachersRequest request = new TeacherServiceBatchRemoveTeachersRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchRemoveTeachersResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃教师数据删除失败!");
@@ -3437,12 +3441,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         mastersRequestBody.setQuery(mastersQuery);
         mastersParam.setRequestBody(mastersRequestBody);
         TeacherServiceBatchRemoveClassMastersRequest mastersRequest = new TeacherServiceBatchRemoveClassMastersRequest(mastersParam);
-        System.out.println("入参:" + mastersRequest);
+        logger.info("入参:" + mastersRequest);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchRemoveClassMastersResult masterResult = seewoClient.invoke(mastersRequest);
-        System.out.println("出参:" + masterResult);
+        logger.info("出参:" + masterResult);
 
         if (masterResult == null) {
             return CommonResult.fail("希沃教师数据删除失败!");
@@ -3479,12 +3483,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         teacherClassRequestBody.setQuery(teacherClassQuery);
         teacherClassParam.setRequestBody(teacherClassRequestBody);
         TeacherServiceBatchSetClassMastersRequest teacherClassRequest = new TeacherServiceBatchSetClassMastersRequest(teacherClassParam);
-        System.out.println("入参:" + teacherClassRequest);
+        logger.info("入参:" + teacherClassRequest);
         //如果想要调用沙箱环境,请通过设置 teacherClassRequest 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchSetClassMastersResult teacherClassResult = seewoClient.invoke(teacherClassRequest);
-        System.out.println("出参:" + teacherClassResult);
+        logger.info("出参:" + teacherClassResult);
 
         if (teacherClassResult == null) {
             return CommonResult.fail("希沃教师数据新增失败!");
@@ -3605,12 +3609,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setStudentParents(studentParents);
         param.setRequestBody(requestBody);
         ParentServiceBatchSaveOrUpdateParentsRequest request = new ParentServiceBatchSaveOrUpdateParentsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ParentServiceBatchSaveOrUpdateParentsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生家长数据更新失败!");
@@ -3646,12 +3650,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         deleteOldFamilyRequestBody.setQuery(deleteOldFamilyquery);
         deleteOldFamilyParam.setRequestBody(deleteOldFamilyRequestBody);
         ParentServiceRemoveStudentParentConditionRequest deleteOldFamilyRequest = new ParentServiceRemoveStudentParentConditionRequest(deleteOldFamilyParam);
-        System.out.println("入参:" + deleteOldFamilyRequest);
+        logger.info("入参:" + deleteOldFamilyRequest);
         //如果想要调用沙箱环境,请通过设置 deleteOldFamilyRequest 对象的 serverUrl 属性,如:
         //deleteOldFamilyRequest.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ParentServiceRemoveStudentParentConditionResult deleteOldFamilyResult = seewoClient.invoke(deleteOldFamilyRequest);
-        System.out.println("出参:" + deleteOldFamilyResult);
+        logger.info("出参:" + deleteOldFamilyResult);
 
         if (deleteOldFamilyResult == null) {
             return CommonResult.fail("希沃家长数据删除失败!");
@@ -3695,13 +3699,13 @@ public class SmartUserController implements SmartUserControllerAPI {
         deleteOldFamilyRequestBody.setQuery(deleteOldFamilyquery);
         deleteOldFamilyParam.setRequestBody(deleteOldFamilyRequestBody);
         ParentServiceRemoveStudentParentConditionRequest deleteOldFamilyRequest = new ParentServiceRemoveStudentParentConditionRequest(deleteOldFamilyParam);
-        System.out.println("入参:" + deleteOldFamilyRequest);
-        System.out.println("入参:" + JSON.toJSON(deleteOldFamilyRequest));
+        logger.info("入参:" + deleteOldFamilyRequest);
+        logger.info("入参:" + JSON.toJSON(deleteOldFamilyRequest));
         //如果想要调用沙箱环境,请通过设置 deleteOldFamilyRequest 对象的 serverUrl 属性,如:
         //deleteOldFamilyRequest.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ParentServiceRemoveStudentParentConditionResult deleteOldFamilyResult = seewoClient.invoke(deleteOldFamilyRequest);
-        System.out.println("出参:" + deleteOldFamilyResult);
+        logger.info("出参:" + deleteOldFamilyResult);
 
         if (deleteOldFamilyResult == null) {
             return CommonResult.fail("希沃家长数据删除失败!");
@@ -4880,12 +4884,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         studentParents.setParents(java.util.Collections.singletonList(parents));
         param.setRequestBody(requestBody);
         ParentServiceBatchSaveOrUpdateParentsRequest request = new ParentServiceBatchSaveOrUpdateParentsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ParentServiceBatchSaveOrUpdateParentsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生家长数据添加失败!");
@@ -4997,23 +5001,23 @@ public class SmartUserController implements SmartUserControllerAPI {
             return CommonResult.fail(st);
         }
 
-        System.out.println("批量设置时间组1" + TimeExchange.getDateMillS());
+        logger.info("批量设置时间组1" + TimeExchange.getDateMillS());
 
         SmartTimeGroup timeGroup = smartTimeGroupService.queryTimeGroupById(isur.getTimeGroupId());
         if (timeGroup == null) {
             return CommonResult.fail("时间组数据无效,批量同步时间组失败!");
         }
 
-        System.out.println("批量设置时间组2" + TimeExchange.getDateMillS());
+        logger.info("批量设置时间组2" + TimeExchange.getDateMillS());
         //region 批量更新百胜学生的时间组
         List<SmartUser> users = smartUserService.getSmartUserByIds(isur.getIds());
         if (users == null) {
             return CommonResult.fail("用户数据无效,批量同步时间组失败!");
         }
-        System.out.println("批量设置时间组3" + TimeExchange.getDateMillS());
+        logger.info("批量设置时间组3" + TimeExchange.getDateMillS());
         List<SmartGrade> grades = smartGradeService.list(null);
         List<SmartClass> classes = smartClassService.list(null);
-        System.out.println("批量设置时间组4" + TimeExchange.getDateMillS());
+        logger.info("批量设置时间组4" + TimeExchange.getDateMillS());
 
         for (SmartUser user : users) {
             user.setTimeGroupId(isur.getTimeGroupId());
@@ -5031,7 +5035,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             long stime = System.currentTimeMillis();
 
 
-            System.out.println("开始循环调用百胜一次:" + TimeExchange.getDateMillS());
+            logger.info("开始循环调用百胜一次:" + TimeExchange.getDateMillS());
             /**
              * 学生数据的有效期是到毕业年份的8月31日
              */
@@ -5048,11 +5052,11 @@ public class SmartUserController implements SmartUserControllerAPI {
             //endregion
         }
 
-        System.out.println("循环结束:" + TimeExchange.getDateMillS());
+        logger.info("循环结束:" + TimeExchange.getDateMillS());
         //region 批量更新学生数据
         boolean updateBatch = smartUserService.updateUserBatchById(users);
 
-        System.out.println("存储结束:" + TimeExchange.getDateMillS());
+        logger.info("存储结束:" + TimeExchange.getDateMillS());
 
         return updateBatch ? CommonResult.ok("批量同步成功") : CommonResult.fail("批量同步失败");
     }

+ 32 - 29
src/main/java/com/template/controller/SmartVisitorController.java

@@ -27,6 +27,8 @@ import com.template.model.seewo.HomeSchoolServiceSendNoteToKidRequest;
 import com.template.model.seewo.HomeSchoolServiceSendNoteToKidResult;
 import com.template.model.vo.*;
 import com.template.services.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -56,6 +58,7 @@ import static com.template.common.utils.StrUtils.getUUIDBits;
 @DESRespondSecret
 public class SmartVisitorController implements SmartVisitorControllerAPI {
 
+    private static Logger logger = LoggerFactory.getLogger(SmartVisitorController.class);
     @Autowired
     private SmartAuthorGroupService smartAuthorGroupService;
 
@@ -343,7 +346,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                         //返回的结果中 code为1表示成功
                         String result = RequestUtils.httpPost(url, jsonobject.toJSONString());
 
-                        System.out.println(result);
+                        logger.info(result);
 
                         if (!result.contains("预约成功")) {
                             throw new Exception("审核失败");
@@ -522,12 +525,12 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         requestBody.setQuery(query);
         param.setRequestBody(requestBody);
         HomeSchoolServiceSendNoteToKidRequest request = new HomeSchoolServiceSendNoteToKidRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         HomeSchoolServiceSendNoteToKidResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
         if (!result.getMessage().equals("success")) {
             CommonResult.fail();
         }
@@ -611,10 +614,10 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
      */
     @Override
     public TurnOnDeviceVo turnOnTheDevice(turnOnTheDeviceRequest data) throws JsonProcessingException {
-        System.out.println("进入扫码解析,参数:" + JSON.toJSON(data));
+        logger.info("进入扫码解析,参数:" + JSON.toJSON(data));
 
         TurnOnDeviceVo result = new TurnOnDeviceVo();
-        System.out.println("进入扫码解析1");
+        logger.info("进入扫码解析1");
         //region 参数判断
         if (data == null) {
             result.setResultcode(2);
@@ -622,28 +625,28 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析2");
+        logger.info("进入扫码解析2");
         if (data.getActionName() == null) {
             result.setResultcode(2);
             result.setMessage("指令不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析3");
+        logger.info("进入扫码解析3");
         if (!data.getActionName().equals("qrCodePush")) {
             result.setResultcode(2);
             result.setMessage("指令错误");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析4");
+        logger.info("进入扫码解析4");
         if (data.getData() == null) {
             result.setResultcode(2);
             result.setMessage("二维码内容不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析5");
+        logger.info("进入扫码解析5");
         ObjectMapper objectMapper = new ObjectMapper();
         qrCodeVo codeVo = objectMapper.readValue(data.getData(), qrCodeVo.class);
         if (codeVo == null) {
@@ -652,21 +655,21 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析6");
+        logger.info("进入扫码解析6");
         if (codeVo.getQrCode() == null) {
             result.setResultcode(2);
             result.setMessage("二维码内容不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析7");
+        logger.info("进入扫码解析7");
         if (data.getDeviceno() == null) {
             result.setResultcode(2);
             result.setMessage("设备编号不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析8");
+        logger.info("进入扫码解析8");
         if (data.getVersion() == null) {
             result.setResultcode(2);
             result.setMessage("版本不能为空");
@@ -674,14 +677,14 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             return result;
         }
         //endregion
-        System.out.println("进入扫码解析9");
+        logger.info("进入扫码解析9");
         //解码逻辑
         QrcodeImageVo qiv = objectMapper.readValue(codeVo.getQrCode(), QrcodeImageVo.class);
-        System.out.println("进入扫码解析10");
+        logger.info("进入扫码解析10");
 
         SmartDevice deviceData = smartDeviceService.queryDeviceByNum(data.getDeviceno());
         if (deviceData == null) {
-            System.out.println("进入扫码解析11");
+            logger.info("进入扫码解析11");
             result.setResultcode(2);
             result.setMessage("设备不存在");
             result.setActionName("qrCodePush");
@@ -690,21 +693,21 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
 
         if (qiv.getType().intValue() == eQrcodeType.Identity.getValue()) {//身份码
             //身份码中的ID是身份码ID
-            System.out.println("进入身份码扫码解析1");
+            logger.info("进入身份码扫码解析1");
             //目前二维码一分钟内有效
             //过期:(时间戳 + 有效期分钟数)<= 当前时间
             //时间戳转时间
             Date dateNow = TimeExchange.StringToDate(TimeExchange.TimeRangeMinute(qiv.getTimestamp(), 1), "yyyy-MM-dd HH:mm:ss");
-            System.out.println("dateNow参数:" + TimeExchange.DateToString(dateNow));
-            System.out.println("当前时间参数:" + TimeExchange.DateToString(new Date()));
+            logger.info("dateNow参数:" + TimeExchange.DateToString(dateNow));
+            logger.info("当前时间参数:" + TimeExchange.DateToString(new Date()));
             if (new Date().after(dateNow)) {
-                System.out.println("身份码过期");
+                logger.info("身份码过期");
                 result.setResultcode(2);
                 result.setMessage("身份码已过期");
                 result.setActionName("qrCodePush");
                 return result;
             }
-            System.out.println("进入身份码扫码解析2");
+            logger.info("进入身份码扫码解析2");
 
             SmartUser user = smartUserService.getSmartById(qiv.getId());
             if (user == null) {
@@ -727,7 +730,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                     //查找是否存在访客记录
                     SmartVisitor visitor = smartVisitorService.queryParentVisitor(user.getId());
                     if(visitor == null){
-                        System.out.println("无访客数据,家长无法通行");
+                        logger.info("无访客数据,家长无法通行");
                         result.setResultcode(2);
                         result.setMessage("无访客数据,家长无法通行");
                         result.setActionName("qrCodePush");
@@ -742,7 +745,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                     sq.setAccessState(deviceData.getEntrance());
                     break;
                 case 2://学生
-                    System.out.println("学生无法使用身份码通行");
+                    logger.info("学生无法使用身份码通行");
                     result.setResultcode(2);
                     result.setMessage("学生无法使用身份码通行");
                     result.setActionName("qrCodePush");
@@ -759,7 +762,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                     break;
             }
 
-            System.out.println("进入身份码扫码解析3");
+            logger.info("进入身份码扫码解析3");
             int insertResult = smartQrcodeService.insertSmartQrcode(sq);
             if (insertResult <= 0) {
                 result.setResultcode(2);
@@ -767,18 +770,18 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                 result.setActionName("qrCodePush");
                 return result;
             }
-            System.out.println("进入身份码扫码解析4");
+            logger.info("进入身份码扫码解析4");
             result.setResultcode(1);
             result.setMessage("成功");
             result.setActionName("qrCodePush");
 
-            System.out.println("进入身份码扫码解析,结果:" + JSON.toJSON(result));
+            logger.info("进入身份码扫码解析,结果:" + JSON.toJSON(result));
         } else if (qiv.getType().intValue() == eQrcodeType.Visitor.getValue()) {//访客码
             //访客码中的ID是访客数据的ID
             //查找是否存在访客记录
             SmartVisitor visitor = smartVisitorService.getSmartById(qiv.getId());
             if(visitor == null){
-                System.out.println("无访客数据,访客无法通行");
+                logger.info("无访客数据,访客无法通行");
                 result.setResultcode(2);
                 result.setMessage("无访客数据,访客无法通行");
                 result.setActionName("qrCodePush");
@@ -793,7 +796,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             sq.setIsSuccess(1);
             sq.setAccessState(deviceData.getEntrance());
 
-            System.out.println("进入访客码扫码解析3");
+            logger.info("进入访客码扫码解析3");
             int insertResult = smartQrcodeService.insertSmartQrcode(sq);
             if (insertResult <= 0) {
                 result.setResultcode(2);
@@ -801,12 +804,12 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                 result.setActionName("qrCodePush");
                 return result;
             }
-            System.out.println("进入访客码扫码解析4");
+            logger.info("进入访客码扫码解析4");
             result.setResultcode(1);
             result.setMessage("成功");
             result.setActionName("qrCodePush");
 
-            System.out.println("进入访客码扫码解析,结果:" + JSON.toJSON(result));
+            logger.info("进入访客码扫码解析,结果:" + JSON.toJSON(result));
         }
 
         return result;

+ 7 - 2
src/main/java/com/template/controller/Task.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.template.annotation.PassToken;
 import com.template.common.utils.CommonUtil;
 import com.template.common.utils.DBUtil;
+import com.template.common.utils.HttpsClient;
 import com.template.common.utils.QuartzJobUtils;
 import com.template.mapper.SmartDataSourceMapper;
 import com.template.mapper.SmartDataTaskMapper;
@@ -17,6 +18,8 @@ import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.quartz.QuartzJobBean;
 import org.springframework.stereotype.Component;
@@ -39,6 +42,8 @@ public class Task extends QuartzJobBean {
 
     private int debugSqlFlag = 0;
 
+    private static Logger logger = LoggerFactory.getLogger(QuartzJobBean.class);
+
     @Override
     @PassToken
     protected void executeInternal(JobExecutionContext jobExecutionContext) {
@@ -698,13 +703,13 @@ public class Task extends QuartzJobBean {
             // 保存错误信息到数据库
             int i = smartDataTaskMapper.insertErrorMsg(smartDataTaskDebug);
             if (i == 0) {
-                System.out.println(datetime + ":保存错误信息失败!");
+                logger.info(datetime + ":保存错误信息失败!");
             }
         } else {
             smartDataTaskDebug.setEId(returnSmartDataTaskErr.getEId());
             int i = smartDataTaskMapper.updateErrorMsg(smartDataTaskDebug);
             if (i == 0) {
-                System.out.println(datetime + ":更新错误信息失败!");
+                logger.info(datetime + ":更新错误信息失败!");
             }
         }
     }

+ 12 - 9
src/main/java/com/template/controller/WechatScanLoginController.java

@@ -32,6 +32,8 @@ import com.template.model.weixin.HttpParame;
 import com.template.model.weixin.WechatUserUnionID;
 import com.template.services.*;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -59,6 +61,7 @@ import java.util.stream.Collectors;
  */
 @Controller
 public class WechatScanLoginController implements WechatScanLoginControllerAPI {
+    private static Logger logger = LoggerFactory.getLogger(WechatScanLoginController.class);
 
     @Autowired
     private WechatScanLoginService wechatScanLoginService;
@@ -95,7 +98,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
     public String login(Model model) throws UnsupportedEncodingException {
         Map<String, String> wechatLoginUrl = wechatScanLoginService.wechatLoginUrl();
         String url = wechatLoginUrl.get("url");
-        System.out.println(url);
+        logger.info(url);
         return "redirect:" + url;
     }
 
@@ -110,7 +113,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
     @Override
     @PassToken
     public String callback(String code, String state) throws UnsupportedEncodingException {
-        System.out.println(code + "=====" + state);
+        logger.info(code + "=====" + state);
         if (code != null && state != null) {
             // 验证state为了用于防止跨站请求伪造攻击
             String decrypt = AesUtil.decrypt(AesUtil.parseHexStr2Byte(state), AesUtil.PASSWORD_SECRET_KEY, 16);
@@ -118,10 +121,10 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                 return "redirect:" + HttpParame.FRONT_URI + "/#/login?message=" + URLEncoder.encode("请勿非法进入", "UTF-8");
             }
             AccessToken access = wechatScanLoginService.getAccessToken(code);
-            System.out.println("access:" + access);
+            logger.info("access:" + access);
             if (access != null) {
                 String openid = access.getOpenid();
-                System.out.println("openid: " + openid);
+                logger.info("openid: " + openid);
                 SmartUser user = wechatScanLoginService.selectByOpenid(openid);
                 if (user == null) {        /*不存在*/
                     return "redirect:" + HttpParame.FRONT_URI + "/#/login?message=" + URLEncoder.encode("请绑定信息", "UTF-8");
@@ -157,14 +160,14 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
         }
         Map<String, String> wechatLoginUrl = wechatScanLoginService.wechatBindUrl(phone, messageCode);
         String url = wechatLoginUrl.get("url");
-        System.out.println(url);
+        logger.info(url);
         return "redirect:" + url;
     }
 
     @Override
     @PassToken
     public String bindcallback(String code, String state, String phone, String messageCode) throws UnsupportedEncodingException {
-        System.out.println(code + "===" + state + "==" + messageCode);
+        logger.info(code + "===" + state + "==" + messageCode);
         if (code != null && state != null) {
             // 验证state为了用于防止跨站请求伪造攻击
             String decrypt = AesUtil.decrypt(AesUtil.parseHexStr2Byte(state), AesUtil.PASSWORD_SECRET_KEY, 16);
@@ -244,7 +247,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                     smartMeterDetail.setMeterPowerRecord(Double.parseDouble(display)/Double.parseDouble("100"));
                     smartMeterDetail.setMeterPower(Double.parseDouble(display)/Double.parseDouble("100")-lastRecord);
                     smartMeterDetail.setCreateTime(TimeExchange.StringToDate(elecData.getCommunication(), "yyyy-MM-dd HH:mm:ss"));
-                    System.out.println("====="+smartMeterDetail.getMeterPowerRecord());
+                    logger.info("====="+smartMeterDetail.getMeterPowerRecord());
                     smartMeterDetailService.insertSmartMeterDetail(smartMeterDetail);
                 }
             }
@@ -287,7 +290,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                     smartMeterDetail.setMeterPowerRecord(Double.parseDouble(display)/Double.parseDouble("100"));
                     smartMeterDetail.setMeterPower(Double.parseDouble(display)/Double.parseDouble("100")-lastRecord);
                     smartMeterDetail.setCreateTime(TimeExchange.StringToDate(watData.getLastUpdate(), "yyyy-MM-dd HH:mm:ss"));
-                    System.out.println("====="+smartMeterDetail.getMeterPowerRecord());
+                    logger.info("====="+smartMeterDetail.getMeterPowerRecord());
                     smartMeterDetailService.insertSmartMeterDetail(smartMeterDetail);
                 }
             }
@@ -604,7 +607,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                 "&grant_type=authorization_code";
 
         String json = HttpClientUtils.getInstance().sendHttpGet(url);
-        System.out.println(json);
+        logger.info(json);
         Gson gson = new Gson();
         HashMap<String, String> userMap = gson.fromJson(json.toString(), new TypeToken<HashMap<String, String>>() {
         }.getType());

+ 5 - 2
src/main/java/com/template/controller/WxGzhController.java

@@ -27,6 +27,8 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -38,6 +40,7 @@ import java.util.List;
 //返回参数加密注解
 @DESRespondSecret
 public class WxGzhController implements WxGzhControllerAPI {
+    private static Logger logger = LoggerFactory.getLogger(WxGzhController.class);
 
     //    公众号的唯一标识
     private static String appid = "wxa46ef222053a1047";
@@ -59,7 +62,7 @@ public class WxGzhController implements WxGzhControllerAPI {
     public CommonResult getWxGzhOpenid(String code) throws Exception {
 
         String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + appid + "&secret=" + secret + "&code=" + code + "&grant_type=authorization_code";
-        System.out.println("url = " + url);
+        logger.info("url = " + url);
 
         String s = HttpsClient.httpsRequestReturnString(url, "GET", "");
 
@@ -86,7 +89,7 @@ public class WxGzhController implements WxGzhControllerAPI {
 
         smartCodeOpenIdService.save(smartCodeOpenId);
 
-        System.out.println("openid = " + openid);
+        logger.info("openid = " + openid);
 
         jsonObject1.put("phone", "");
         return CommonResult.ok(jsonObject1);

+ 2 - 2
src/main/java/com/template/services/impl/SmartFaceDiscernServiceImpl.java

@@ -121,7 +121,7 @@ public class SmartFaceDiscernServiceImpl extends ServiceImpl<SmartFaceDiscernMap
         String decodedUrl = URLDecoder.decode(data1, "UTF-8");
 
         String decrypt = decrypt(decodedUrl, appSecret);
-//        System.out.println("decrypt = " + decrypt);
+//        logger.info("decrypt = " + decrypt);
         if (ObjectUtils.isNotEmpty(decrypt)&& decrypt!="") {
             JSONObject jsonObject2 = JSONObject.parseObject(decrypt);
 
@@ -130,7 +130,7 @@ public class SmartFaceDiscernServiceImpl extends ServiceImpl<SmartFaceDiscernMap
 
 //            获取总数
                 Integer total = Integer.valueOf(jsonObject2.getString("total"));
- //               System.out.println("total = " + total);
+ //               logger.info("total = " + total);
 
                 if (total > pageindex * pagesize) {
                     page = pageindex + 1;

+ 4 - 2
src/main/java/com/template/services/impl/SmartScoreManageServiceImpl.java

@@ -9,6 +9,8 @@ import com.template.mapper.SmartScoreManageMapper;
 import com.template.model.evaluate.teacher.*;
 import com.template.model.result.PageUtils;
 import com.template.services.SmartScoreManageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,7 +27,7 @@ import java.util.List;
  */
 @Service
 public class SmartScoreManageServiceImpl extends ServiceImpl<SmartScoreManageMapper, SmartScoreManage> implements SmartScoreManageService {
-
+    private static Logger logger = LoggerFactory.getLogger(SmartScoreManageServiceImpl.class);
     @Autowired
     private SmartScoreManageMapper smartScoreManageMapper;
     @Autowired
@@ -143,7 +145,7 @@ public class SmartScoreManageServiceImpl extends ServiceImpl<SmartScoreManageMap
             smartEvaluateTdetail.setScoreItem(mainScore.get(i).getScoreItem());
             smartEvaluateTdetail.setScoreNum(mainScore.get(i).getScoreNum());
             smartEvaluateTdetail.setOwnNum(mainScore.get(i).getOwnNum());
-            System.out.println("===="+mainScore.get(i).getOwnNum());
+            logger.info("===="+mainScore.get(i).getOwnNum());
             smartEvaluateTdetail.setDeleted(mainScore.get(i).getDeleted());
             QueryWrapper<SmartEvaluateTdetail> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("deleted", 0);

+ 18 - 13
src/main/java/com/template/services/impl/SmartUploadServiceImpl.java

@@ -13,6 +13,7 @@ import com.qcloud.cos.model.CannedAccessControlList;
 import com.qcloud.cos.model.ObjectMetadata;
 import com.qcloud.cos.model.PutObjectRequest;
 import com.qcloud.cos.region.Region;
+import com.template.common.utils.DateUtils;
 import com.template.common.utils.TimeExchange;
 import com.template.config.CosConfig;
 import com.template.mapper.SmartUserMapper;
@@ -23,6 +24,8 @@ import com.template.model.vo.AffiliateUserVo;
 import com.template.services.SmartUploadService;
 import com.template.services.SmartUserService;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -44,6 +47,8 @@ import java.util.List;
 @Service
 public class SmartUploadServiceImpl implements SmartUploadService {
 
+    private static Logger logger = LoggerFactory.getLogger(SmartUploadServiceImpl.class);
+
     @Resource
     private COSClient cosClient;
 
@@ -64,34 +69,34 @@ public class SmartUploadServiceImpl implements SmartUploadService {
         String res = "";
         try {
             for (MultipartFile file : files) {
-                System.out.println("运行时间1:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间1:"+ TimeExchange.DateToString(new Date()));
                 String originalFileName = file.getOriginalFilename();
-                System.out.println("运行时间2:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间2:"+ TimeExchange.DateToString(new Date()));
                 // 获得文件流
                 InputStream inputStream = null;
-                System.out.println("运行时间3:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间3:"+ TimeExchange.DateToString(new Date()));
                 inputStream = file.getInputStream();
-                System.out.println("运行时间4:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间4:"+ TimeExchange.DateToString(new Date()));
                 // 设置文件路径
                 String filePath = getFilePath(originalFileName, "excelModel");
-                System.out.println("运行时间5:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间5:"+ TimeExchange.DateToString(new Date()));
                 // 上传文件
                 String bucketName = cosConfig.getBucketName();
-                System.out.println("运行时间6:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间6:"+ TimeExchange.DateToString(new Date()));
                 ObjectMetadata objectMetadata = new ObjectMetadata();
-                System.out.println("运行时间7:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间7:"+ TimeExchange.DateToString(new Date()));
                 objectMetadata.setContentLength(file.getSize());
-                System.out.println("运行时间8:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间8:"+ TimeExchange.DateToString(new Date()));
                 objectMetadata.setContentType(file.getContentType());
-                System.out.println("运行时间9:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间9:"+ TimeExchange.DateToString(new Date()));
                 PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, filePath, inputStream, objectMetadata);
-                System.out.println("运行时间10:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间10:"+ TimeExchange.DateToString(new Date()));
                 cosClientU.putObject(putObjectRequest);
-                System.out.println("运行时间11:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间11:"+ TimeExchange.DateToString(new Date()));
                 cosClientU.setBucketAcl(bucketName, CannedAccessControlList.PublicRead);
-                System.out.println("运行时间12:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间12:"+ TimeExchange.DateToString(new Date()));
                 String url = cosConfig.getPath() + "/" + filePath;
-                System.out.println("运行时间11:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间11:"+ TimeExchange.DateToString(new Date()));
                 res += url + ",";
             }
             String paths = res.substring(0, res.length() - 1);

+ 11 - 8
src/test/java/com/template/MybatisPlusApplicationTests.java

@@ -1,6 +1,8 @@
 package com.template;
 
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -10,13 +12,14 @@ class MybatisPlusApplicationTests {
     String privateKey;
     @Value("${my-security.publicKey}")
     String publicKey;
+    private static Logger logger = LoggerFactory.getLogger(MybatisPlusApplicationTests.class);
 
     @Test
     void contextLoads() {
-//        System.out.println(mySecurity.toString());
+//        logger.info(mySecurity.toString());
 
-        System.out.println("privateKey = " + privateKey);
-        System.out.println("publicKey = " + publicKey);
+        logger.info("privateKey = " + privateKey);
+        logger.info("publicKey = " + publicKey);
     }
 
 //    // 继承了BaseMapper,所有的方法都来自己父类
@@ -41,8 +44,8 @@ class MybatisPlusApplicationTests {
 //        playbackRecord.setShareeId("654321");
 //
 //        int result = playbackRecordMapper.insert(playbackRecord); // 帮我们自动生成id
-//        System.out.println(result); // 受影响的行数
-//        System.out.println(playbackRecord); // 发现,id会自动回填
+//        logger.info(result); // 受影响的行数
+//        logger.info(playbackRecord); // 发现,id会自动回填
 //    }
 //
 //    // 测试更新
@@ -53,7 +56,7 @@ class MybatisPlusApplicationTests {
 //        playbackRecord.setShareeId("123456");
 //        // 注意:updateById 但是参数是一个 对象!
 //        int i = playbackRecordMapper.updateById(playbackRecord);
-//        System.out.println(i);
+//        logger.info(i);
 //    }
 //
 //    // 测试乐观锁成功!
@@ -89,7 +92,7 @@ class MybatisPlusApplicationTests {
 //    @Test
 //    public void testSelectById(){
 //        PlaybackRecord playbackRecord = playbackRecordMapper.selectById(1L);
-//        System.out.println(playbackRecord);
+//        logger.info(playbackRecord);
 //    }
 //
 //    // 测试批量查询!
@@ -120,7 +123,7 @@ class MybatisPlusApplicationTests {
 //        playbackRecordMapper.selectPage(page,null);
 //
 //        page.getRecords().forEach(System.out::println);
-//        System.out.println(page.getTotal());
+//        logger.info(page.getTotal());
 //
 //    }
 //

+ 8 - 5
src/test/java/com/template/WrapperTest.java

@@ -2,12 +2,15 @@ package com.template;
 
 import com.template.config.MySecurity;
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
 public class WrapperTest {
+    private static Logger logger = LoggerFactory.getLogger(WrapperTest.class);
     @Value("${my-security.privateKey}")
      String privateKey;
     @Value("${my-security.publicKey}")
@@ -17,9 +20,9 @@ public class WrapperTest {
     MySecurity mySecurity;
     @Test
     void contextLoads() {
-        System.out.println(mySecurity.toString());
-        System.out.println("privateKey = " + privateKey);
-        System.out.println("publicKey = " + publicKey);
+        logger.info(mySecurity.toString());
+        logger.info("privateKey = " + privateKey);
+        logger.info("publicKey = " + publicKey);
     }
 
 
@@ -43,7 +46,7 @@ public class WrapperTest {
 //        QueryWrapper<PlaybackRecord> wrapper = new QueryWrapper<>();
 //        wrapper.eq("name","123456");
 //        PlaybackRecord playbackRecord = playbackRecordMapper.selectOne(wrapper); // 查询一个数据,出现多个结果使用List 或者 Map
-//        System.out.println(playbackRecord);
+//        logger.info(playbackRecord);
 //    }
 //
 //    @Test
@@ -52,7 +55,7 @@ public class WrapperTest {
 //        QueryWrapper<PlaybackRecord> wrapper = new QueryWrapper<>();
 //        wrapper.between("age",20,30); // 区间
 //        Integer count = playbackRecordMapper.selectCount(wrapper);// 查询结果数
-//        System.out.println(count);
+//        logger.info(count);
 //    }
 //
 //    // 模糊查询

BIN=BIN
target/mybatis_plus-0.0.1-SNAPSHOT.jar.original


+ 3 - 3
wanzai/src/main/java/com/template/aop/LoginCheckAspect.java

@@ -21,7 +21,7 @@ public class LoginCheckAspect {
 
     @Around("@annotation(com.template.annotation.UserLoginCheck)")
     public Object userLoginCheck(ProceedingJoinPoint process) throws Throwable {
-        System.out.println("用户登录检测机制");
+        logger.info("用户登录检测机制");
         if(1 == 1){
            //通过抛异常方式拦截
            // throw new Exception("非法登录");
@@ -34,12 +34,12 @@ public class LoginCheckAspect {
 
     @After("@annotation(com.template.annotation.UserLoginCheck)")
     public void test(){
-        System.out.println("测试After");
+        logger.info("测试After");
     }
 
     @Before("@annotation(com.template.annotation.UserLoginCheck)")
     public void test1(){
-        System.out.println("测试Before");
+        logger.info("测试Before");
     }
 
 }

+ 1 - 1
wanzai/src/main/java/com/template/common/jh/SectionUtil.java

@@ -236,7 +236,7 @@ public class SectionUtil {
         all.add(re3);
         all.add(re4);
         all.add(re5);
-        System.out.println(compareSection(all));
+        logger.info(compareSection(all));
     }
 }
 

+ 1 - 1
wanzai/src/main/java/com/template/common/utils/AesTestOne.java

@@ -80,6 +80,6 @@ public class AesTestOne {
 
     public static void main(String[] args) throws Exception {
         // URL解码
-        System.out.println("");
+        logger.info("");
     }
 }

+ 2 - 2
wanzai/src/main/java/com/template/common/utils/AesUtils.java

@@ -191,9 +191,9 @@ public class AesUtils {
                 "}";
         //加密
         String encryptString = AesUtils.encrypt("548903");
-        System.out.println("加密后字符串:"+encryptString);
+        logger.info("加密后字符串:"+encryptString);
         //解密
         String decryptString = AesUtils.decrypt(encryptString);
-        System.out.println("解密后字符串:"+decryptString);
+        logger.info("解密后字符串:"+decryptString);
     }
 }

+ 2 - 2
wanzai/src/main/java/com/template/common/utils/ClassYear.java

@@ -12,9 +12,9 @@ public class ClassYear {
         // 获取当前日期
         int admissionYear = getAdmissionYear(stage, currentYear, currentDate);
         if (admissionYear != -1) {
-            System.out.println("入学年份:" + admissionYear);
+            logger.info("入学年份:" + admissionYear);
         } else {
-            System.out.println("无法获取入学年份");
+            logger.info("无法获取入学年份");
         }
     }
 

+ 5 - 5
wanzai/src/main/java/com/template/common/utils/CommonUtil.java

@@ -106,18 +106,18 @@ public class CommonUtil {
         String ipAddress = null;
         try {
             ipAddress = request.getHeader("x-forwarded-for");
-            System.out.println("x-forwarded-for=" + ipAddress);
+            logger.info("x-forwarded-for=" + ipAddress);
             if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
                 ipAddress = request.getHeader("Proxy-Client-IP");
-                System.out.println("Proxy-Client-IP=" + ipAddress);
+                logger.info("Proxy-Client-IP=" + ipAddress);
             }
             if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
                 ipAddress = request.getHeader("WL-Proxy-Client-IP");
-                System.out.println("WL-Proxy-Client-IP=" + ipAddress);
+                logger.info("WL-Proxy-Client-IP=" + ipAddress);
             }
             if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
                 ipAddress = request.getRemoteAddr();
-                System.out.println("getRemoteAddr=" + ipAddress);
+                logger.info("getRemoteAddr=" + ipAddress);
                 if (ipAddress.equals("127.0.0.1")) {
                     // 根据网卡取本机配置的IP
                     InetAddress inet = null;
@@ -127,7 +127,7 @@ public class CommonUtil {
                         e.printStackTrace();
                     }
                     ipAddress = inet.getHostAddress();
-                    System.out.println("getHostAddress=" + ipAddress);
+                    logger.info("getHostAddress=" + ipAddress);
                 }
             }
             // 对于通过多个代理的情况,第一个IP为客户端真实IP,多个IP按照','分割

+ 4 - 4
wanzai/src/main/java/com/template/common/utils/DBUtil.java

@@ -159,7 +159,7 @@ public class DBUtil {
             while (tables.next()) {
                 String tableName = tables.getString("TABLE_NAME");
                 String comment = getTableComment(metaData, tableName);
-                System.out.println(tableName + "[" + comment + "]");
+                logger.info(tableName + "[" + comment + "]");
                 list.add(tableName + "[" + comment + "]");
             }
 
@@ -240,7 +240,7 @@ public class DBUtil {
                 rs.close();
             } catch (SQLException e) {
                 e.printStackTrace();
-                System.out.println(e.getMessage());
+                logger.info(e.getMessage());
             }
         }
     }
@@ -251,7 +251,7 @@ public class DBUtil {
                 stmt.close();
             } catch (SQLException e) {
                 e.printStackTrace();
-                System.out.println(e.getMessage());
+                logger.info(e.getMessage());
             }
         }
     }
@@ -262,7 +262,7 @@ public class DBUtil {
                 conn.close();
             } catch (SQLException e) {
                 e.printStackTrace();
-                System.out.println(e.getMessage());
+                logger.info(e.getMessage());
             }
         }
     }

+ 6 - 6
wanzai/src/main/java/com/template/common/utils/DateUtils.java

@@ -12,7 +12,7 @@ import java.util.GregorianCalendar;
 /**
  * <p>Title: DateUtils</p>
  * <p>Description:日期工具类 </p>
- * 
+ *
  * @author fengyong
  * @date 2018年9月7日
  */
@@ -26,7 +26,7 @@ public class DateUtils {
 
 	/**
 	 * 如2018 0901 232211(年月日时分秒)
-	 * 
+	 *
 	 * @return
 	 */
 	public String yyyyMMddHHmmss() {
@@ -36,7 +36,7 @@ public class DateUtils {
 
 	/**
 	 * 如20180901
-	 * 
+	 *
 	 * @return
 	 */
 	public static String getYYYYMMdd() {
@@ -111,7 +111,7 @@ public class DateUtils {
 
 	/**
 	 * 字符串转换成日期
-	 * 
+	 *
 	 * @param str 字符串
 	 * @param format 日期格式
 	 * @return 日期
@@ -234,8 +234,8 @@ public class DateUtils {
 	}
 
 	public static void main(String[] args) {
-		System.out.println(getrightDate("2018-09", 4));
-		System.out.println(date2Str(getnextLast("2018-09", 4), "yyyy-MM"));
+		logger.info(getrightDate("2018-09", 4));
+		logger.info(date2Str(getnextLast("2018-09", 4), "yyyy-MM"));
 	}
 
 }

+ 2 - 2
wanzai/src/main/java/com/template/common/utils/ExcelUtils.java

@@ -42,7 +42,7 @@ public class ExcelUtils {
             out.close();
             inputStream.close();
         } catch (IOException ex) {
-            System.out.println("模板导出失败:" + ex.getMessage());
+            logger.info("模板导出失败:" + ex.getMessage());
             ex.printStackTrace();
         }
     }
@@ -57,7 +57,7 @@ public class ExcelUtils {
             out.flush();
             out.close();
         } catch (IOException ex) {
-            System.out.println("模板导出失败:" + ex.getMessage());
+            logger.info("模板导出失败:" + ex.getMessage());
             ex.printStackTrace();
         }
     }

+ 54 - 54
wanzai/src/main/java/com/template/common/utils/ExcelUtils2.java

@@ -1,5 +1,5 @@
 package com.template.common.utils;
- 
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.template.annotation.ExcelExport;
@@ -15,7 +15,7 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
- 
+
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -28,17 +28,17 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
- 
+
 /**
  * Excel导入导出工具类
- * 
+ *
  *
  * @author sunnyzyq
  * @date 2021/12/17
  */
 @SuppressWarnings("unused")
 public class ExcelUtils2 {
- 
+
     private static final String XLSX = ".xlsx";
     private static final String XLS = ".xls";
     public static final String ROW_MERGE = "row_merge";
@@ -55,34 +55,34 @@ public class ExcelUtils2 {
     private static final char LEAN_LINE = '/';
     private static final int BYTES_DEFAULT_LENGTH = 10240;
     private static final NumberFormat NUMBER_FORMAT = NumberFormat.getNumberInstance();
- 
- 
+
+
     public static <T> List<T> readFile(File file, Class<T> clazz) throws Exception {
         JSONArray array = readFile(file);
         return getBeanList(array, clazz);
     }
- 
+
     public static <T> List<T> readMultipartFile(MultipartFile mFile, Class<T> clazz) throws Exception {
         JSONArray array = readMultipartFile(mFile);
         return getBeanList(array, clazz);
     }
- 
+
     public static JSONArray readFile(File file) throws Exception {
         return readExcel(null, file);
     }
- 
+
     public static JSONArray readMultipartFile(MultipartFile mFile) throws Exception {
         return readExcel(mFile, null);
     }
- 
+
     public static Map<String, JSONArray> readFileManySheet(File file) throws Exception {
         return readExcelManySheet(null, file);
     }
- 
+
     public static Map<String, JSONArray> readFileManySheet(MultipartFile file) throws Exception {
         return readExcelManySheet(file, null);
     }
- 
+
     private static <T> List<T> getBeanList(JSONArray array, Class<T> clazz) throws Exception {
         List<T> list = new ArrayList<>();
         Map<Integer, String> uniqueMap = new HashMap<>(16);
@@ -91,7 +91,7 @@ public class ExcelUtils2 {
         }
         return list;
     }
- 
+
     /**
      * 获取每个对象的数据
      */
@@ -159,7 +159,7 @@ public class ExcelUtils2 {
         }
         return t;
     }
- 
+
     private static <T> void setFieldValue(T t, Field field, JSONObject obj, StringBuilder uniqueBuilder, List<String> errMsgList) {
         // 获取 ExcelImport 注解属性
         ExcelImport annotation = field.getAnnotation(ExcelImport.class);
@@ -245,7 +245,7 @@ public class ExcelUtils2 {
             e.printStackTrace();
         }
     }
- 
+
     private static Map<String, JSONArray> readExcelManySheet(MultipartFile mFile, File file) throws IOException {
         Workbook book = getWorkbook(mFile, file);
         if (book == null) {
@@ -260,7 +260,7 @@ public class ExcelUtils2 {
         book.close();
         return map;
     }
- 
+
     private static JSONArray readExcel(MultipartFile mFile, File file) throws IOException {
         Workbook book = getWorkbook(mFile, file);
         if (book == null) {
@@ -270,7 +270,7 @@ public class ExcelUtils2 {
         book.close();
         return array;
     }
- 
+
     private static Workbook getWorkbook(MultipartFile mFile, File file) throws IOException {
         boolean fileNotExist = (file == null || !file.exists());
         if (mFile == null && fileNotExist) {
@@ -300,7 +300,7 @@ public class ExcelUtils2 {
         in.close();
         return book;
     }
- 
+
     private static JSONArray readSheet(Sheet sheet) {
         // 首行下标
         int rowStart = sheet.getFirstRowNum();
@@ -358,7 +358,7 @@ public class ExcelUtils2 {
         }
         return array;
     }
- 
+
     private static String getCellValue(Cell cell) {
         // 空白或空
         if (cell == null || cell.getCellTypeEnum() == CellType.BLANK) {
@@ -389,21 +389,21 @@ public class ExcelUtils2 {
         // 错误类型
         return cell.getCellFormula();
     }
- 
+
     public static <T> void exportTemplate(HttpServletResponse response, String fileName, Class<T> clazz) {
         exportTemplate(response, fileName, fileName, clazz, false);
     }
- 
+
     public static <T> void exportTemplate(HttpServletResponse response, String fileName, String sheetName,
                                           Class<T> clazz) {
         exportTemplate(response, fileName, sheetName, clazz, false);
     }
- 
+
     public static <T> void exportTemplate(HttpServletResponse response, String fileName, Class<T> clazz,
                                           boolean isContainExample) {
         exportTemplate(response, fileName, fileName, clazz, isContainExample);
     }
- 
+
     public static <T> void exportTemplate(HttpServletResponse response, String fileName, String sheetName,
                                           Class<T> clazz, boolean isContainExample) {
         // 获取表头字段
@@ -429,7 +429,7 @@ public class ExcelUtils2 {
         // 导出数据
         export(response, fileName, sheetName, sheetDataList, selectMap);
     }
- 
+
     private static <T> List<ExcelClassField> getExcelClassFieldList(Class<T> clazz) {
         // 解析所有字段
         Field[] fields = clazz.getDeclaredFields();
@@ -467,7 +467,7 @@ public class ExcelUtils2 {
         }
         return headFieldList;
     }
- 
+
     private static ExcelClassField getExcelClassField(Field field) {
         ExcelClassField cf = new ExcelClassField();
         String fieldName = field.getName();
@@ -499,7 +499,7 @@ public class ExcelUtils2 {
         cf.setKvMap(getKvMap(kv));
         return cf;
     }
- 
+
     private static LinkedHashMap<String, String> getKvMap(String kv) {
         LinkedHashMap<String, String> kvMap = new LinkedHashMap<>();
         if (kv.isEmpty()) {
@@ -523,7 +523,7 @@ public class ExcelUtils2 {
         }
         return kvMap;
     }
- 
+
     /**
      * 导出表格到本地
      *
@@ -532,7 +532,7 @@ public class ExcelUtils2 {
      */
     public static void exportFile(File file, List<List<Object>> sheetData) {
         if (file == null) {
-            System.out.println("文件创建失败");
+            logger.info("文件创建失败");
             return;
         }
         if (sheetData == null) {
@@ -542,7 +542,7 @@ public class ExcelUtils2 {
         map.put(file.getName(), sheetData);
         export(null, file, file.getName(), map, null);
     }
- 
+
     /**
      * 导出表格到本地
      *
@@ -558,7 +558,7 @@ public class ExcelUtils2 {
         exportFile(file, sheetData);
         return file;
     }
- 
+
     /**
      * 获取文件
      *
@@ -587,7 +587,7 @@ public class ExcelUtils2 {
                 fileFullPath = dirPath + LEAN_LINE + fileName + XLSX;
             }
         }
-        System.out.println(fileFullPath);
+        logger.info(fileFullPath);
         File file = new File(fileFullPath);
         if (!file.exists()) {
             boolean result = file.createNewFile();
@@ -597,7 +597,7 @@ public class ExcelUtils2 {
         }
         return file;
     }
- 
+
     private static <T> List<List<Object>> getSheetData(List<T> list) {
         // 获取表头字段
         List<ExcelClassField> excelClassFieldList = getExcelClassFieldList(list.get(0).getClass());
@@ -645,7 +645,7 @@ public class ExcelUtils2 {
         }
         return sheetDataList;
     }
- 
+
     private static <T> Map<String, Object> getFieldDataMap(T t) {
         Map<String, Object> map = new HashMap<>();
         Field[] fields = t.getClass().getDeclaredFields();
@@ -661,7 +661,7 @@ public class ExcelUtils2 {
         }
         return map;
     }
- 
+
     public static void exportEmpty(HttpServletResponse response, String fileName) {
         List<List<Object>> sheetDataList = new ArrayList<>();
         List<Object> headList = new ArrayList<>();
@@ -669,29 +669,29 @@ public class ExcelUtils2 {
         sheetDataList.add(headList);
         export(response, fileName, sheetDataList);
     }
- 
+
     public static void export(HttpServletResponse response, String fileName, List<List<Object>> sheetDataList) {
         export(response, fileName, fileName, sheetDataList, null);
     }
- 
+
     public static void exportManySheet(HttpServletResponse response, String fileName, Map<String, List<List<Object>>> sheetMap) {
         export(response, null, fileName, sheetMap, null);
     }
- 
- 
+
+
     public static void export(HttpServletResponse response, String fileName, String sheetName,
                               List<List<Object>> sheetDataList) {
         export(response, fileName, sheetName, sheetDataList, null);
     }
- 
+
     public static void export(HttpServletResponse response, String fileName, String sheetName,
                               List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
- 
+
         Map<String, List<List<Object>>> map = new HashMap<>();
         map.put(sheetName, sheetDataList);
         export(response, null, fileName, map, selectMap);
     }
- 
+
     public static <T, K> void export(HttpServletResponse response, String fileName, List<T> list, Class<K> template) {
         // list 是否为空
         boolean lisIsEmpty = list == null || list.isEmpty();
@@ -709,11 +709,11 @@ public class ExcelUtils2 {
         List<List<Object>> sheetDataList = getSheetData(list);
         export(response, fileName, sheetDataList);
     }
- 
+
     public static void export(HttpServletResponse response, String fileName, List<List<Object>> sheetDataList, Map<Integer, List<String>> selectMap) {
         export(response, fileName, fileName, sheetDataList, selectMap);
     }
- 
+
     private static void export(HttpServletResponse response, File file, String fileName,
                                Map<String, List<List<Object>>> sheetMap, Map<Integer, List<String>> selectMap) {
         // 整个 Excel 表格 book 对象
@@ -791,7 +791,7 @@ public class ExcelUtils2 {
             }
         }
     }
- 
+
     /**
      * 合并当前Sheet页的单元格
      *
@@ -855,7 +855,7 @@ public class ExcelUtils2 {
             }
         }
     }
- 
+
     private static void write(HttpServletResponse response, SXSSFWorkbook book, String fileName) throws IOException {
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
@@ -866,7 +866,7 @@ public class ExcelUtils2 {
         out.flush();
         out.close();
     }
- 
+
     private static int setCellValue(Cell cell, Object o, CellStyle style) {
         // 设置样式
         cell.setCellStyle(style);
@@ -925,7 +925,7 @@ public class ExcelUtils2 {
         cell.setCellValue(o.toString());
         return CELL_OTHER;
     }
- 
+
     private static void setCellPicture(SXSSFWorkbook wb, Row sr, Drawing<?> patriarch, int x, int y, URL url) {
         // 设置图片宽高
         sr.setHeight((short) (IMG_WIDTH * IMG_HEIGHT));
@@ -945,7 +945,7 @@ public class ExcelUtils2 {
             e.printStackTrace();
         }
     }
- 
+
     private static String formatDate(Date date) {
         if (date == null) {
             return "";
@@ -953,7 +953,7 @@ public class ExcelUtils2 {
         SimpleDateFormat format = new SimpleDateFormat(DATE_FORMAT);
         return format.format(date);
     }
- 
+
     private static void setSelect(Sheet sheet, Map<Integer, List<String>> selectMap) {
         if (selectMap == null || selectMap.isEmpty()) {
             return;
@@ -982,7 +982,7 @@ public class ExcelUtils2 {
             sheet.addValidationData(dv);
         }
     }
- 
+
     private static boolean isNumeric(String str) {
         if (Objects.nonNull(str) && "0.0".equals(str)) {
             return true;
@@ -994,7 +994,7 @@ public class ExcelUtils2 {
         }
         return true;
     }
- 
+
     private static String getString(String s) {
         if (s == null) {
             return "";
@@ -1004,5 +1004,5 @@ public class ExcelUtils2 {
         }
         return s.trim();
     }
- 
-}
+
+}

+ 1 - 1
wanzai/src/main/java/com/template/common/utils/GetCameraPreviewURL.java

@@ -107,6 +107,6 @@ public class GetCameraPreviewURL {
 //        String result = CameraPreviewURL("/api/eventService/v1/eventUnSubscriptionByEventTypes", jsonBody);
 
 
-        System.out.println("result结果示例: " + result);
+        logger.info("result结果示例: " + result);
     }
 }

+ 2 - 2
wanzai/src/main/java/com/template/common/utils/HttpClientUtils.java

@@ -117,12 +117,12 @@ public class HttpClientUtils {
 			long execStart = System.currentTimeMillis();
 			response = httpClient.execute(httpPost);
 			long execEnd = System.currentTimeMillis();
-			System.out.println("=================执行post请求耗时:"+(execEnd-execStart)+"ms");
+			logger.info("=================执行post请求耗时:"+(execEnd-execStart)+"ms");
 			long getStart = System.currentTimeMillis();
 			entity = response.getEntity();
 			responseContent = EntityUtils.toString(entity, "UTF-8");
 			long getEnd = System.currentTimeMillis();
-			System.out.println("=================获取响应结果耗时:"+(getEnd-getStart)+"ms");
+			logger.info("=================获取响应结果耗时:"+(getEnd-getStart)+"ms");
 		} catch (Exception e) {
 			e.printStackTrace();
 		} finally {

+ 6 - 6
wanzai/src/main/java/com/template/common/utils/HttpsClient.java

@@ -63,7 +63,7 @@ public class HttpsClient {
      */
     public static JSONObject httpsRequestReturnJSONObject(String requestUrl, String requestMethod, String postData) throws Exception{
         JSONObject  jsonObject = JSONObject.parseObject(HttpsClient.httpsRequestReturnString(requestUrl,requestMethod,postData));
-        System.out.println("jsonObjectDate:  " + jsonObject);
+        logger.info("jsonObjectDate:  " + jsonObject);
         return jsonObject;
     }
 
@@ -200,7 +200,7 @@ public class HttpsClient {
                 url.openConnection();
         httpConn.setRequestMethod("GET");
         httpConn.connect();
-        System.out.println("bbb: "+httpConn.getResponseCode());
+        logger.info("bbb: "+httpConn.getResponseCode());
         BufferedReader reader = new BufferedReader(new InputStreamReader(
                 httpConn.getInputStream(),"utf-8"));
         String line;
@@ -320,7 +320,7 @@ public class HttpsClient {
                 result += line;
             }
         } catch (Exception e) {
-            System.out.println("发送 请求出现异常!" + e);
+            logger.info("发送 请求出现异常!" + e);
             e.printStackTrace();
         }
         // 使用finally块来关闭输出流、输入流
@@ -385,7 +385,7 @@ public class HttpsClient {
                 result = "获取输入流异常!";
             }
         } catch (Exception e) {
-            System.out.println("发送 请求出现异常!" + e);
+            logger.info("发送 请求出现异常!" + e);
             e.printStackTrace();
         }
         // 使用finally块来关闭输出流、输入流
@@ -449,7 +449,7 @@ public class HttpsClient {
             // 读取响应
             is = connection.getInputStream();
             int length = (int) connection.getContentLength();// 获取字节长度
-//            System.out.println(length);
+//            logger.info(length);
             if (length != -1) {
                 byte[] data = new byte[length];
                 byte[] temp = new byte[512];
@@ -525,6 +525,6 @@ public class HttpsClient {
         json.put("energyType", "2");
         json.put("updateTime", "2021-09-09 10:15:33");
         String msg = sendJson2("https://chtech.ncjti.edu.cn/bigdata-api/api/energy/energyDataUpload", json);
-        System.out.println(msg);
+        logger.info(msg);
     }
 }

+ 2 - 2
wanzai/src/main/java/com/template/common/utils/Message.java

@@ -67,7 +67,7 @@ public class Message {
         data.put("thing27",thing27);
         message.put("data", data);
         String msg = HttpsClient.sendJson("https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+token, message);
-        System.out.println("小程序端消息发生:"+msg);
+        logger.info("小程序端消息发生:"+msg);
         return msg;
     }
 
@@ -542,7 +542,7 @@ public class Message {
 
 
     public static void main(String[] args) throws Exception {
-        System.out.println(send("ou2uV5DGDxJ7BouxiAZZigGQFIHU","测试","测试",
+        logger.info(send("ou2uV5DGDxJ7BouxiAZZigGQFIHU","测试","测试",
                 "2023-08-25","2023-08-26","cesss"));
     }
 }

+ 3 - 3
wanzai/src/main/java/com/template/common/utils/Message2.java

@@ -86,7 +86,7 @@ public class Message2 {
         message.put("data",data);
 
         String s1 = HttpsClient.sendJson("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + access_token, message);
-        System.out.println("s1 = " + s1);
+        logger.info("s1 = " + s1);
         return s1;
     }
 
@@ -96,7 +96,7 @@ public class Message2 {
 
         String s = HttpsClient.httpsRequestReturnString(url, "GET", "");
         JSONObject jsonObject = JSONObject.parseObject(s);
-        System.out.println("jsonObject = " + jsonObject);
+        logger.info("jsonObject = " + jsonObject);
         String access_token = jsonObject.getString("access_token");
 //        HttpsClient.httpsRequestReturnString("https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="+access_token, "POST", message.toJSONString());
         return access_token;
@@ -108,6 +108,6 @@ public class Message2 {
     public static void main(String[] args) throws Exception {
         String o9MsY67wqvQ__o_pOzF7oeN4MQPM = send("o9MsY67wqvQ__o_pOzF7oeN4MQPM","进入区域","IPCamera 01","2024-01-29 16:16:14");
 //        String token = getToken();
-//        System.out.println("token = " + token);
+//        logger.info("token = " + token);
     }
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 10 - 10
wanzai/src/main/java/com/template/common/utils/RSAUtils.java


+ 4 - 4
wanzai/src/main/java/com/template/common/utils/RequestUtils.java

@@ -39,7 +39,7 @@ public class RequestUtils {
             Map<String, List<String>> map = connection.getHeaderFields();
             // 遍历所有的响应头字段
             for (String key : map.keySet()) {
-                System.out.println(key + "--->" + map.get(key));
+                logger.info(key + "--->" + map.get(key));
             }
             // 定义 BufferedReader输入流来读取URL的响应
             in = new BufferedReader(new InputStreamReader(
@@ -49,7 +49,7 @@ public class RequestUtils {
                 result += line;
             }
         } catch (Exception e) {
-            System.out.println("发送GET请求出现异常!" + e);
+            logger.info("发送GET请求出现异常!" + e);
             e.printStackTrace();
         }
         // 使用finally块来关闭输入流
@@ -103,7 +103,7 @@ public class RequestUtils {
                 result += line;
             }
         } catch (Exception e) {
-            System.out.println("发送 POST 请求出现异常!" + e);
+            logger.info("发送 POST 请求出现异常!" + e);
             e.printStackTrace();
         }
         //使用finally块来关闭输出流、输入流
@@ -152,7 +152,7 @@ public class RequestUtils {
 
             // 获取响应码
             int responseCode = connection.getResponseCode();
-            System.out.println("POST Response Code :: " + responseCode);
+            logger.info("POST Response Code :: " + responseCode);
 
             // 读取响应内容
             if (responseCode == HttpsURLConnection.HTTP_OK) {

+ 5 - 5
wanzai/src/main/java/com/template/common/utils/SendSms.java

@@ -148,10 +148,10 @@ public class SendSms {
             SendSmsResponse res = client.SendSms(req);
 
             // 输出json格式的字符串回包
-//            System.out.println(SendSmsResponse.toJsonString(res));
+//            logger.info(SendSmsResponse.toJsonString(res));
 
             // 也可以取出单个值,你可以通过官网接口文档或跳转到response对象的定义处查看返回字段的定义
-            // System.out.println(res.getRequestId());
+            // logger.info(res.getRequestId());
 
             /* 当出现以下错误码时,快速解决方案参考
              * [FailedOperation.SignatureIncorrectOrUnapproved](https://cloud.tencent.com/document/product/382/9558#.E7.9F.AD.E4.BF.A1.E5.8F.91.E9.80.81.E6.8F.90.E7.A4.BA.EF.BC.9Afailedoperation.signatureincorrectorunapproved-.E5.A6.82.E4.BD.95.E5.A4.84.E7.90.86.EF.BC.9F)
@@ -161,8 +161,8 @@ public class SendSms {
              * 更多错误,可咨询[腾讯云助手](https://tccc.qcloud.com/web/im/index.html#/chat?webAppId=8fa15978f85cb41f7e2ea36920cb3ae1&title=Sms)
              */
             SendStatus sendStatus = res.getSendStatusSet()[0];
-            System.out.println(sendStatus.getMessage());
-//            System.out.println("sendStatus = " + sendStatus);
+            logger.info(sendStatus.getMessage());
+//            logger.info("sendStatus = " + sendStatus);
             returString = sendStatus.getMessage();
         } catch (TencentCloudSDKException e) {
             e.printStackTrace();
@@ -194,7 +194,7 @@ public class SendSms {
             req.setPhoneNumberSet(phoneNumbers);
             SendSmsResponse res = client.SendSms(req);
             SendStatus sendStatus = res.getSendStatusSet()[0];
-            System.out.println(sendStatus.getMessage());
+            logger.info(sendStatus.getMessage());
             returString = sendStatus.getMessage();
         } catch (TencentCloudSDKException e) {
             e.printStackTrace();

+ 6 - 6
wanzai/src/main/java/com/template/common/utils/TimeExchange.java

@@ -58,7 +58,7 @@ public class TimeExchange {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             dateStr = dateFormat.format(time);
-            System.out.println(dateStr);
+            logger.info(dateStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -93,7 +93,7 @@ public class TimeExchange {
             e.printStackTrace();
         }
         if (times == 0) {
-            System.out.println("String转10位时间戳失败");
+            logger.info("String转10位时间戳失败");
         }
         return times;
 
@@ -114,7 +114,7 @@ public class TimeExchange {
         try {
             //方法一
             tsStr = dateFormat.format(ts);
-            System.out.println(tsStr);
+            logger.info(tsStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -133,7 +133,7 @@ public class TimeExchange {
         Date date = new Date();
         try {
             date = ts;
-            //System.out.println(date);
+            //logger.info(date);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -431,7 +431,7 @@ public class TimeExchange {
         DateFormat dateFormat = new SimpleDateFormat(formatStr);
         try {
             date = dateFormat.parse(time);
-            System.out.println(date.toString());
+            logger.info(date.toString());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -752,7 +752,7 @@ public class TimeExchange {
     public static void main(String[] args) {
         int bzValue = 1 / 2;
         String sdsd ="";
-        System.out.println(bzValue);
+        logger.info(bzValue);
 
     }
 

+ 9 - 9
wanzai/src/main/java/com/template/common/utils/TimeExchange2.java

@@ -29,7 +29,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             date = dateFormat.parse(time);
-            System.out.println(date.toString());
+            logger.info(date.toString());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -44,7 +44,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             date = dateFormat.parse(time);
-            System.out.println(date.toString());
+            logger.info(date.toString());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -87,7 +87,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH/mm/ss");
         try {
             dateStr = dateFormat.format(time);
-            System.out.println(dateStr);
+            logger.info(dateStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -119,7 +119,7 @@ public class TimeExchange2 {
             e.printStackTrace();
         }
         if(times==0){
-            System.out.println("String转10位时间戳失败");
+            logger.info("String转10位时间戳失败");
         }
         return times;
 
@@ -138,7 +138,7 @@ public class TimeExchange2 {
         try {
             //方法一
             tsStr = dateFormat.format(ts);
-            System.out.println(tsStr);
+            logger.info(tsStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -155,7 +155,7 @@ public class TimeExchange2 {
         Date date = new Date();
         try {
             date = ts;
-            //System.out.println(date);
+            //logger.info(date);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -419,7 +419,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat(formatStr);
         try {
             date = dateFormat.parse(time);
-            System.out.println(date.toString());
+            logger.info(date.toString());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -456,7 +456,7 @@ public class TimeExchange2 {
         DateFormat dateFormat = new SimpleDateFormat(FormatStr);
         try {
             dateStr = dateFormat.format(time);
-            System.out.println(dateStr);
+            logger.info(dateStr);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -621,7 +621,7 @@ public class TimeExchange2 {
             ans = ans * 26 + num;
         }
 
-        System.out.println(ans);
+        logger.info(ans);
     }
 
 }

+ 2 - 2
wanzai/src/main/java/com/template/common/utils/WxUtil.java

@@ -118,9 +118,9 @@ public class WxUtil {
         sb.append("timestamp");
         sb.append(data.get("timestamp").trim());
         sb.append(apikey);
-		System.out.println(sb);
+		logger.info(sb);
 		if (signType.equals(WxConstants.SING_MD5)) {
-			System.out.println(MD5(sb.toString()).toUpperCase());
+			logger.info(MD5(sb.toString()).toUpperCase());
 			return MD5(sb.toString()).toLowerCase();
 		}
 		else if (signType.equals(WxConstants.SING_HMACSHA256)) {

+ 1 - 1
wanzai/src/main/java/com/template/common/utils/smsUtil.java

@@ -20,6 +20,6 @@ public class smsUtil {
 //        String[] params = {smmCode,Integer.toString(smsConfig.getSmsMin())};
 //        SmsSingleSender ssender = new SmsSingleSender(smsConfig.getSdkAppid(), smsConfig.getAppKey());
 //        SmsSingleSenderResult result = ssender.sendWithParam("86", phoneNumber, smsConfig.getTemplateId(), params, smsConfig.getSmsSign(), "", "");
-//        System.out.println(result);
+//        logger.info(result);
 //    };
 }

+ 2 - 2
wanzai/src/main/java/com/template/controller/ExcelController.java

@@ -41,7 +41,7 @@ public class ExcelController implements ExcelControllerAPI {
         //遍历工作簿中的所有数据
         for (int i = 0; i < sheetNum; i++) {
             //读取第i个工作表
-            System.out.println("读取第"+(i+1)+"个sheet");
+            logger.info("读取第"+(i+1)+"个sheet");
             XSSFSheet sheet = xssfWorkbook.getSheetAt(i);
             //获取最后一行的num,即总行数。此处从0开始
             int maxRow = sheet.getLastRowNum();
@@ -49,7 +49,7 @@ public class ExcelController implements ExcelControllerAPI {
             for (int row = 1; row <= maxRow; row++) {
                 //获取最后单元格num,即总单元格数 ***注意:此处从1开始计数***
                 int maxRol = sheet.getRow(row).getLastCellNum();
-                System.out.println("--------第" + row + "行的数据如下--------");
+                logger.info("--------第" + row + "行的数据如下--------");
 //                for (int rol = 0; rol < maxRol; rol++){
 //                    System.out.print(sheet.getRow(row).getCell(rol) + "  ");
 //                }

+ 3 - 3
wanzai/src/main/java/com/template/controller/HikvisionController.java

@@ -60,7 +60,7 @@ public class HikvisionController implements HikvisionAPI {
                 responseStrBuilder.append(inputStr);
             }
             JSONObject jsonObject = JSONObject.parseObject(responseStrBuilder.toString());
-//            System.out.println("jsonObject = " + jsonObject);
+//            logger.info("jsonObject = " + jsonObject);
             JSONObject params = jsonObject.getJSONObject("params");
 
             JSONArray events = params.getJSONArray("events");
@@ -187,7 +187,7 @@ public class HikvisionController implements HikvisionAPI {
             }
             JSONObject jsonObject = JSONObject.parseObject(responseStrBuilder.toString());
 
-//            System.out.println("jsonObject = " + jsonObject);
+//            logger.info("jsonObject = " + jsonObject);
 
             JSONObject params = jsonObject.getJSONObject("params");
 
@@ -268,7 +268,7 @@ public class HikvisionController implements HikvisionAPI {
             }
             JSONObject jsonObject = JSONObject.parseObject(responseStrBuilder.toString());
 
-//            System.out.println("jsonObject = " + jsonObject);
+//            logger.info("jsonObject = " + jsonObject);
 
             JSONObject params = jsonObject.getJSONObject("params");
 

+ 1 - 1
wanzai/src/main/java/com/template/controller/RepairAdminController.java

@@ -109,7 +109,7 @@ public class RepairAdminController implements RepairAdminControllerAPI {
         ra.setId(frar.getId());
         ra.setStatu(frar.getStatu());
         int result = repairAdminService.updateRepairAdmin(ra);
-        System.out.println(result);
+        logger.info(result);
         return result > 0 ? CommonResult.ok(success) : CommonResult.fail(fail);
     }
 

+ 4 - 4
wanzai/src/main/java/com/template/controller/ScheduleController.java

@@ -115,10 +115,10 @@ public class ScheduleController {
                 // 该接口需要数据权限,请将授权资源id替换至下方,请妥善保管好授权资源id,避免泄露
                 // permissionId位置: 控制台 -> 应用详情 -> 我申请的 -> 已通过的接口 -> 调用范围 -> 审批信息 中查看授权资源的「学校id」或「区域id」
                 request.setPermissionId("");
-                System.out.println("入参:" +request);
+                logger.info("入参:" +request);
                 //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
                 AttendanceRuleListEventByClazzResult result = seewoClient.invoke(request);
-                System.out.println("出参:" +result);
+                logger.info("出参:" +result);
                 //endregion
 
                 //考勤事件ID
@@ -158,12 +158,12 @@ public class ScheduleController {
                     kRequestBody.setQuery(kQuery);
                     kParam.setRequestBody(kRequestBody);
                     AttendanceServiceListAttendClassRecordsRequest kRequest = new AttendanceServiceListAttendClassRecordsRequest(kParam);
-                    System.out.println("入参:" + request);
+                    logger.info("入参:" + request);
                     //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
                     //request.setServerUrl("https://openapi.test.seewo.com")
                     //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
                     AttendanceServiceListAttendClassRecordsResult kResult = seewoClient.invoke(kRequest);
-                    System.out.println("出参:" + result);
+                    logger.info("出参:" + result);
 
                     if (result != null && result.getResponseBody().getCode().equals("000000")) {
                         String userUid = "";

+ 2 - 2
wanzai/src/main/java/com/template/controller/SmartAttendanceController.java

@@ -290,12 +290,12 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
         requestBody.setQuery(query);
         param.setRequestBody(requestBody);
         PersonalLeaveListSchoolPeriodRecordsRequest request = new PersonalLeaveListSchoolPeriodRecordsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         PersonalLeaveListSchoolPeriodRecordsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
 
         return result;

+ 1 - 1
wanzai/src/main/java/com/template/controller/SmartAuthorGroupController.java

@@ -226,7 +226,7 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
                     if (smartAuthorityC.size() > 0) {
                         SmartAuthority smartAuthority = smartAuthorityC.get(0);
                         smartAuthority.setDeleted(1);
-                        System.out.println(")))" + smartAuthority.getId());
+                        logger.info(")))" + smartAuthority.getId());
                         smartAuthorityService.updateSmartAuthority(smartAuthority);
                     }
                 }

+ 7 - 7
wanzai/src/main/java/com/template/controller/SmartClassController.java

@@ -348,12 +348,12 @@ public class SmartClassController implements SmartClassControllerAPI {
         kQuery.setClassList(java.util.Collections.singletonList(kClassList));
         kParam.setRequestBody(kRequestBody);
         OrganizationNodeServiceInitSchoolClassesRequest kRequest = new OrganizationNodeServiceInitSchoolClassesRequest(kParam);
-        System.out.println("入参:" + kRequest);
+        logger.info("入参:" + kRequest);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         OrganizationNodeServiceInitSchoolClassesResult kResult = seewoClient.invoke(kRequest);
-        System.out.println("出参:" + kResult);
+        logger.info("出参:" + kResult);
     }
 
     //新增班级和年级
@@ -384,13 +384,13 @@ public class SmartClassController implements SmartClassControllerAPI {
         query.setClassList(java.util.Collections.singletonList(classList));
         param.setRequestBody(requestBody);
         ClassServiceBatchSaveClassRequest request = new ClassServiceBatchSaveClassRequest(param);
-        System.out.println("入参:" + request);
-        System.out.println("入参body:" + JSON.toJSON(requestBody));
+        logger.info("入参:" + request);
+        logger.info("入参body:" + JSON.toJSON(requestBody));
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         // request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ClassServiceBatchSaveClassResult xwResult = seewoClient.invoke(request);
-        System.out.println("出参:" + xwResult);
+        logger.info("出参:" + xwResult);
 
         if (xwResult == null) {
             return CommonResult.fail("希沃班级数据新增失败!");
@@ -434,12 +434,12 @@ public class SmartClassController implements SmartClassControllerAPI {
         query.setClassList(java.util.Collections.singletonList(classList));
         param.setRequestBody(requestBody);
         OrganizationNodeServiceInitSchoolClassesRequest request = new OrganizationNodeServiceInitSchoolClassesRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         OrganizationNodeServiceInitSchoolClassesResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         return null;
     }

+ 1 - 1
wanzai/src/main/java/com/template/controller/SmartEvaluateStudentController.java

@@ -47,7 +47,7 @@ public class SmartEvaluateStudentController implements SmartEvaluateStudentContr
             return CommonResult.errorMsg("参数格式错误");
         }
         List<SmartSubjectManage> allList = subjectManageList.getSubjectList();
-        System.out.println("===" + allList);
+        logger.info("===" + allList);
         List<String> subjectLists = allList.stream().filter(e -> e.getDeleted() == 0).map(m -> m.getTerm() + m.getName()).collect(Collectors.toList());
         Set<String> mainScoreSet = new HashSet<>(subjectLists);
         if (subjectLists.size() != mainScoreSet.size()) {

+ 1 - 1
wanzai/src/main/java/com/template/controller/SmartFaceDiscernController.java

@@ -133,7 +133,7 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
         for (int i = 1; i <= 30; i++) {
             LocalDateTime endTime = now.minusDays(i);
             String dateTime = endTime.format(dateTimeFormatter);
-            System.out.println("dateTime = " + dateTime);
+            logger.info("dateTime = " + dateTime);
 
         }
     }

+ 39 - 39
wanzai/src/main/java/com/template/controller/SmartUserController.java

@@ -540,12 +540,12 @@ public class SmartUserController implements SmartUserControllerAPI {
                     param.setRequestBody(requestBody);
                     ParentServiceBatchSaveOrUpdateParentsRequest request = new ParentServiceBatchSaveOrUpdateParentsRequest(param);
                     String jsonString = JSON.toJSONString(request);
-                    System.out.println("入参:" + request);
+                    logger.info("入参:" + request);
                     //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
                     //request.setServerUrl("https://openapi.test.seewo.com")
                     //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
                     ParentServiceBatchSaveOrUpdateParentsResult parentResult = seewoClient.invoke(request);
-                    System.out.println("出参:" + parentResult);
+                    logger.info("出参:" + parentResult);
 
 
                     if (parentResult == null) {
@@ -2600,11 +2600,11 @@ public class SmartUserController implements SmartUserControllerAPI {
         // 该接口需要数据权限,请将授权资源id替换至下方,请妥善保管好授权资源id,避免泄露
         // permissionId位置: 控制台 -> 应用详情 -> 我申请的 -> 已通过的接口 -> 调用范围 -> 审批信息 中查看授权资源的「学校id」或「区域id」
         //request.setPermissionId(seewoConfig.getSchoolId());
-        System.out.println("入参:" + request);
-        System.out.println("入参:" + JSON.toJSON(request));
+        logger.info("入参:" + request);
+        logger.info("入参:" + JSON.toJSON(request));
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         PhotoServiceSavePhotosResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         ObjectMapper objectMapper = new ObjectMapper();
         XwBodyVo xwResult = objectMapper.readValue(result.getBody(), XwBodyVo.class);
@@ -2641,12 +2641,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setInPlaceOld(false);// 是否删除旧学生再保存
         param.setRequestBody(requestBody);
         StudentServiceBatchSaveClassStudentsRequest request = new StudentServiceBatchSaveClassStudentsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         StudentServiceBatchSaveClassStudentsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生数据新增失败!");
@@ -2689,12 +2689,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setInPlaceOld(false);// 是否删除旧学生再保存
         param.setRequestBody(requestBody);
         StudentServiceBatchSaveClassStudentsRequest request = new StudentServiceBatchSaveClassStudentsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         StudentServiceBatchSaveClassStudentsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生数据新增失败!");
@@ -2730,12 +2730,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         requestBody.setQuery(query);
         param.setRequestBody(requestBody);
         StudentServiceUpdateStudentInfoRequest request = new StudentServiceUpdateStudentInfoRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         StudentServiceUpdateStudentInfoResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生数据更新失败!");
@@ -2769,12 +2769,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         deleteRequestBody.setQuery(deleteQuery);
         deleteParam.setRequestBody(deleteRequestBody);
         StudentServiceRemoveClassStudentsRequest deleteRequest = new StudentServiceRemoveClassStudentsRequest(deleteParam);
-        System.out.println("入参:" + deleteRequest);
+        logger.info("入参:" + deleteRequest);
         //如果想要调用沙箱环境,请通过设置 deleteRequest 对象的 serverUrl 属性,如:
         //deleteRequest.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         StudentServiceRemoveClassStudentsResult deleteResult = seewoClient.invoke(deleteRequest);
-        System.out.println("出参:" + deleteResult);
+        logger.info("出参:" + deleteResult);
 
         if (deleteResult == null) {
             return CommonResult.fail("希沃删除学生数据失败!");
@@ -2818,12 +2818,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setTeachers(java.util.Collections.singletonList(teachers));
         param.setRequestBody(requestBody);
         TeacherServiceBatchSaveOrUpdateTeacherRequest request = new TeacherServiceBatchSaveOrUpdateTeacherRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchSaveOrUpdateTeacherResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃教师数据新增失败!");
@@ -2871,12 +2871,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setTeachers(java.util.Collections.singletonList(teachers));
         param.setRequestBody(requestBody);
         TeacherServiceBatchSaveOrUpdateTeacherRequest request = new TeacherServiceBatchSaveOrUpdateTeacherRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchSaveOrUpdateTeacherResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃教师数据更新失败!");
@@ -2916,12 +2916,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         requestBody.setQuery(query);
         param.setRequestBody(requestBody);
         TeacherServiceBatchRemoveTeachersRequest request = new TeacherServiceBatchRemoveTeachersRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchRemoveTeachersResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃教师数据删除失败!");
@@ -2956,12 +2956,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         mastersRequestBody.setQuery(mastersQuery);
         mastersParam.setRequestBody(mastersRequestBody);
         TeacherServiceBatchRemoveClassMastersRequest mastersRequest = new TeacherServiceBatchRemoveClassMastersRequest(mastersParam);
-        System.out.println("入参:" + mastersRequest);
+        logger.info("入参:" + mastersRequest);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchRemoveClassMastersResult masterResult = seewoClient.invoke(mastersRequest);
-        System.out.println("出参:" + masterResult);
+        logger.info("出参:" + masterResult);
 
         if (masterResult == null) {
             return CommonResult.fail("希沃教师数据删除失败!");
@@ -2998,12 +2998,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         teacherClassRequestBody.setQuery(teacherClassQuery);
         teacherClassParam.setRequestBody(teacherClassRequestBody);
         TeacherServiceBatchSetClassMastersRequest teacherClassRequest = new TeacherServiceBatchSetClassMastersRequest(teacherClassParam);
-        System.out.println("入参:" + teacherClassRequest);
+        logger.info("入参:" + teacherClassRequest);
         //如果想要调用沙箱环境,请通过设置 teacherClassRequest 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         TeacherServiceBatchSetClassMastersResult teacherClassResult = seewoClient.invoke(teacherClassRequest);
-        System.out.println("出参:" + teacherClassResult);
+        logger.info("出参:" + teacherClassResult);
 
         if (teacherClassResult == null) {
             return CommonResult.fail("希沃教师数据新增失败!");
@@ -3124,12 +3124,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         query.setStudentParents(studentParents);
         param.setRequestBody(requestBody);
         ParentServiceBatchSaveOrUpdateParentsRequest request = new ParentServiceBatchSaveOrUpdateParentsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ParentServiceBatchSaveOrUpdateParentsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生家长数据更新失败!");
@@ -3165,12 +3165,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         deleteOldFamilyRequestBody.setQuery(deleteOldFamilyquery);
         deleteOldFamilyParam.setRequestBody(deleteOldFamilyRequestBody);
         ParentServiceRemoveStudentParentConditionRequest deleteOldFamilyRequest = new ParentServiceRemoveStudentParentConditionRequest(deleteOldFamilyParam);
-        System.out.println("入参:" + deleteOldFamilyRequest);
+        logger.info("入参:" + deleteOldFamilyRequest);
         //如果想要调用沙箱环境,请通过设置 deleteOldFamilyRequest 对象的 serverUrl 属性,如:
         //deleteOldFamilyRequest.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ParentServiceRemoveStudentParentConditionResult deleteOldFamilyResult = seewoClient.invoke(deleteOldFamilyRequest);
-        System.out.println("出参:" + deleteOldFamilyResult);
+        logger.info("出参:" + deleteOldFamilyResult);
 
         if (deleteOldFamilyResult == null) {
             return CommonResult.fail("希沃家长数据删除失败!");
@@ -3214,13 +3214,13 @@ public class SmartUserController implements SmartUserControllerAPI {
         deleteOldFamilyRequestBody.setQuery(deleteOldFamilyquery);
         deleteOldFamilyParam.setRequestBody(deleteOldFamilyRequestBody);
         ParentServiceRemoveStudentParentConditionRequest deleteOldFamilyRequest = new ParentServiceRemoveStudentParentConditionRequest(deleteOldFamilyParam);
-        System.out.println("入参:" + deleteOldFamilyRequest);
-        System.out.println("入参:" + JSON.toJSON(deleteOldFamilyRequest));
+        logger.info("入参:" + deleteOldFamilyRequest);
+        logger.info("入参:" + JSON.toJSON(deleteOldFamilyRequest));
         //如果想要调用沙箱环境,请通过设置 deleteOldFamilyRequest 对象的 serverUrl 属性,如:
         //deleteOldFamilyRequest.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ParentServiceRemoveStudentParentConditionResult deleteOldFamilyResult = seewoClient.invoke(deleteOldFamilyRequest);
-        System.out.println("出参:" + deleteOldFamilyResult);
+        logger.info("出参:" + deleteOldFamilyResult);
 
         if (deleteOldFamilyResult == null) {
             return CommonResult.fail("希沃家长数据删除失败!");
@@ -4354,12 +4354,12 @@ public class SmartUserController implements SmartUserControllerAPI {
         studentParents.setParents(java.util.Collections.singletonList(parents));
         param.setRequestBody(requestBody);
         ParentServiceBatchSaveOrUpdateParentsRequest request = new ParentServiceBatchSaveOrUpdateParentsRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         ParentServiceBatchSaveOrUpdateParentsResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
 
         if (result == null) {
             return CommonResult.fail("希沃学生家长数据添加失败!");
@@ -4471,23 +4471,23 @@ public class SmartUserController implements SmartUserControllerAPI {
             return CommonResult.fail(st);
         }
 
-        System.out.println("批量设置时间组1"+TimeExchange.getDateMillS());
+        logger.info("批量设置时间组1"+TimeExchange.getDateMillS());
 
         SmartTimeGroup timeGroup = smartTimeGroupService.queryTimeGroupById(isur.getTimeGroupId());
         if (timeGroup == null) {
             return CommonResult.fail("时间组数据无效,批量同步时间组失败!");
         }
 
-        System.out.println("批量设置时间组2"+TimeExchange.getDateMillS());
+        logger.info("批量设置时间组2"+TimeExchange.getDateMillS());
         //region 批量更新百胜学生的时间组
         List<SmartUser> users = smartUserService.getSmartUserByIds(isur.getIds());
         if (users == null) {
             return CommonResult.fail("用户数据无效,批量同步时间组失败!");
         }
-        System.out.println("批量设置时间组3"+TimeExchange.getDateMillS());
+        logger.info("批量设置时间组3"+TimeExchange.getDateMillS());
         List<SmartGrade> grades = smartGradeService.list(null);
         List<SmartClass> classes = smartClassService.list(null);
-        System.out.println("批量设置时间组4"+TimeExchange.getDateMillS());
+        logger.info("批量设置时间组4"+TimeExchange.getDateMillS());
 
         for (SmartUser user : users) {
             user.setTimeGroupId(isur.getTimeGroupId());
@@ -4505,7 +4505,7 @@ public class SmartUserController implements SmartUserControllerAPI {
             long stime = System.currentTimeMillis();
 
 
-            System.out.println("开始循环调用百胜一次:"+TimeExchange.getDateMillS());
+            logger.info("开始循环调用百胜一次:"+TimeExchange.getDateMillS());
             /**
              * 学生数据的有效期是到毕业年份的8月31日
              */
@@ -4522,11 +4522,11 @@ public class SmartUserController implements SmartUserControllerAPI {
             //endregion
         }
 
-        System.out.println("循环结束:"+TimeExchange.getDateMillS());
+        logger.info("循环结束:"+TimeExchange.getDateMillS());
         //region 批量更新学生数据
         boolean updateBatch = smartUserService.updateUserBatchById(users);
 
-        System.out.println("存储结束:"+TimeExchange.getDateMillS());
+        logger.info("存储结束:"+TimeExchange.getDateMillS());
 
         return updateBatch ? CommonResult.ok("批量同步成功") : CommonResult.fail("批量同步失败");
     }

+ 29 - 29
wanzai/src/main/java/com/template/controller/SmartVisitorController.java

@@ -343,7 +343,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                         //返回的结果中 code为1表示成功
                         String result = RequestUtils.httpPost(url, jsonobject.toJSONString());
 
-                        System.out.println(result);
+                        logger.info(result);
 
                         if (!result.contains("预约成功")) {
                             throw new Exception("审核失败");
@@ -522,12 +522,12 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
         requestBody.setQuery(query);
         param.setRequestBody(requestBody);
         HomeSchoolServiceSendNoteToKidRequest request = new HomeSchoolServiceSendNoteToKidRequest(param);
-        System.out.println("入参:" + request);
+        logger.info("入参:" + request);
         //如果想要调用沙箱环境,请通过设置 request 对象的 serverUrl 属性,如:
         //request.setServerUrl("https://openapi.test.seewo.com")
         //执行请求,如果想获取到com.seewo.open.sdk.HttpResponse对象,请调用 seewoClient.execute 方法
         HomeSchoolServiceSendNoteToKidResult result = seewoClient.invoke(request);
-        System.out.println("出参:" + result);
+        logger.info("出参:" + result);
         if (!result.getMessage().equals("success")) {
             CommonResult.fail();
         }
@@ -611,10 +611,10 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
      */
     @Override
     public TurnOnDeviceVo turnOnTheDevice(turnOnTheDeviceRequest data) throws JsonProcessingException {
-        System.out.println("进入扫码解析,参数:" + JSON.toJSON(data));
+        logger.info("进入扫码解析,参数:" + JSON.toJSON(data));
 
         TurnOnDeviceVo result = new TurnOnDeviceVo();
-        System.out.println("进入扫码解析1");
+        logger.info("进入扫码解析1");
         //region 参数判断
         if (data == null) {
             result.setResultcode(2);
@@ -622,28 +622,28 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析2");
+        logger.info("进入扫码解析2");
         if (data.getActionName() == null) {
             result.setResultcode(2);
             result.setMessage("指令不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析3");
+        logger.info("进入扫码解析3");
         if (!data.getActionName().equals("qrCodePush")) {
             result.setResultcode(2);
             result.setMessage("指令错误");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析4");
+        logger.info("进入扫码解析4");
         if (data.getData() == null) {
             result.setResultcode(2);
             result.setMessage("二维码内容不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析5");
+        logger.info("进入扫码解析5");
         ObjectMapper objectMapper = new ObjectMapper();
         qrCodeVo codeVo = objectMapper.readValue(data.getData(), qrCodeVo.class);
         if (codeVo == null) {
@@ -652,21 +652,21 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析6");
+        logger.info("进入扫码解析6");
         if (codeVo.getQrCode() == null) {
             result.setResultcode(2);
             result.setMessage("二维码内容不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析7");
+        logger.info("进入扫码解析7");
         if (data.getDeviceno() == null) {
             result.setResultcode(2);
             result.setMessage("设备编号不能为空");
             result.setActionName("qrCodePush");
             return result;
         }
-        System.out.println("进入扫码解析8");
+        logger.info("进入扫码解析8");
         if (data.getVersion() == null) {
             result.setResultcode(2);
             result.setMessage("版本不能为空");
@@ -674,14 +674,14 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             return result;
         }
         //endregion
-        System.out.println("进入扫码解析9");
+        logger.info("进入扫码解析9");
         //解码逻辑
         QrcodeImageVo qiv = objectMapper.readValue(codeVo.getQrCode(), QrcodeImageVo.class);
-        System.out.println("进入扫码解析10");
+        logger.info("进入扫码解析10");
 
         SmartDevice deviceData = smartDeviceService.queryDeviceByNum(data.getDeviceno());
         if (deviceData == null) {
-            System.out.println("进入扫码解析11");
+            logger.info("进入扫码解析11");
             result.setResultcode(2);
             result.setMessage("设备不存在");
             result.setActionName("qrCodePush");
@@ -690,21 +690,21 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
 
         if (qiv.getType().intValue() == eQrcodeType.Identity.getValue()) {//身份码
             //身份码中的ID是身份码ID
-            System.out.println("进入身份码扫码解析1");
+            logger.info("进入身份码扫码解析1");
             //目前二维码一分钟内有效
             //过期:(时间戳 + 有效期分钟数)<= 当前时间
             //时间戳转时间
             Date dateNow = TimeExchange.StringToDate(TimeExchange.TimeRangeMinute(qiv.getTimestamp(), 1), "yyyy-MM-dd HH:mm:ss");
-            System.out.println("dateNow参数:" + TimeExchange.DateToString(dateNow));
-            System.out.println("当前时间参数:" + TimeExchange.DateToString(new Date()));
+            logger.info("dateNow参数:" + TimeExchange.DateToString(dateNow));
+            logger.info("当前时间参数:" + TimeExchange.DateToString(new Date()));
             if (new Date().after(dateNow)) {
-                System.out.println("身份码过期");
+                logger.info("身份码过期");
                 result.setResultcode(2);
                 result.setMessage("身份码已过期");
                 result.setActionName("qrCodePush");
                 return result;
             }
-            System.out.println("进入身份码扫码解析2");
+            logger.info("进入身份码扫码解析2");
 
             SmartUser user = smartUserService.getSmartById(qiv.getId());
             if (user == null) {
@@ -727,7 +727,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                     //查找是否存在访客记录
                     SmartVisitor visitor = smartVisitorService.queryParentVisitor(user.getId());
                     if(visitor == null){
-                        System.out.println("无访客数据,家长无法通行");
+                        logger.info("无访客数据,家长无法通行");
                         result.setResultcode(2);
                         result.setMessage("无访客数据,家长无法通行");
                         result.setActionName("qrCodePush");
@@ -742,7 +742,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                     sq.setAccessState(deviceData.getEntrance());
                     break;
                 case 2://学生
-                    System.out.println("学生无法使用身份码通行");
+                    logger.info("学生无法使用身份码通行");
                     result.setResultcode(2);
                     result.setMessage("学生无法使用身份码通行");
                     result.setActionName("qrCodePush");
@@ -759,7 +759,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                     break;
             }
 
-            System.out.println("进入身份码扫码解析3");
+            logger.info("进入身份码扫码解析3");
             int insertResult = smartQrcodeService.insertSmartQrcode(sq);
             if (insertResult <= 0) {
                 result.setResultcode(2);
@@ -767,18 +767,18 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                 result.setActionName("qrCodePush");
                 return result;
             }
-            System.out.println("进入身份码扫码解析4");
+            logger.info("进入身份码扫码解析4");
             result.setResultcode(1);
             result.setMessage("成功");
             result.setActionName("qrCodePush");
 
-            System.out.println("进入身份码扫码解析,结果:" + JSON.toJSON(result));
+            logger.info("进入身份码扫码解析,结果:" + JSON.toJSON(result));
         } else if (qiv.getType().intValue() == eQrcodeType.Visitor.getValue()) {//访客码
             //访客码中的ID是访客数据的ID
             //查找是否存在访客记录
             SmartVisitor visitor = smartVisitorService.getSmartById(qiv.getId());
             if(visitor == null){
-                System.out.println("无访客数据,访客无法通行");
+                logger.info("无访客数据,访客无法通行");
                 result.setResultcode(2);
                 result.setMessage("无访客数据,访客无法通行");
                 result.setActionName("qrCodePush");
@@ -793,7 +793,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
             sq.setIsSuccess(1);
             sq.setAccessState(deviceData.getEntrance());
 
-            System.out.println("进入访客码扫码解析3");
+            logger.info("进入访客码扫码解析3");
             int insertResult = smartQrcodeService.insertSmartQrcode(sq);
             if (insertResult <= 0) {
                 result.setResultcode(2);
@@ -801,12 +801,12 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
                 result.setActionName("qrCodePush");
                 return result;
             }
-            System.out.println("进入访客码扫码解析4");
+            logger.info("进入访客码扫码解析4");
             result.setResultcode(1);
             result.setMessage("成功");
             result.setActionName("qrCodePush");
 
-            System.out.println("进入访客码扫码解析,结果:" + JSON.toJSON(result));
+            logger.info("进入访客码扫码解析,结果:" + JSON.toJSON(result));
         }
 
         return result;

+ 2 - 2
wanzai/src/main/java/com/template/controller/Task.java

@@ -698,13 +698,13 @@ public class Task extends QuartzJobBean {
             // 保存错误信息到数据库
             int i = smartDataTaskMapper.insertErrorMsg(smartDataTaskDebug);
             if (i == 0) {
-                System.out.println(datetime + ":保存错误信息失败!");
+                logger.info(datetime + ":保存错误信息失败!");
             }
         } else {
             smartDataTaskDebug.setEId(returnSmartDataTaskErr.getEId());
             int i = smartDataTaskMapper.updateErrorMsg(smartDataTaskDebug);
             if (i == 0) {
-                System.out.println(datetime + ":更新错误信息失败!");
+                logger.info(datetime + ":更新错误信息失败!");
             }
         }
     }

+ 9 - 9
wanzai/src/main/java/com/template/controller/WechatScanLoginController.java

@@ -95,7 +95,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
     public String login(Model model) throws UnsupportedEncodingException {
         Map<String, String> wechatLoginUrl = wechatScanLoginService.wechatLoginUrl();
         String url = wechatLoginUrl.get("url");
-        System.out.println(url);
+        logger.info(url);
         return "redirect:" + url;
     }
 
@@ -110,7 +110,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
     @Override
     @PassToken
     public String callback(String code, String state) throws UnsupportedEncodingException {
-        System.out.println(code + "=====" + state);
+        logger.info(code + "=====" + state);
         if (code != null && state != null) {
             // 验证state为了用于防止跨站请求伪造攻击
             String decrypt = AesUtil.decrypt(AesUtil.parseHexStr2Byte(state), AesUtil.PASSWORD_SECRET_KEY, 16);
@@ -118,10 +118,10 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                 return "redirect:" + HttpParame.FRONT_URI + "/#/login?message=" + URLEncoder.encode("请勿非法进入", "UTF-8");
             }
             AccessToken access = wechatScanLoginService.getAccessToken(code);
-            System.out.println("access:" + access);
+            logger.info("access:" + access);
             if (access != null) {
                 String openid = access.getOpenid();
-                System.out.println("openid: " + openid);
+                logger.info("openid: " + openid);
                 SmartUser user = wechatScanLoginService.selectByOpenid(openid);
                 if (user == null) {        /*不存在*/
                     return "redirect:" + HttpParame.FRONT_URI + "/#/login?message=" + URLEncoder.encode("请绑定信息", "UTF-8");
@@ -157,14 +157,14 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
         }
         Map<String, String> wechatLoginUrl = wechatScanLoginService.wechatBindUrl(phone, messageCode);
         String url = wechatLoginUrl.get("url");
-        System.out.println(url);
+        logger.info(url);
         return "redirect:" + url;
     }
 
     @Override
     @PassToken
     public String bindcallback(String code, String state, String phone, String messageCode) throws UnsupportedEncodingException {
-        System.out.println(code + "===" + state + "==" + messageCode);
+        logger.info(code + "===" + state + "==" + messageCode);
         if (code != null && state != null) {
             // 验证state为了用于防止跨站请求伪造攻击
             String decrypt = AesUtil.decrypt(AesUtil.parseHexStr2Byte(state), AesUtil.PASSWORD_SECRET_KEY, 16);
@@ -244,7 +244,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                     smartMeterDetail.setMeterPowerRecord(Double.parseDouble(display)/Double.parseDouble("100"));
                     smartMeterDetail.setMeterPower(Double.parseDouble(display)/Double.parseDouble("100")-lastRecord);
                     smartMeterDetail.setCreateTime(TimeExchange.StringToDate(elecData.getCommunication(), "yyyy-MM-dd HH:mm:ss"));
-                    System.out.println("====="+smartMeterDetail.getMeterPowerRecord());
+                    logger.info("====="+smartMeterDetail.getMeterPowerRecord());
                     smartMeterDetailService.insertSmartMeterDetail(smartMeterDetail);
                 }
             }
@@ -287,7 +287,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                     smartMeterDetail.setMeterPowerRecord(Double.parseDouble(display)/Double.parseDouble("100"));
                     smartMeterDetail.setMeterPower(Double.parseDouble(display)/Double.parseDouble("100")-lastRecord);
                     smartMeterDetail.setCreateTime(TimeExchange.StringToDate(watData.getLastUpdate(), "yyyy-MM-dd HH:mm:ss"));
-                    System.out.println("====="+smartMeterDetail.getMeterPowerRecord());
+                    logger.info("====="+smartMeterDetail.getMeterPowerRecord());
                     smartMeterDetailService.insertSmartMeterDetail(smartMeterDetail);
                 }
             }
@@ -604,7 +604,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
                 "&grant_type=authorization_code";
 
         String json = HttpClientUtils.getInstance().sendHttpGet(url);
-        System.out.println(json);
+        logger.info(json);
         Gson gson = new Gson();
         HashMap<String, String> userMap = gson.fromJson(json.toString(), new TypeToken<HashMap<String, String>>() {
         }.getType());

+ 2 - 2
wanzai/src/main/java/com/template/controller/WxGzhController.java

@@ -59,7 +59,7 @@ public class WxGzhController implements WxGzhControllerAPI {
     public CommonResult getWxGzhOpenid(String code) throws Exception {
 
         String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + appid + "&secret=" + secret + "&code=" + code + "&grant_type=authorization_code";
-        System.out.println("url = " + url);
+        logger.info("url = " + url);
 
         String s = HttpsClient.httpsRequestReturnString(url, "GET", "");
 
@@ -86,7 +86,7 @@ public class WxGzhController implements WxGzhControllerAPI {
 
         smartCodeOpenIdService.save(smartCodeOpenId);
 
-        System.out.println("openid = " + openid);
+        logger.info("openid = " + openid);
 
         jsonObject1.put("phone", "");
         return CommonResult.ok(jsonObject1);

+ 2 - 2
wanzai/src/main/java/com/template/services/impl/SmartFaceDiscernServiceImpl.java

@@ -121,7 +121,7 @@ public class SmartFaceDiscernServiceImpl extends ServiceImpl<SmartFaceDiscernMap
         String decodedUrl = URLDecoder.decode(data1, "UTF-8");
 
         String decrypt = decrypt(decodedUrl, appSecret);
-//        System.out.println("decrypt = " + decrypt);
+//        logger.info("decrypt = " + decrypt);
         if (ObjectUtils.isNotEmpty(decrypt)&& decrypt!="") {
             JSONObject jsonObject2 = JSONObject.parseObject(decrypt);
 
@@ -130,7 +130,7 @@ public class SmartFaceDiscernServiceImpl extends ServiceImpl<SmartFaceDiscernMap
 
 //            获取总数
                 Integer total = Integer.valueOf(jsonObject2.getString("total"));
- //               System.out.println("total = " + total);
+ //               logger.info("total = " + total);
 
                 if (total > pageindex * pagesize) {
                     page = pageindex + 1;

+ 1 - 1
wanzai/src/main/java/com/template/services/impl/SmartScoreManageServiceImpl.java

@@ -143,7 +143,7 @@ public class SmartScoreManageServiceImpl extends ServiceImpl<SmartScoreManageMap
             smartEvaluateTdetail.setScoreItem(mainScore.get(i).getScoreItem());
             smartEvaluateTdetail.setScoreNum(mainScore.get(i).getScoreNum());
             smartEvaluateTdetail.setOwnNum(mainScore.get(i).getOwnNum());
-            System.out.println("===="+mainScore.get(i).getOwnNum());
+            logger.info("===="+mainScore.get(i).getOwnNum());
             smartEvaluateTdetail.setDeleted(mainScore.get(i).getDeleted());
             QueryWrapper<SmartEvaluateTdetail> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("deleted", 0);

+ 13 - 13
wanzai/src/main/java/com/template/services/impl/SmartUploadServiceImpl.java

@@ -64,34 +64,34 @@ public class SmartUploadServiceImpl implements SmartUploadService {
         String res = "";
         try {
             for (MultipartFile file : files) {
-                System.out.println("运行时间1:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间1:"+ TimeExchange.DateToString(new Date()));
                 String originalFileName = file.getOriginalFilename();
-                System.out.println("运行时间2:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间2:"+ TimeExchange.DateToString(new Date()));
                 // 获得文件流
                 InputStream inputStream = null;
-                System.out.println("运行时间3:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间3:"+ TimeExchange.DateToString(new Date()));
                 inputStream = file.getInputStream();
-                System.out.println("运行时间4:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间4:"+ TimeExchange.DateToString(new Date()));
                 // 设置文件路径
                 String filePath = getFilePath(originalFileName, "excelModel");
-                System.out.println("运行时间5:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间5:"+ TimeExchange.DateToString(new Date()));
                 // 上传文件
                 String bucketName = cosConfig.getBucketName();
-                System.out.println("运行时间6:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间6:"+ TimeExchange.DateToString(new Date()));
                 ObjectMetadata objectMetadata = new ObjectMetadata();
-                System.out.println("运行时间7:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间7:"+ TimeExchange.DateToString(new Date()));
                 objectMetadata.setContentLength(file.getSize());
-                System.out.println("运行时间8:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间8:"+ TimeExchange.DateToString(new Date()));
                 objectMetadata.setContentType(file.getContentType());
-                System.out.println("运行时间9:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间9:"+ TimeExchange.DateToString(new Date()));
                 PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, filePath, inputStream, objectMetadata);
-                System.out.println("运行时间10:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间10:"+ TimeExchange.DateToString(new Date()));
                 cosClientU.putObject(putObjectRequest);
-                System.out.println("运行时间11:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间11:"+ TimeExchange.DateToString(new Date()));
                 cosClientU.setBucketAcl(bucketName, CannedAccessControlList.PublicRead);
-                System.out.println("运行时间12:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间12:"+ TimeExchange.DateToString(new Date()));
                 String url = cosConfig.getPath() + "/" + filePath;
-                System.out.println("运行时间11:"+ TimeExchange.DateToString(new Date()));
+                logger.info("运行时间11:"+ TimeExchange.DateToString(new Date()));
                 res += url + ",";
             }
             String paths = res.substring(0, res.length() - 1);

+ 8 - 8
wanzai/src/test/java/com/template/MybatisPlusApplicationTests.java

@@ -13,10 +13,10 @@ class MybatisPlusApplicationTests {
 
     @Test
     void contextLoads() {
-//        System.out.println(mySecurity.toString());
+//        logger.info(mySecurity.toString());
 
-        System.out.println("privateKey = " + privateKey);
-        System.out.println("publicKey = " + publicKey);
+        logger.info("privateKey = " + privateKey);
+        logger.info("publicKey = " + publicKey);
     }
 
 //    // 继承了BaseMapper,所有的方法都来自己父类
@@ -41,8 +41,8 @@ class MybatisPlusApplicationTests {
 //        playbackRecord.setShareeId("654321");
 //
 //        int result = playbackRecordMapper.insert(playbackRecord); // 帮我们自动生成id
-//        System.out.println(result); // 受影响的行数
-//        System.out.println(playbackRecord); // 发现,id会自动回填
+//        logger.info(result); // 受影响的行数
+//        logger.info(playbackRecord); // 发现,id会自动回填
 //    }
 //
 //    // 测试更新
@@ -53,7 +53,7 @@ class MybatisPlusApplicationTests {
 //        playbackRecord.setShareeId("123456");
 //        // 注意:updateById 但是参数是一个 对象!
 //        int i = playbackRecordMapper.updateById(playbackRecord);
-//        System.out.println(i);
+//        logger.info(i);
 //    }
 //
 //    // 测试乐观锁成功!
@@ -89,7 +89,7 @@ class MybatisPlusApplicationTests {
 //    @Test
 //    public void testSelectById(){
 //        PlaybackRecord playbackRecord = playbackRecordMapper.selectById(1L);
-//        System.out.println(playbackRecord);
+//        logger.info(playbackRecord);
 //    }
 //
 //    // 测试批量查询!
@@ -120,7 +120,7 @@ class MybatisPlusApplicationTests {
 //        playbackRecordMapper.selectPage(page,null);
 //
 //        page.getRecords().forEach(System.out::println);
-//        System.out.println(page.getTotal());
+//        logger.info(page.getTotal());
 //
 //    }
 //

+ 5 - 5
wanzai/src/test/java/com/template/WrapperTest.java

@@ -17,9 +17,9 @@ public class WrapperTest {
     MySecurity mySecurity;
     @Test
     void contextLoads() {
-        System.out.println(mySecurity.toString());
-        System.out.println("privateKey = " + privateKey);
-        System.out.println("publicKey = " + publicKey);
+        logger.info(mySecurity.toString());
+        logger.info("privateKey = " + privateKey);
+        logger.info("publicKey = " + publicKey);
     }
 
 
@@ -43,7 +43,7 @@ public class WrapperTest {
 //        QueryWrapper<PlaybackRecord> wrapper = new QueryWrapper<>();
 //        wrapper.eq("name","123456");
 //        PlaybackRecord playbackRecord = playbackRecordMapper.selectOne(wrapper); // 查询一个数据,出现多个结果使用List 或者 Map
-//        System.out.println(playbackRecord);
+//        logger.info(playbackRecord);
 //    }
 //
 //    @Test
@@ -52,7 +52,7 @@ public class WrapperTest {
 //        QueryWrapper<PlaybackRecord> wrapper = new QueryWrapper<>();
 //        wrapper.between("age",20,30); // 区间
 //        Integer count = playbackRecordMapper.selectCount(wrapper);// 查询结果数
-//        System.out.println(count);
+//        logger.info(count);
 //    }
 //
 //    // 模糊查询