sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2024-01-11 23:11:51 +08:00
parent c94a1b5cd8
commit fa8140c80c
8 changed files with 233 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
View File

@ -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);
}
}

2
ruoyi-ui/package.json
View File

@ -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",

7
ruoyi-ui/src/api/project/attendanceConfig.js
View File

@ -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'
})
}

160
ruoyi-ui/src/views/project/attendanceConfig/attendanceConfigDialog.vue
View File

@ -3,7 +3,7 @@
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="项目名称" prop="projectId">
<el-select v-if="mode == 'add'" v-model="form.projectId" placeholder="请选择项目" clearable
<el-select v-if="mode != 'edit'" v-model="form.projectId" placeholder="请选择项目" clearable
@change="doQueryFormSub">
<el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName"
:value="item.id">
@ -12,33 +12,57 @@
<span v-else>{{ form.projectName }}</span>
</el-form-item>
<el-form-item label="总包单位" prop="subDeptId">
<el-select v-if="mode == 'add'" v-model="form.subDeptId" placeholder="请选择总包单位" clearable>
<el-select v-if="mode != 'edit'" v-model="form.subDeptId" placeholder="请选择总包单位" clearable @change="doQueryInfo">
<el-option v-for="(item, index) in formDepts" :key="index" :label="item.deptName"
:value="item.deptId">
</el-option>
</el-select>
<span v-else>{{ form.unitName }}</span>
</el-form-item>
<el-tabs v-model="actTab">
<el-tab-pane v-for="(it, idx) in dict.type.attendance_vendors" :key="idx" :label="it.label"
:name="it.value">
<el-form-item label="APPID" prop="appId">
<el-input v-model="form.appId" placeholder="请输AppId" clearable />
</el-form-item>
<el-form-item label="Secret" prop="secret">
<el-input v-model="form.secret" placeholder="请输Secret" clearable />
</el-form-item>
<el-form-item label="ProjectId" prop="appProjectId">
<el-input v-model="form.appProjectId" placeholder="请输ProjectId" clearable />
</el-form-item>
<el-form-item label="接入方式" prop="vendorsCode">
<el-select v-if="mode != 'edit'" v-model="form.vendorsCode" placeholder="请选择接入方式" clearable @change="changeRule">
<el-option key="yanzhu" label="研筑" value="yanzhu"></el-option>
<el-option key="gld" label="广联达" value="gld"></el-option>
<el-option key="huazhu" label="华筑" value="huazhu"></el-option>
</el-select>
<span v-else>{{ form.vendorsCode=='yanzhu'?'研筑':form.vendorsCode=='gld'?'广联达':'华筑' }}</span>
<span>
<el-button v-if="mode!='edit' && form.vendorsCode=='yanzhu'"
:disabled="!form.projectId || !form.subDeptId"
type="primary" style="margin-left: 12px;" @click="doMakeAppId">获取</el-button>
</span>
</el-form-item>
<template v-if="form.vendorsCode=='gld'">
<el-form-item label="APPID" prop="appId">
<el-input v-model="form.appId" placeholder="请输AppId" clearable />
</el-form-item>
<el-form-item label="Secret" prop="secret">
<el-input v-model="form.secret" placeholder="请输Secret" clearable />
</el-form-item>
<el-form-item label="项目ID" prop="appProjectId">
<el-input v-model="form.appProjectId" placeholder="请输项目ID" clearable />
</el-form-item>
</template>
<template v-else>
<el-form-item label="APPID" prop="appId">
<el-input v-model="form.appId" placeholder="请输AppId" clearable />
</el-form-item>
<el-form-item label="Secret" prop="secret">
<el-input v-model="form.secret" placeholder="请输Secret" clearable />
</el-form-item>
<el-form-item label="项目ID" prop="appProjectId">
<el-input v-model="form.appProjectId" placeholder="请输项目ID" clearable />
</el-form-item>
<el-form-item label="租户ID" prop="appTenantId">
<el-input v-model="form.appTenantId" placeholder="请输租户ID" clearable />
</el-form-item>
</template>
<el-form-item label="是否启用" prop="enabled">
<el-radio-group v-model="form.enabled">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
</el-tab-pane>
</el-tabs>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -49,7 +73,7 @@
</template>
<script>
import { listAttendanceConfig, getAttendanceConfig, delAttendanceConfig, addAttendanceConfig, updateAttendanceConfig } from "@/api/project/attendanceConfig";
import { listAttendanceConfig, getAttendanceConfig, delAttendanceConfig, addAttendanceConfig, updateAttendanceConfig,makeAppId } from "@/api/project/attendanceConfig";
export default {
dicts: ['attendance_vendors'],
data() {
@ -62,8 +86,10 @@ export default {
projectId: '',
subDeptId: '',
appId: '',
secret: '',
secret: '',
vendorsCode:'yanzhu',
appProjectId: '',
appTenantId:'',
enabled: 0
},
// 表单校验
@ -79,10 +105,42 @@ export default {
},
mounted() {
this.changeRule();
},
methods: {
doMakeAppId(){
makeAppId(this.form.projectId,this.form.subDeptId).then(d=>{
this.form.appId=d.data?.appId||''
this.form.secret=d.data?.secret||''
this.form.appProjectId=d.data?.projectId||''
this.form.appTenantId=d.data?.tenantId||''
});
},
doQueryInfo(){
if(this.form.projectId && this.form.subDeptId){
listAttendanceConfig({projectId:this.form.projectId,subDeptId:this.form.subDeptId}).then(d=>{
if(d.rows && d.rows.length>0){
this.toEdit(d.rows[0]);
this.mode="addEdit"
}else{
this.form.id="";
this.mode="add";
this.form.appId="";
this.form.secret="";
this.form.appProjectId="";
this.form.appTenantId="";
}
});
}else{
this.form.id="";
this.mode="add"
this.form.appId="";
this.form.secret="";
this.form.appProjectId="";
this.form.appTenantId="";
}
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
@ -90,18 +148,19 @@ export default {
let params = {
appId: this.form.appId,
secret: this.form.secret,
projectId: this.form.appProjectId
projectId: this.form.appProjectId,
tenantId:this.form.appTenantId,
};
let obj = {
projectId: this.form.projectId,
subDeptId: this.form.subDeptId,
vendorsCode: this.actTab,
vendorsCode: this.form.vendorsCode,
vendorsParameter: JSON.stringify(params),
enabled: this.form.enabled,
state: 0,
isDel: 0
};
if (this.form.id != null) {
if (this.form.id != null && this.form.id.trim().length>0) {
obj.id = this.form.id;
updateAttendanceConfig(obj).then(response => {
this.$modal.msgSuccess("修改成功");
@ -130,6 +189,7 @@ export default {
this.formDepts = tmps;
if (tmps.length == 1) {
this.form.subDeptId = tmps[0].deptId;
this.doQueryInfo();
} else {
this.form.subDeptId = '';
}
@ -147,6 +207,7 @@ export default {
this.formDepts = objs;
if (objs.length == 1) {
this.form.subDeptId = objs[0].deptId;
this.doQueryInfo();
} else {
this.form.subDeptId = '';
}
@ -160,25 +221,42 @@ export default {
subDeptId: '',
appId: '',
secret: '',
vendorsCode:'yanzhu',
appProjectId: '',
appTenantId:'',
enabled: 0
};
this.resetForm("form");
},
changeRule(){
if(this.form.vendorsCode=='gld'){
this.rules = {
projectId: [{ required: true, trigger: "blur", message: "请选择" }],
subDeptId: [{ required: true, trigger: "blur", message: "请选择" }],
appId: [{ required: true, trigger: "blur", message: "请输入" }],
secret: [{ required: true, trigger: "blur", message: "请输入" }],
appProjectId: [{ required: true, trigger: "blur", message: "请输入" }],
enabled: [{ required: true, trigger: "blur", message: "请选择" }]
}
}else{
this.rules = {
projectId: [{ required: true, trigger: "blur", message: "请选择" }],
subDeptId: [{ required: true, trigger: "blur", message: "请选择" }],
appId: [{ required: true, trigger: "blur", message: "请输入" }],
secret: [{ required: true, trigger: "blur", message: "请输入" }],
appProjectId: [{ required: true, trigger: "blur", message: "请输入" }],
appTenantId: [{ required: true, trigger: "blur", message: "请输入" }],
enabled: [{ required: true, trigger: "blur", message: "请选择" }]
}
}
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.mode = "add";
this.title = "添加劳务实名制配置";
this.rules = {
projectId: [{ required: true, trigger: "blur", message: "请选择" }],
subDeptId: [{ required: true, trigger: "blur", message: "请选择" }],
appId: [{ required: true, trigger: "blur", message: "请输入" }],
secret: [{ required: true, trigger: "blur", message: "请输入" }],
appProjectId: [{ required: true, trigger: "blur", message: "请输入" }],
enabled: [{ required: true, trigger: "blur", message: "请选择" }]
}
this.changeRule();
this.actTab = this.dict.type.attendance_vendors[0].value;
setTimeout(() => {
this.$refs["form"].clearValidate();
@ -198,27 +276,25 @@ export default {
this.reset();
const id = row.id || this.ids
getAttendanceConfig(id).then(response => {
this.mode = "edit"
let obj = response.data;
this.mode = "edit"
this.toEdit( response.data);
});
},
toEdit(obj){
let p = obj.vendorsParameter ? this.$tryToJson(obj.vendorsParameter, {}) : {};
obj.appId = p.appId || '';
obj.secret = p.secret || '',
obj.appProjectId = p.projectId || '';
obj.appProjectId = p.projectId || '';
obj.appTenantId=p.tenantId||'';
this.form = obj;
this.open = true;
this.title = "修改劳务实名制配置";
this.actTab = this.dict.type.attendance_vendors[0].value;
this.rules = {
appId: [{ required: true, trigger: "blur", message: "请输入" }],
secret: [{ required: true, trigger: "blur", message: "请输入" }],
appProjectId: [{ required: true, trigger: "blur", message: "请输入" }],
enabled: [{ required: true, trigger: "blur", message: "请选择" }]
}
this.changeRule();
setTimeout(() => {
this.$refs["form"].clearValidate();
}, 400);
});
},
}
},
};
</script>

4
ruoyi-ui/vue.config.js
View File

@ -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':'/'

16
yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAttendanceCfgController.java
View File

@ -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<String,String> 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);
}
/**
* 导出项目考勤配置列表
*/

80
yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceHuazhuTask.java 100644
View File

@ -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<String, String> headerParams=new HashMap<>();
headerParams.put("appId","8024283707153666851");
headerParams.put("appSecret","2070308b49399d94b401d98adeaa5b342aa81627");
headerParams.put("Content-Type","application/json");
Map<String, String> 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<String, String> params ){
return RequestBody.create(
MediaType.parse("application/json"), JSON.toJSONString(params));
}
private static Headers setHeaderParams(Map<String, String> 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;
}
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/task/AttendanceTask.java
View File

@ -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 {