锡鼎更新

mjava-rongzhi/src/main/java/com/malk/rongzhi/controller/RongZhiController.java

@@ -17,7 +17,7 @@ import java.util.Map;
  */
 @Slf4j
 @RestController
-@RequestMapping("/rongzhi")
+@RequestMapping("/shijianguan/rongzhi")
 public class RongZhiController {
 
     @Autowired

mjava-rongzhi/src/main/java/com/malk/rongzhi/controller/ShiJianGuanController.java

@@ -1,85 +1,85 @@
-//package com.malk.rongzhi.controller;
-//
-//import cn.hutool.core.util.ObjectUtil;
-//import com.alibaba.fastjson.JSON;
-//import com.malk.Util.UtilMap;
-//import com.malk.Util.UtilServlet;
-//import com.malk.server.aliwork.YDConf;
-//import com.malk.server.aliwork.YDParam;
-//import com.malk.server.common.McException;
-//import com.malk.server.common.McR;
-//import com.malk.service.aliwork.YDClient;
-//import com.malk.service.dingtalk.DDClient;
-//import com.malk.service.dingtalk.DDClient_Contacts;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * 错误抛出与拦截详见CatchException
-// */
-//@Slf4j
-//@RestController
-//@RequestMapping("/shijianguan")
-//public class ShiJianGuanController {
-//
-//    @Autowired
-//    private DDClient_Contacts ddClient_contacts;
-//
-//    @Autowired
-//    private DDClient ddClient;
-//
-//    @Autowired
-//    private YDClient ydClient;
-//
-//    /**
-//     * 创建人员
-//     */
-//    @PostMapping("user")
-//    McR createUser(HttpServletRequest request) {
-//        Map<String, Object> param = UtilServlet.getParamMap(request);
-//        log.info("创建用户, {}", param);
-//        McException.assertParamException_Null(param, "name", "mobile", "deptId");
-//        List<String> deptIds = new ArrayList<>();
-//        if (ObjectUtil.isNotNull(param.get("proDeptIds"))) {
-//            deptIds.addAll((List<String>) JSON.parse(String.valueOf(param.get("proDeptIds"))));
-//        }
-//        deptIds.add(String.valueOf(param.get("deptId")));
-//        ddClient_contacts.createUser(ddClient.getAccessToken(), String.valueOf(param.get("name")), String.valueOf(param.get("mobile")), deptIds, UtilMap.map("title", param.get("title")));
-//        return McR.success();
-//    }
-//
-//    /**
-//     * 创建部门
-//     */
-//    @PostMapping("department")
-//    McR createDepartment(HttpServletRequest request) {
-//        Map<String, Object> param = UtilServlet.getParamMap(request);
-//        log.info("创建部门, {}", param);
-//        McException.assertParamException_Null(param, "name", "parentId", "formInstId", "compId_dept");
-//        Map extInfo = UtilMap.map("hide_dept, create_dept_group, auto_approve_apply", true, true, true);
-//        Map rsp = ddClient_contacts.createDepartment(ddClient.getAccessToken(), String.valueOf(param.get("name")), Long.valueOf(String.valueOf(param.get("parentId"))), extInfo);
-//        ydClient.operateData(YDParam.builder()
-//                .formInstanceId(String.valueOf(param.get("formInstId")))
-//                .updateFormDataJson(JSON.toJSONString(UtilMap.map(String.valueOf(param.get("compId_dept")), rsp.get("dept_id"))))
-//                .build(), YDConf.FORM_OPERATION.update);
-//        return McR.success();
-//    }
-//
-//    @GetMapping("test")
-//    McR test() {
-//        ydClient.operateData(YDParam.builder()
-//                .formInstanceId("FINST-96766PB1LPS9DBVSBKN988PIAFGM3HJBBACGLJO8")
-//                .updateFormDataJson(JSON.toJSONString(UtilMap.map("title", "{\"en_US\":\"gao^sheng^hao（高圣昊）发起的UnNamed Process Form\",\"pureEn_US\":\"gao^sheng^hao（高圣昊）发起的UnNamed Process Form\",\"type\":\"i18n\",\"zh_CN\":\"高圣昊发起的付款申请单\"}")))
-//                .build(), YDConf.FORM_OPERATION.update);
-//        return McR.success();
-//    }
-//}
+package com.malk.rongzhi.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.malk.Util.UtilMap;
+import com.malk.Util.UtilServlet;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.common.McException;
+import com.malk.server.common.McR;
+import com.malk.service.aliwork.YDClient;
+import com.malk.service.dingtalk.DDClient;
+import com.malk.service.dingtalk.DDClient_Contacts;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 错误抛出与拦截详见CatchException
+ */
+@Slf4j
+@RestController
+@RequestMapping("/shijianguan")
+public class ShiJianGuanController {
+
+    @Autowired
+    private DDClient_Contacts ddClient_contacts;
+
+    @Autowired
+    private DDClient ddClient;
+
+    @Autowired
+    private YDClient ydClient;
+
+    /**
+     * 创建人员
+     */
+    @PostMapping("user")
+    McR createUser(HttpServletRequest request) {
+        Map<String, Object> param = UtilServlet.getParamMap(request);
+        log.info("创建用户, {}", param);
+        McException.assertParamException_Null(param, "name", "mobile", "deptId");
+        List<String> deptIds = new ArrayList<>();
+        if (ObjectUtil.isNotNull(param.get("proDeptIds"))) {
+            deptIds.addAll((List<String>) JSON.parse(String.valueOf(param.get("proDeptIds"))));
+        }
+        deptIds.add(String.valueOf(param.get("deptId")));
+        ddClient_contacts.createUser(ddClient.getAccessToken(), String.valueOf(param.get("name")), String.valueOf(param.get("mobile")), deptIds, UtilMap.map("title", param.get("title")));
+        return McR.success();
+    }
+
+    /**
+     * 创建部门
+     */
+    @PostMapping("department")
+    McR createDepartment(HttpServletRequest request) {
+        Map<String, Object> param = UtilServlet.getParamMap(request);
+        log.info("创建部门, {}", param);
+        McException.assertParamException_Null(param, "name", "parentId", "formInstId", "compId_dept");
+        Map extInfo = UtilMap.map("hide_dept, create_dept_group, auto_approve_apply", true, true, true);
+        Map rsp = ddClient_contacts.createDepartment(ddClient.getAccessToken(), String.valueOf(param.get("name")), Long.valueOf(String.valueOf(param.get("parentId"))), extInfo);
+        ydClient.operateData(YDParam.builder()
+                .formInstanceId(String.valueOf(param.get("formInstId")))
+                .updateFormDataJson(JSON.toJSONString(UtilMap.map(String.valueOf(param.get("compId_dept")), rsp.get("dept_id"))))
+                .build(), YDConf.FORM_OPERATION.update);
+        return McR.success();
+    }
+
+    @GetMapping("test")
+    McR test() {
+        ydClient.operateData(YDParam.builder()
+                .formInstanceId("FINST-96766PB1LPS9DBVSBKN988PIAFGM3HJBBACGLJO8")
+                .updateFormDataJson(JSON.toJSONString(UtilMap.map("title", "{\"en_US\":\"gao^sheng^hao（高圣昊）发起的UnNamed Process Form\",\"pureEn_US\":\"gao^sheng^hao（高圣昊）发起的UnNamed Process Form\",\"type\":\"i18n\",\"zh_CN\":\"高圣昊发起的付款申请单\"}")))
+                .build(), YDConf.FORM_OPERATION.update);
+        return McR.success();
+    }
+}

mjava-rongzhi/src/main/java/com/malk/rongzhi/service/impl/RZServiceImpl.java

@@ -74,8 +74,8 @@ public class RZServiceImpl implements RZService {
     @Override
     public void uploadTravelData() {
 
-        List<String> userIds = getUserIds(false);
-//        List<String> userIds = Arrays.asList("175666564733615796", "252036265721033696");
+//        List<String> userIds = getUserIds(false);
+        List<String> userIds = Arrays.asList("110649003994853965"); // coco严
 
         // 获取用户考勤
         for (int i = 0; i < userIds.size(); i += 50) {
@@ -92,8 +92,10 @@ public class RZServiceImpl implements RZService {
                 from = UtilDateTime.formatLocalDate(now.toLocalDate());
                 end = UtilDateTime.formatLocalDate(now.plusDays(1).toLocalDate());
             }
-            from = from + " 07:30:00";
-            end = end + " 07:29:59";
+//            from = from + " 07:30:00";
+//            end = end + " 07:29:59";
+            from = "2025-03-03" + " 07:30:00";
+            end = "2025-03-04" + " 07:29:59";
             // 匹配数据考勤
             List<String> users = userIds.subList(i, to);
             List<Map> list = ddClient_attendance.listAttendanceRecord(getAccessToken(RZConf.TYPE.dingtalk), users, from, end);

mjava-rongzhi/src/main/resources/application-prod.yml

@@ -23,7 +23,7 @@ ekuaibao:
   corpId: ID01jaBqslI9LV                  # 易快报的 corpId
   platformApi: https://dd2.ekuaibao.com   # 易快报不同平台获取前缀的方式不同
 
-# dingtalk - 市建管
+# dingtalk - 榕智
 dingtalk:
   agentId: 2561043249
   appKey: dingged8ayplgf8g9cjg

mjava-rongzhi/target/classes/application-prod.yml

@@ -23,7 +23,7 @@ ekuaibao:
   corpId: ID01jaBqslI9LV                  # 易快报的 corpId
   platformApi: https://dd2.ekuaibao.com   # 易快报不同平台获取前缀的方式不同
 
-# dingtalk - 市建管
+# dingtalk - 榕智
 dingtalk:
   agentId: 2561043249
   appKey: dingged8ayplgf8g9cjg

mjava-rongzhi/target/generated-sources/java/com/malk/rongzhi/repository/entity/QRzEkbRecordPo.java

@@ -0,0 +1,52 @@
+package com.malk.rongzhi.repository.entity;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QRzEkbRecordPo is a Querydsl query type for RzEkbRecordPo
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QRzEkbRecordPo extends EntityPathBase<RzEkbRecordPo> {
+
+    private static final long serialVersionUID = 14758822L;
+
+    public static final QRzEkbRecordPo rzEkbRecordPo = new QRzEkbRecordPo("rzEkbRecordPo");
+
+    public final com.malk.base.QBasePo _super = new com.malk.base.QBasePo(this);
+
+    public final StringPath checkDate = createString("checkDate");
+
+    //inherited
+    public final DateTimePath<java.util.Date> createTime = _super.createTime;
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    public final StringPath name = createString("name");
+
+    //inherited
+    public final DateTimePath<java.util.Date> updateTime = _super.updateTime;
+
+    public final StringPath userId = createString("userId");
+
+    public QRzEkbRecordPo(String variable) {
+        super(RzEkbRecordPo.class, forVariable(variable));
+    }
+
+    public QRzEkbRecordPo(Path<? extends RzEkbRecordPo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QRzEkbRecordPo(PathMetadata metadata) {
+        super(RzEkbRecordPo.class, metadata);
+    }
+
+}
+

mjava-rongzhi/target/maven-archiver/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Mon Sep 09 21:28:40 CST 2024
+version=1.0-SNAPSHOT
+groupId=com.malk
+artifactId=mjava-rongzhi

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

@@ -0,0 +1,13 @@
+com/malk/rongzhi/service/impl/RZServiceImpl.class
+com/malk/rongzhi/repository/entity/RzEkbRecordPo$RzEkbRecordPoBuilder.class
+com/malk/rongzhi/schedule/RZScheduleTask.class
+com/malk/rongzhi/service/RZService.class
+com/malk/rongzhi/repository/entity/RzEkbRecordPo.class
+com/malk/rongzhi/Boot.class
+com/malk/rongzhi/controller/ShiJianGuanController.class
+com/malk/rongzhi/repository/dao/RzEkbRecordDao.class
+com/malk/rongzhi/server/RZConf$TYPE.class
+com/malk/rongzhi/server/RZConf.class
+com/malk/rongzhi/controller/RongZhiController.class
+com/malk/rongzhi/server/RZR.class
+com/malk/rongzhi/repository/entity/QRzEkbRecordPo.class

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

@@ -0,0 +1,11 @@
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/Boot.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/controller/ShiJianGuanController.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/controller/RongZhiController.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/schedule/RZScheduleTask.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/repository/entity/RzEkbRecordPo.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/service/RZService.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/repository/dao/RzEkbRecordDao.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/service/impl/RZServiceImpl.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/server/RZR.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/src/main/java/com/malk/rongzhi/server/RZConf.java
+/Users/malk/server/java-mcli-2/mjava-rongzhi/target/generated-sources/java/com/malk/rongzhi/repository/entity/QRzEkbRecordPo.java

mjava-shanghaishiwei/src/main/java/com/malk/shanghaishiwei/controller/SHHWController.java

@@ -42,6 +42,7 @@ public class SHHWController {
         switch (code) {
             case "approve": {
                 String fileNames = htService.approveContract(data);
+                log.info("xxxx, {}", McR.success(UtilMap.map("fileNames", fileNames)));
                 return McR.success(UtilMap.map("fileNames", fileNames));
             }
             // 对象响应【氚云自定义字段，需要通过[]直接取值才有效，序列化后返回前端，仅会保留结构】

mjava-xiding/src/main/java/com/malk/xiding/controller/XDController.java

@@ -1,6 +1,7 @@
 package com.malk.xiding.controller;
 
 import com.malk.Util.UtilDateTime;
+import com.malk.server.common.McException;
 import com.malk.server.common.McR;
 import com.malk.server.fxiaoke.FXKConf;
 import com.malk.service.dingtalk.DDClient;
@@ -14,10 +15,7 @@ import com.malk.xiding.server.XDConf;
 import com.malk.xiding.service.XDService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -72,23 +70,25 @@ public class XDController {
     @Autowired
     private DDClient_Workflow ddClient_workflow;
 
-    @PostMapping("test1")
-    McR test1() {
+    @GetMapping("sync/approve")
+    McR approve() {
 
         log.info("###### [XD]同步审批单开始 ######");
         long endTime = new Date().getTime() - 0 * 24 * 60 * 60 * 1000L;
         long startTime = endTime - 45 * 24 * 60 * 60 * 1000L;
-//        xdService.syncApprove(startTime, endTime, XDConf.TMP_CODE_CC, "出差");
+        xdService.syncApprove(startTime, endTime, XDConf.TMP_CODE_CC, "出差");
         xdService.syncApprove(startTime, endTime, XDConf.TMP_CODE_WC, "外出");
-//        xdService.syncApprove(UtilDateTime.parseDate("2024-01-08").getTime(), UtilDateTime.parseDate("2024-01-10").getTime(), XDConf.TMP_CODE_WC, "外出");
         return McR.success();
     }
 
-    @PostMapping("test2")
-    McR test2() {
-        for (int i = 8; i <= 13; i++) {
-            Date sTime = UtilDateTime.parseDateTime("2024-03-" + i + " 00:00:00");
-            Date eTime = UtilDateTime.parseDateTime("2024-03-" + i + " 23:59:59");
+    @GetMapping("sync/attendance")
+    McR attendance(@RequestParam int year, @RequestParam int mouth, @RequestParam int day_s, @RequestParam int day_e) {
+
+        log.info("###### [XD]考勤数据同步 ######, {}", year + "-" + mouth + "-" + day_s + " ~ " + year + "-" + mouth + "-" + day_e);
+        McException.assertAccessException(day_s > day_e, "开始时间不能大于结束时间");
+        for (int i = 1; i <= 3; i++) {
+            Date sTime = UtilDateTime.parseDateTime(year + "-" + mouth + "-" + day_s + " 00:00:00");
+            Date eTime = UtilDateTime.parseDateTime(year + "-" + mouth + "-" + day_s + " 23:59:59");
             xdService.syncAttendance(0, sTime, eTime);
             xdService.syncAttendanceForCC(0, sTime, eTime);
 

mjava-xiding/src/main/java/com/malk/xiding/service/impl/GSImplClient.java

@@ -77,6 +77,7 @@ public class GSImplClient implements GSClient {
                     .formUuid("FORM-TD966Z81I9ODTCY66GH345S03VW03JJF6EQLL5")
                     .processCode("TPROC--TD966Z81I9ODTCY66GH345S03VW03KJF6EQLL6")
                     .formDataJson(JSON.toJSONString(formData))
+                    .userId(tUserId)
                     .build();
             ydClient.operateData(ydParam, YDConf.FORM_OPERATION.start);
         }
@@ -150,6 +151,7 @@ public class GSImplClient implements GSClient {
                             .formUuid("FORM-8Y866XB1G4NDRF8RCHWJRB5EQPI13TD3I8ULLT")
                             .processCode("TPROC--8Y866XB1G4NDRF8RCHWJRB5EQPI13UD3I8ULLU")
                             .formDataJson(JSON.toJSONString(formData))
+                            .userId(userId)
                             .build();
                     ydClient.operateData(ydParam, YDConf.FORM_OPERATION.start);
                 }
@@ -171,6 +173,7 @@ public class GSImplClient implements GSClient {
                         .formUuid("FORM-8Y866XB1G4NDRF8RCHWJRB5EQPI13TD3I8ULLT")
                         .processCode("TPROC--8Y866XB1G4NDRF8RCHWJRB5EQPI13UD3I8ULLU")
                         .formDataJson(JSON.toJSONString(formData))
+                        .userId(userId)
                         .build();
                 ydClient.operateData(ydParam, YDConf.FORM_OPERATION.start);
             }