Ver código fonte

华高初版对接数据库代码提交

“lqy 2 meses atrás
pai
commit
859e3d3b25

+ 9 - 2
mjava-huagao/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
-            <version>12.4.0.jre8</version>
+            <version>12.4.2.jre8</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.5.3.1</version>
+            <version>3.5.5</version>
         </dependency>
         <dependency> <!--自动生成的模板:模板有三种:Velocity(默认)、Freemarker、Beetl -->
             <groupId>org.apache.velocity</groupId>
@@ -52,9 +52,16 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.32</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

+ 2 - 1
mjava-huagao/src/main/java/com/malk/huagao/HuaGaoApplication.java

@@ -1,11 +1,12 @@
 package com.malk.huagao;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.security.Security;
-
+@MapperScan("com.malk.huagao.mapper")
 @SpringBootApplication(scanBasePackages = {"com.malk"})
 public class HuaGaoApplication {
     public static void main(String[] args) {

+ 59 - 54
mjava-huagao/src/main/java/com/malk/huagao/schedule/ScheduleTask.java

@@ -1,6 +1,5 @@
 package com.malk.huagao.schedule;
 
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.malk.huagao.service.HuaGaoService;
@@ -23,7 +22,9 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @EnableScheduling 开启定时任务 [配置参考McScheduleTask]
@@ -41,117 +42,121 @@ public class ScheduleTask {
     private HuaGaoService huaGaoService;
 
     /**
+     *
      */
-    @Scheduled(cron = "0 5 2 1 * ?")
+//    @Scheduled(cron = "0 5 2 1 * ?")
     public void syncMonths() {
         log.info("考勤同步-月度");
-        LocalDateTime startTime= LocalDate.now().minusMonths(1).atTime(LocalTime.MIN);
-        LocalDateTime endTime= LocalDate.now().atTime(LocalTime.MIN);
-        List<String> time= Arrays.asList(String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(startTime)),String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(endTime)));
+        LocalDateTime startTime = LocalDate.now().minusMonths(1).atTime(LocalTime.MIN);
+        LocalDateTime endTime = LocalDate.now().atTime(LocalTime.MIN);
+        List<String> time = Arrays.asList(String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(startTime)), String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(endTime)));
         try {
-            huaGaoService.syncKqData(startTime,endTime);
-            compSave(time,"同步成功","");
-        }catch (Exception e){
+            huaGaoService.syncKqData(startTime, endTime);
+            compSave(time, "同步成功", "");
+        } catch (Exception e) {
             e.printStackTrace();
-            compSave(time,"异常",e.getMessage());
+            compSave(time, "异常", e.getMessage());
         }
     }
 
     /**
+     *
      */
     @Scheduled(cron = "0 0 1 * * 1")
     public void syncWeek() {
         log.info("考勤同步-周度");
-        LocalDateTime startTime= LocalDate.now().minusWeeks(1).atTime(LocalTime.MIN);
-        LocalDateTime endTime= LocalDate.now().atTime(LocalTime.MIN);
-        List<String> time= Arrays.asList(String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(startTime)),String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(endTime)));
+        LocalDateTime startTime = LocalDate.now().minusWeeks(1).atTime(LocalTime.MIN);
+        LocalDateTime endTime = LocalDate.now().atTime(LocalTime.MIN);
+        List<String> time = Arrays.asList(String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(startTime)), String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(endTime)));
         try {
-            huaGaoService.syncKqData(startTime,endTime);
-            compSave(time,"同步成功","");
-        }catch (Exception e){
+            huaGaoService.syncKqData(startTime, endTime);
+            compSave(time, "同步成功", "");
+        } catch (Exception e) {
             e.printStackTrace();
-            compSave(time,"异常",e.getMessage());
+            compSave(time, "异常", e.getMessage());
         }
     }
 
     /**
+     *
      */
     @Scheduled(cron = "0 35 6 * * ?")
     public void syncDay() {
         log.info("考勤同步-昨天");
-        LocalDateTime startTime= LocalDate.now().minusDays(1).atTime(LocalTime.MIN);
-        LocalDateTime endTime= LocalDate.now().atTime(LocalTime.MIN);
-        List<String> time= Arrays.asList(String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(startTime)),String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(endTime)));
+        LocalDateTime startTime = LocalDate.now().minusDays(1).atTime(LocalTime.MIN);
+        LocalDateTime endTime = LocalDate.now().atTime(LocalTime.MIN);
+        List<String> time = Arrays.asList(String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(startTime)), String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(endTime)));
         try {
-            huaGaoService.syncKqData(startTime,endTime);
-            compSave(time,"同步成功","");
-        }catch (Exception e){
+            huaGaoService.syncKqData(startTime, endTime);
+            compSave(time, "同步成功", "");
+        } catch (Exception e) {
             e.printStackTrace();
-            compSave(time,"异常",e.getMessage());
+            compSave(time, "异常", e.getMessage());
         }
     }
 
     /**
+     *
      */
     @Scheduled(cron = "0 0/5 * * * ?")
     public void sync() {
-        MDC.put("MDC_KEY_PID","1001");
+        MDC.put("MDC_KEY_PID", "1001");
 
-        List<Map> list=(List<Map>) ydClient.queryData(YDParam.builder().formUuid("FORM-0D560B9D8B64464C8C885FE20B7C7C95T4IA").pageSize(1)
-                .searchFieldJson(JSONObject.toJSONString(UtilMap.map("selectField_m8nud6t3","待处理"))).build(), YDConf.FORM_QUERY.retrieve_list).getData();
-        log.info("手动同步查询-结果,{}",list.size());
-        if(list==null||list.size()<1){
+        List<Map> list = (List<Map>) ydClient.queryData(YDParam.builder().formUuid("FORM-0D560B9D8B64464C8C885FE20B7C7C95T4IA").pageSize(1)
+                .searchFieldJson(JSONObject.toJSONString(UtilMap.map("selectField_m8nud6t3", "待处理"))).build(), YDConf.FORM_QUERY.retrieve_list).getData();
+        log.info("手动同步查询-结果,{}", list.size());
+        if (list == null || list.size() < 1) {
             return;
         }
-        Map data=list.get(0);
-        log.info("{}",data);
-        String formInstanceId=String.valueOf(data.get("formInstanceId"));
+        Map data = list.get(0);
+        log.info("{}", data);
+        String formInstanceId = String.valueOf(data.get("formInstanceId"));
         processing(formInstanceId);
-        Map formData=UtilMap.getMap(data,"formData");
+        Map formData = UtilMap.getMap(data, "formData");
         try {
-            List<String> timeList=UtilMap.getList(formData,"cascadeDateField_m8nud6sy");
-            LocalDateTime startTime= UtilDateTime.getLocalDateTimeFromTimestamp(Long.parseLong(timeList.get(0)));
-            LocalDateTime endTime=UtilDateTime.getLocalDateTimeFromTimestamp(Long.parseLong(timeList.get(1)));
-            huaGaoService.syncKqData(startTime,endTime);
-            comp(formInstanceId,"同步成功!","");
-        }catch (Exception e){
+            List<String> timeList = UtilMap.getList(formData, "cascadeDateField_m8nud6sy");
+            LocalDateTime startTime = UtilDateTime.getLocalDateTimeFromTimestamp(Long.parseLong(timeList.get(0)));
+            LocalDateTime endTime = UtilDateTime.getLocalDateTimeFromTimestamp(Long.parseLong(timeList.get(1)));
+            huaGaoService.syncKqData(startTime, endTime);
+            comp(formInstanceId, "同步成功!", "");
+        } catch (Exception e) {
             e.printStackTrace();
-            comp(formInstanceId,"异常",e.getMessage());
+            comp(formInstanceId, "异常", e.getMessage());
         }
     }
 
-    private void processing(String id){
+    private void processing(String id) {
         ydClient.operateData(YDParam.builder().formInstanceId(id)
                 .updateFormDataJson(JSON.toJSONString(UtilMap.map("selectField_m8nud6t3", "处理中")))
                 .build(), YDConf.FORM_OPERATION.update);
     }
 
-    private void comp(String id,String result,String msg){
+    private void comp(String id, String result, String msg) {
         ydClient.operateData(YDParam.builder().formInstanceId(id)
-                .updateFormDataJson(JSON.toJSONString(UtilMap.map("selectField_m8nud6t3, textField_m8nud6t9, textareaField_m8nud6tb", "已完成",result,msg)))
+                .updateFormDataJson(JSON.toJSONString(UtilMap.map("selectField_m8nud6t3, textField_m8nud6t9, textareaField_m8nud6tb", "已完成", result, msg)))
                 .build(), YDConf.FORM_OPERATION.update);
     }
 
-    private void compSave(List<String> time,String result,String msg){
+    private void compSave(List<String> time, String result, String msg) {
         ydClient.operateData(YDParam.builder().formUuid("FORM-0D560B9D8B64464C8C885FE20B7C7C95T4IA")
-                .formDataJson(JSON.toJSONString(UtilMap.map("cascadeDateField_m8nud6sy, selectField_m8nud6t3, textField_m8nud6t9, textareaField_m8nud6tb", time,"已完成",result,msg)))
+                .formDataJson(JSON.toJSONString(UtilMap.map("cascadeDateField_m8nud6sy, selectField_m8nud6t3, textField_m8nud6t9, textareaField_m8nud6tb", time, "已完成", result, msg)))
                 .build(), YDConf.FORM_OPERATION.create);
     }
 
     public static void main(String[] args) {
-        LocalDateTime startTime1= LocalDate.now().minusDays(1).atTime(LocalTime.MIN);
-        LocalDateTime endTime= LocalDate.now().atTime(LocalTime.MIN);
+        LocalDateTime startTime1 = LocalDate.now().minusDays(1).atTime(LocalTime.MIN);
+        LocalDateTime endTime = LocalDate.now().atTime(LocalTime.MIN);
         long startTime = UtilDateTime.getLocalDateTimeTimeStamp(startTime1);
         //获取所属周(每周六-下周五)
-      DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate date = LocalDate.parse("2025-06-24", inputFormatter);
-         LocalDate startOfWeek;
-          // 获取该周的周六(开始日期)
-                               startOfWeek = date.with(TemporalAdjusters.previousOrSame(DayOfWeek.SATURDAY));
+        LocalDate startOfWeek;
+        // 获取该周的周六(开始日期)
+        startOfWeek = date.with(TemporalAdjusters.previousOrSame(DayOfWeek.SATURDAY));
 
-                    // 获取该周的周五(结束日期)
-                               LocalDate endOfWeek = startOfWeek.plusDays(6);
-                     DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("MM.dd");
+        // 获取该周的周五(结束日期)
+        LocalDate endOfWeek = startOfWeek.plusDays(6);
+        DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("MM.dd");
         String format = startOfWeek.format(outputFormatter);
 //        LocalDateTime startTime2= LocalDate.now().minusMonths(1).atTime(LocalTime.MIN);
 //        List<String> time= Arrays.asList(String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(startTime)),String.valueOf(UtilDateTime.getLocalDateTimeTimeStamp(endTime)));

+ 14 - 3
mjava-huagao/src/main/java/com/malk/huagao/utils/MPGenerator.java

@@ -4,16 +4,18 @@ import com.baomidou.mybatisplus.generator.FastAutoGenerator;
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
 import com.baomidou.mybatisplus.generator.engine.VelocityTemplateEngine;
 
+import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.Types;
 
 public class MPGenerator {
     public static void main(String[] args) {
         //可以直接去官方文档上查看
         FastAutoGenerator
-                .create("jdbc:sqlserver://113.45.187.194:1433;databaseName=dingding",
+                .create("jdbc:sqlserver://113.45.187.194:1433;databaseName=dingding;encrypt=true;trustServerCertificate=true;",
                         "hgdd", "hgdd@2025")
                 .globalConfig(builder -> {
-                    builder.author("WZY")
+                    builder.author("LQY")
                             .disableOpenDir()
                             .outputDir(System.getProperty("user.dir")+
                                     "/mjava-huagao/src/main/java");
@@ -35,10 +37,19 @@ public class MPGenerator {
                             .entity("entity");
                 })
                 .strategyConfig(builder -> {
-                    builder.addInclude("YD_PROD_WORK_HOURS_PRICE")
+                    builder.addInclude("")
                             .entityBuilder().enableLombok();
                 })
                 .templateEngine(new VelocityTemplateEngine())
                 .execute();
     }
+//    public static void main(String[] args) {
+//        String url = "jdbc:sqlserver://113.45.187.194:1433;"+"databaseName=dingding;"+"encrypt=false;"+"trustServerCertificate=true;";
+//
+//        try (Connection conn = DriverManager.getConnection(url, "hgdd", "hgdd@2025")) {
+//            System.out.println("✅ 连接 SQL Server 成功!");
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
 }

+ 10 - 10
mjava-jianhui/pom.xml

@@ -26,16 +26,16 @@
             <artifactId>base</artifactId>
             <version>1.1-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.example</groupId>
-            <artifactId>k3cloud</artifactId>
-            <version>8.0.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.example</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.example</groupId>-->
+<!--            <artifactId>k3cloud</artifactId>-->
+<!--            <version>8.0.6</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.example</groupId>-->
+<!--            <artifactId>gson</artifactId>-->
+<!--            <version>2.8.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>