diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java index c1c58dbc..acdfa515 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java @@ -64,4 +64,12 @@ public class Md5Utils return s; } } + + public static String yzMd5(String s){ + String tmp="HelloYanzhu"+s+"陕西研筑"; + tmp=hash(tmp); + tmp=tmp.substring(3,15)+"yanzhu"+tmp.substring(20)+"研筑陕西"; + tmp=hash(tmp); + return "sxyz"+tmp.substring(21,tmp.length()-3)+tmp.substring(3,14); + } } diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index eafc423a..24a18a25 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -5,7 +5,7 @@ "author": "若依", "license": "MIT", "scripts": { - "dev": "vue-cli-service serve", + "dev": "SET NODE_OPTIONS=--openssl-legacy-provider & vue-cli-service serve", "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", diff --git a/ruoyi-ui/src/api/project/attendanceConfig.js b/ruoyi-ui/src/api/project/attendanceConfig.js index 30051808..4931d494 100644 --- a/ruoyi-ui/src/api/project/attendanceConfig.js +++ b/ruoyi-ui/src/api/project/attendanceConfig.js @@ -42,3 +42,10 @@ export function delAttendanceConfig(id) { method: 'delete' }) } + +export function makeAppId(projectId,subDeptId){ + return request({ + url: `/project/attendanceConfig/makeAppId?projectId=${projectId}&subDeptId=${subDeptId}`, + method: 'get' + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue b/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue index 2aac47d9..5a70669e 100644 --- a/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue +++ b/ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue @@ -3,7 +3,7 @@ - @@ -12,33 +12,57 @@ {{ form.projectName }} - + {{ form.unitName }} - - - - - - - - - - - + + + + + + + {{ form.vendorsCode=='yanzhu'?'研筑':form.vendorsCode=='gld'?'广联达':'华筑' }} + + 获取 + + + + 启用 停用 - -
确 定 @@ -49,7 +73,7 @@ diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 945f0299..b6e02c50 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -41,8 +41,8 @@ module.exports = { // } // }, '/jhapi':{ - target: `http://62.234.3.186/jhapi/`, - //target: `http://127.0.0.1:8090/jhapi/`, + //target: `http://62.234.3.186/jhapi/`, + target: `http://127.0.0.1:8090/jhapi/`, changeOrigin: true, pathRewrite: { '^/jhapi':'/' diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceCfgController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceCfgController.java index 0cad1c31..f8e6665d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceCfgController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceCfgController.java @@ -1,7 +1,12 @@ package com.yanzhu.jh.project.controller; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.util.RandomUtil; +import com.ruoyi.common.utils.sign.Md5Utils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -46,6 +51,17 @@ public class SurProjectAttendanceCfgController extends BaseController return getDataTable(list); } + @PreAuthorize("@ss.hasPermi('project:attendanceConfig:list')") + @GetMapping("/makeAppId") + public AjaxResult makeAppId(long projectId,long subDeptId){ + Map map=new HashMap<>(); + map.put("appId", Md5Utils.yzMd5("陕西研筑"+projectId+"-"+subDeptId+ RandomUtil.randomString(10))+RandomUtil.randomString(10)); + map.put("secret", Md5Utils.yzMd5("研筑陕西"+projectId+"_"+subDeptId+ RandomUtil.randomString(10))+RandomUtil.randomString(10)); + map.put("projectId",Md5Utils.yzMd5("陕西研筑"+projectId+ RandomUtil.randomString(10))+RandomUtil.randomString(10)); + map.put("tenantId",Md5Utils.yzMd5("研筑陕西"+subDeptId+ RandomUtil.randomString(10))+RandomUtil.randomString(10)); + return AjaxResult.success("ok",map); + } + /** * 导出项目考勤配置列表 */ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java new file mode 100644 index 00000000..0b03e3d0 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java @@ -0,0 +1,80 @@ +package com.yanzhu.jh.project.task; + +import com.alibaba.fastjson2.JSON; +import com.yanzhu.jh.project.service.ISurProjectAttendanceCfgService; +import com.yanzhu.jh.project.service.ISurProjectAttendanceDataService; +import com.yanzhu.jh.project.service.ISurProjectAttendanceGroupService; +import com.yanzhu.jh.project.service.ISurProjectAttendanceUserService; +import okhttp3.*; +import org.apache.logging.log4j.util.Strings; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +@Component("attendanceHuazhuTask") +public class AttendanceHuazhuTask { + @Autowired + ISurProjectAttendanceUserService attendanceUserService; + + @Autowired + ISurProjectAttendanceCfgService attendanceCfgService; + + @Autowired + ISurProjectAttendanceDataService attendanceDataService; + + @Autowired + ISurProjectAttendanceGroupService attendanceGroupService; + + public static void main(String[] args) { + //String host="http://tapi.huazhukeji.cn:82/hz-labour"; + String host="http://api.1357.cn/hz-labour"; + String path="/api/open/labour/findWorkerTypeByPage"; + HttpUrl.Builder urlBuilder = Objects.requireNonNull(HttpUrl.parse(host + path)) + .newBuilder(); + + Map headerParams=new HashMap<>(); + headerParams.put("appId","8024283707153666851"); + headerParams.put("appSecret","2070308b49399d94b401d98adeaa5b342aa81627"); + headerParams.put("Content-Type","application/json"); + + Map params = new HashMap<>(); + params.put("orgId","1666339529033805825"); + params.put("tenantId","1666337067184893953"); + params.put("size","200"); + params.put("current","1"); + + params.forEach((s, o) -> { + urlBuilder.addQueryParameter(s, (String) o); + }); + Request request = new Request.Builder() + .url(urlBuilder.build()) + .post(toFormBody(params)).headers(setHeaderParams(headerParams)) + .build(); + String data=AttendanceTask.getResult(request); + System.out.println(data); + + } + private static RequestBody toFormBody(Map params ){ + return RequestBody.create( + MediaType.parse("application/json"), JSON.toJSONString(params)); + } + private static Headers setHeaderParams(Map headerParams) { + Headers headers = null; + Headers.Builder headersbuilder = new Headers.Builder(); + if (headerParams != null && headerParams.size() > 0) { + for (String key : headerParams.keySet()) { + if (!Strings.isEmpty(key) && !Strings.isEmpty(headerParams.get(key))) { + //如果参数不是null并且不是""，就拼接起来 + headersbuilder.add(key, headerParams.get(key)); + } + } + } + + headers = headersbuilder.build(); + return headers; + } + +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java index 87703dae..27840bfc 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java @@ -246,7 +246,7 @@ public class AttendanceTask { - private static String getResult(Request request) { + public static String getResult(Request request) { OkHttpClient client = new OkHttpClient(); Response response; try {