From 6c2eb7ee27dcd6fb0cc537984f1188a14639f2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sat, 23 Mar 2024 00:58:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E5=93=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 2 +- .../yanzhu/jh/publics/PublicsController.java | 45 +++++++++++++++++-- .../SurProjectAttendanceDataMapper.xml | 8 ++-- 3 files changed, 46 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 0a4cb247..df613172 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -40,7 +40,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root password: Sxyanzhu@cf # 从库数据源 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java index 5fb42eb8..a3bd5650 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java @@ -22,10 +22,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Calendar; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -257,6 +254,46 @@ PublicsController extends BaseController { }else{ list = surProjectAttendanceDataService.initOtherData(data); } + List dataList = new ArrayList<>(); + for(Map map:list){ + SurProjectAttendanceData attendanceData = new SurProjectAttendanceData(); + attendanceData.setCfgid(cfg.getId()); + attendanceData.setAppId(map.get("app_id").toString()); + attendanceData.setProjectId(cfg.getProjectId()); + attendanceData.setProjectName(cfg.getProjectName()); + attendanceData.setDeptId(cfg.getSubDeptId()); + attendanceData.setDeptName(cfg.getUnitName()); + attendanceData.setVendorsCode(cfg.getVendorsCode()); + attendanceData.setServerid(map.get("serverid").toString()); + attendanceData.setWorkerId(map.get("workerId").toString()); + attendanceData.setWorkerName(map.get("name").toString()); + attendanceData.setIdentification(map.get("identification").toString()); + attendanceData.setWorkerPhoto(Convert.toStr(map.get("recentPhoto"))); + attendanceData.setWorkerGender(Convert.toLong(map.get("gender"))); + attendanceData.setBirthDate(Convert.toLong(map.get("birthDate"))); + attendanceData.setEthnic(map.get("ethnic").toString()); + attendanceData.setNativePlace(map.get("nativePlace").toString()); + attendanceData.setPhone(map.get("phone").toString()); + attendanceData.setWorkTypeName(map.get("workTypeName").toString()); + attendanceData.setSpecWorkType(Convert.toInt(map.get("specWorkType"))); + attendanceData.setGroupName(map.get("groupName").toString()); + attendanceData.setCompanyTypeId(Convert.toStr(map.get("companyTypeId"),"0")); + attendanceData.setCompanyName(map.get("companyName").toString()); + attendanceData.setAttendanceTime(map.get("inTime").toString()); + attendanceData.setAttendanceOutTime(map.get("outTime").toString()); + attendanceData.setScanPhoto(Convert.toStr(map.get("scanPhoto"))); + attendanceData.setTeamId(Convert.toLong(map.get("teamId"))); + attendanceData.setWorkTypeCode(Convert.toStr(map.get("workTypeCode"))); + attendanceData.setCompanyId(Convert.toStr(map.get("companyId"))); + attendanceData.setVendorId(Convert.toLong(map.get("vendorId"))); + attendanceData.setDeviceCode(Convert.toStr(map.get("device_code"))); + attendanceData.setIsDel(Convert.toLong(map.get("is_del"))); + attendanceData.setCreateBy("数据迁移格式化"); + attendanceData.setCreateTime(new Date()); + dataList.add(attendanceData); + //surProjectAttendanceDataService.add(attendanceData); + } + redisCache.setCacheObject("PUBLICS.V1.initAttendanceData",dataList,30*24,TimeUnit.HOURS); } } return success(); diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml index 4e89505e..8a0509b1 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml @@ -329,8 +329,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"