jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: jiangyq:c0c76bfa6a77af702944da48fca5f79ef77fa063
Branches Tags
jiangyq:dev_xd
jiangyq:main
..
compare: jiangyq:d0156c60f19e9ba4f7fefe9b4a89353dc0d7e84e
Branches Tags
jiangyq:dev_xd
jiangyq:main

No commits in common. "c0c76bfa6a77af702944da48fca5f79ef77fa063" and "d0156c60f19e9ba4f7fefe9b4a89353dc0d7e84e" have entirely different histories.
c0c76bfa6a ... d0156c60f1

9 changed files with 281 additions and 315 deletions
Show Stats Expand all files Collapse all files

5
yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
View File

@ -206,9 +206,6 @@ public class AttendanceJgwTask {
quartzProSubdeptsService.insertQuartzProSubdepts(quartzProSubdepts); quartzProSubdeptsService.insertQuartzProSubdepts(quartzProSubdepts);
redisService.setCacheObject("doSyncProContractor.contractorId::"+json.getString("contractorId"),quartzProSubdepts,2L,TimeUnit.HOURS); redisService.setCacheObject("doSyncProContractor.contractorId::"+json.getString("contractorId"),quartzProSubdepts,2L,TimeUnit.HOURS);
}else{ }else{
QuartzProSubdepts quartzProSubdepts = list.get(0);
quartzProSubdepts.setSource(code.toUpperCase()+"::"+json.getString("contractorId"));
quartzProSubdeptsService.updateQuartzProSubdepts(quartzProSubdepts);
redisService.setCacheObject("doSyncProContractor.contractorId::"+json.getString("contractorId"),list.get(0),2L,TimeUnit.HOURS); redisService.setCacheObject("doSyncProContractor.contractorId::"+json.getString("contractorId"),list.get(0),2L,TimeUnit.HOURS);
} }
}else{ }else{
@ -331,7 +328,6 @@ public class AttendanceJgwTask {
redisService.setCacheObject("doSyncDirectlyUnderGroup.teamLeaderId::"+json.getString("leaderId"),quartzProSubdeptsGroup,2L,TimeUnit.HOURS); redisService.setCacheObject("doSyncDirectlyUnderGroup.teamLeaderId::"+json.getString("leaderId"),quartzProSubdeptsGroup,2L,TimeUnit.HOURS);
}else{ }else{
QuartzProSubdeptsGroup quartzProSubdeptsGroup = list.get(0); QuartzProSubdeptsGroup quartzProSubdeptsGroup = list.get(0);
quartzProSubdeptsGroup.setSource(code.toUpperCase()+"::"+json.getString("id"));
quartzProSubdeptsGroup.setIsDel(Convert.toLong(json.getString("deleteFlag"),0L)); quartzProSubdeptsGroup.setIsDel(Convert.toLong(json.getString("deleteFlag"),0L));
quartzProSubdeptsGroup.setUpdateBy("JGW-TASK"); quartzProSubdeptsGroup.setUpdateBy("JGW-TASK");
quartzProSubdeptsGroup.setUpdateTime(DateUtils.getNowDate()); quartzProSubdeptsGroup.setUpdateTime(DateUtils.getNowDate());
@ -656,7 +652,6 @@ public class AttendanceJgwTask {
}else{ }else{
QuartzProSubdeptsUsers quartzProSubdeptsUsers = list.get(0); QuartzProSubdeptsUsers quartzProSubdeptsUsers = list.get(0);
quartzProSubdeptsUsers.setUseStatus(StringUtils.eqObj(json.getString("workerStatus"),"01")?UseStateEnums.IN.getCode() : UseStateEnums.OUT.getCode()); quartzProSubdeptsUsers.setUseStatus(StringUtils.eqObj(json.getString("workerStatus"),"01")?UseStateEnums.IN.getCode() : UseStateEnums.OUT.getCode());
quartzProSubdeptsUsers.setSource(code.toUpperCase()+"::"+json.getString("workerId"));
quartzProSubdeptsUsers.setUpdateBy("JGW-TASK"); quartzProSubdeptsUsers.setUpdateBy("JGW-TASK");
quartzProSubdeptsUsers.setUpdateTime(DateUtils.getNowDate()); quartzProSubdeptsUsers.setUpdateTime(DateUtils.getNowDate());
quartzProSubdeptsUsersService.updateQuartzProSubdeptsUsers(quartzProSubdeptsUsers); quartzProSubdeptsUsersService.updateQuartzProSubdeptsUsers(quartzProSubdeptsUsers);

1
yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsGroupMapper.xml
View File

@ -141,7 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="source != null">source = #{source},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

1
yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsMapper.xml
View File

@ -149,7 +149,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="source != null">source = #{source},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

1
yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzSubdeptsUsersMapper.xml
View File

@ -247,7 +247,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="source != null">source = #{source},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

1
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java
View File

@ -83,7 +83,6 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController
List<ProProjectInfoSubdeptsUsers> list = proProjectInfoSubdeptsUsersService.groupByCraftTypeByAttendance(where); List<ProProjectInfoSubdeptsUsers> list = proProjectInfoSubdeptsUsersService.groupByCraftTypeByAttendance(where);
return AjaxResult.success(list); return AjaxResult.success(list);
} }
/** /**
* 导出分包单位工人列表 * 导出分包单位工人列表
*/ */

3
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java
View File

@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.constant.SecurityConstants;
import com.yanzhu.common.core.enums.*; import com.yanzhu.common.core.enums.*;
import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.exception.ServiceException;
import com.yanzhu.common.core.text.Convert;
import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.core.utils.StringUtils;
import com.yanzhu.common.security.utils.SecurityUtils; import com.yanzhu.common.security.utils.SecurityUtils;
@ -451,7 +450,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
userQuery.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId()); userQuery.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId());
List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery); List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
proProjectInfoSubdeptsUsersMapper.updateUseStatusByParams(proProjectInfoSubdeptsGroup.getSubDeptId(),proProjectInfoSubdeptsGroup.getId()); proProjectInfoSubdeptsUsersMapper.updateUseStatusByParams(proProjectInfoSubdeptsGroup.getSubDeptId(),proProjectInfoSubdeptsGroup.getId());
if("SYSTEM".equals(Convert.toStr(proProjectInfoSubdeptsGroup.getSource(),"SYSTEM")) && users.size()>0){ if(users.size()>0){
for(ProProjectInfoSubdeptsUsers user:users){ for(ProProjectInfoSubdeptsUsers user:users){
uniService.syncUserRevoke(user.getId()); uniService.syncUserRevoke(user.getId());
} }

7
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
View File

@ -6,7 +6,6 @@ import com.yanzhu.common.core.constant.SecurityConstants;
import com.yanzhu.common.core.domain.R; import com.yanzhu.common.core.domain.R;
import com.yanzhu.common.core.enums.*; import com.yanzhu.common.core.enums.*;
import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.exception.ServiceException;
import com.yanzhu.common.core.text.Convert;
import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.DateUtils;
import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.core.utils.StringUtils;
import com.yanzhu.common.redis.service.RedisService; import com.yanzhu.common.redis.service.RedisService;
@ -16,7 +15,6 @@ import com.yanzhu.manage.domain.ProProjectInfo;
import com.yanzhu.manage.domain.ProProjectInfoSubdepts; import com.yanzhu.manage.domain.ProProjectInfoSubdepts;
import com.yanzhu.manage.domain.ProProjectInfoSubdeptsGroup; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsGroup;
import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers;
import com.yanzhu.manage.mapper.AttendanceUbiDeviceMapper;
import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsGroupMapper; import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsGroupMapper;
import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsMapper; import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsMapper;
import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper; import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper;
@ -57,9 +55,6 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
@Autowired @Autowired
private RemoteUserService remoteUserService; private RemoteUserService remoteUserService;
@Autowired
private AttendanceUbiDeviceMapper attendanceUbiDeviceMapper;
@Autowired @Autowired
private ProProjectInfoSubdeptsMapper proProjectInfoSubdeptsMapper; private ProProjectInfoSubdeptsMapper proProjectInfoSubdeptsMapper;
@ -585,7 +580,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery); List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
proProjectInfoSubdeptsGroupMapper.updateUseStatusByParams(proProjectInfoSubdepts.getId()); proProjectInfoSubdeptsGroupMapper.updateUseStatusByParams(proProjectInfoSubdepts.getId());
proProjectInfoSubdeptsUsersMapper.updateUseStatusByParams(proProjectInfoSubdepts.getId(),null); proProjectInfoSubdeptsUsersMapper.updateUseStatusByParams(proProjectInfoSubdepts.getId(),null);
if("SYSTEM".equals(Convert.toStr(proProjectInfoSubdepts.getSource(),"SYSTEM")) && users.size()>0){ if(users.size()>0){
for(ProProjectInfoSubdeptsUsers user:users){ for(ProProjectInfoSubdeptsUsers user:users){
uniService.syncUserRevoke(user.getId()); uniService.syncUserRevoke(user.getId());
} }

541
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.yanzhu.manage.service.impl; package com.yanzhu.manage.service.impl;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
@ -29,11 +30,8 @@ import java.security.NoSuchAlgorithmException;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/**
* 闸机服务
*/
@Service @Service
public class UniServiceImpl implements IUniService { public class UniServiceImpl implements IUniService{
@Autowired @Autowired
private RedisService redisService; private RedisService redisService;
@ -46,50 +44,49 @@ public class UniServiceImpl implements IUniService {
@Autowired @Autowired
private ProProjectInfoSubdeptsUsersMapper proProjectInfoSubdeptsUsersMapper; private ProProjectInfoSubdeptsUsersMapper proProjectInfoSubdeptsUsersMapper;
private void clearAuthCache(long projectId){
private void clearAuthCache(long projectId) { String cacheKey=CacheConstants.UNI_AUTH+projectId;
String cacheKey = CacheConstants.UNI_AUTH + projectId;
redisService.deleteObject(cacheKey); redisService.deleteObject(cacheKey);
} }
@Override @Override
public Map<String, String> auth(long projectId) { public Map<String,String> auth(long projectId) {
String cacheKey = CacheConstants.UNI_AUTH + projectId; String cacheKey=CacheConstants.UNI_AUTH+projectId;
Map<String, String> authMap = redisService.getCacheObject(cacheKey); Map<String,String> authMap = redisService.getCacheObject(cacheKey);
String authInfo = "404"; String authInfo="404";
String projectGuid = "404"; String projectGuid="404";
if (authMap != null) { if(authMap!=null){
return authMap; return authMap;
} else { }else{
authMap = new HashMap<>(); authMap=new HashMap<>();
} }
AttendanceCfg where = new AttendanceCfg(); AttendanceCfg where=new AttendanceCfg();
where.setProjectId(projectId); where.setProjectId(projectId);
List<AttendanceCfg> list = attendanceCfgMapper.selectAttendanceCfgList(where); List<AttendanceCfg> list=attendanceCfgMapper.selectAttendanceCfgList(where);
if (list.size() > 0) { if(list.size()>0){
AttendanceCfg cfg = list.get(0); AttendanceCfg cfg=list.get(0);
if (cfg.getVendorsCode().equals("uni") && StringUtils.isNotEmpty(cfg.getVendorsParameter())) { if(cfg.getVendorsCode().equals("uni") && StringUtils.isNotEmpty(cfg.getVendorsParameter())){
JSONObject json = JSON.parseObject(cfg.getVendorsParameter()); JSONObject json=JSON.parseObject(cfg.getVendorsParameter());
String appKey = json.getString("AppKey"); String appKey=json.getString("AppKey");
String appSecret = json.getString("AppSecret"); String appSecret=json.getString("AppSecret");
projectGuid = json.getString("projectGuid"); projectGuid=json.getString("projectGuid");
String timestamp = "" + new Date().getTime(); String timestamp=""+new Date().getTime();
Map<String, String> headerParams = new HashMap<>(); Map<String, String> headerParams=new HashMap<>();
headerParams.put("appKey", appKey); headerParams.put("appKey",appKey);
headerParams.put("timestamp", timestamp); headerParams.put("timestamp",timestamp);
String sign = appKey + timestamp + appSecret; String sign=appKey+timestamp+appSecret;
headerParams.put("sign", UniUtils.md5(sign).toLowerCase()); headerParams.put("sign", UniUtils.md5(sign).toLowerCase());
Request request = new Request.Builder() Request request = new Request.Builder()
.url(UniUtils.getAuthUrl(projectGuid)) .url(UniUtils.getAuthUrl(projectGuid))
.get().headers(UniUtils.setHeaderParams(headerParams)) .get().headers(UniUtils.setHeaderParams(headerParams))
.build(); .build();
String str = UniUtils.getResult(request); String str=UniUtils.getResult(request);
JSONObject jo = JSON.parseObject(str); JSONObject jo=JSON.parseObject(str);
String data = jo.getString("data"); String data= jo.getString("data");
if (StringUtils.isNotEmpty(data)) { if(StringUtils.isNotEmpty(data)){
authInfo = data; authInfo=data;
authMap.put("token", authInfo); authMap.put("token",authInfo);
authMap.put("projectGuid", projectGuid); authMap.put("projectGuid",projectGuid);
redisService.setCacheObject(cacheKey, authMap, 20l, TimeUnit.HOURS);//缓存20小时 redisService.setCacheObject(cacheKey, authMap, 20l, TimeUnit.HOURS);//缓存20小时
} }
} }
@ -99,19 +96,19 @@ public class UniServiceImpl implements IUniService {
@Override @Override
public String admitCreate(JSONObject data) { public String admitCreate(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
data.remove("projectId"); data.remove("projectId");
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.ADMITCREATE) .url(UniUtils.ADMITCREATE)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if (jo.getLong("result").intValue() == 1) { if(jo.getLong("result").intValue()==1){
return jo.getJSONObject("data").getString("admitGuid"); return jo.getJSONObject("data").getString("admitGuid");
} }
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return admitCreate(data); return admitCreate(data);
} }
@ -120,39 +117,39 @@ public class UniServiceImpl implements IUniService {
@Override @Override
public String admitUpdate(JSONObject data) { public String admitUpdate(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
data.remove("projectId"); data.remove("projectId");
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.ADMITUPDATE) .url(UniUtils.ADMITUPDATE)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return admitUpdate(data); return admitUpdate(data);
} }
return jo.getString("msg"); return jo.getString("msg");
} }
@Override @Override
public boolean admitDeletee(JSONObject data) { public boolean admitDeletee(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
data.remove("projectId"); data.remove("projectId");
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.ADMITDELETE) .url(UniUtils.ADMITDELETE)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return admitDeletee(data); return admitDeletee(data);
} }
return jo.getLong("result").intValue() == 1; return jo.getLong("result").intValue()==1;
} }
@Override @Override
@ -167,45 +164,45 @@ public class UniServiceImpl implements IUniService {
@Override @Override
public JSONObject faceRegister(JSONObject data) { public JSONObject faceRegister(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
data.remove("projectId"); data.remove("projectId");
//System.out.println("faceRegister==REQ>"+JSON.toJSONString(data)); //System.out.println("faceRegister==REQ>"+JSON.toJSONString(data));
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.FACEREGISTER) .url(UniUtils.FACEREGISTER)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
//System.out.println("faceRegister==RES>"+res); //System.out.println("faceRegister==RES>"+res);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if (jo.getLong("result").intValue() == 1) { if(jo.getLong("result").intValue()==1){
return jo.getJSONObject("data"); return jo.getJSONObject("data");
} }
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return faceRegister(data); return faceRegister(data);
} }
return null; return null;
} }
@Override @Override
public boolean faceDelete(JSONObject data) { public boolean faceDelete(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
data.remove("projectId"); data.remove("projectId");
//System.out.println("faceDelete==REQ>"+JSON.toJSONString(data)); //System.out.println("faceDelete==REQ>"+JSON.toJSONString(data));
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.FACEDELETE) .url(UniUtils.FACEDELETE)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
//System.out.println("faceDelete==RES>"+res); //System.out.println("faceDelete==RES>"+res);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return faceDelete(data); return faceDelete(data);
} }
return jo.getLong("result").intValue() == 1; return jo.getLong("result").intValue()==1;
} }
@Override @Override
@ -215,18 +212,18 @@ public class UniServiceImpl implements IUniService {
@Override @Override
public String deviceCreate(JSONObject data) { public String deviceCreate(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.DEVICECREATE) .url(UniUtils.DEVICECREATE)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if (jo.getLong("result").intValue() == 1) { if(jo.getLong("result").intValue()==1){
return "success"; return "success";
} }
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return deviceCreate(data); return deviceCreate(data);
} }
@ -240,18 +237,18 @@ public class UniServiceImpl implements IUniService {
@Override @Override
public JSONObject deviceDelete(JSONObject data) { public JSONObject deviceDelete(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.DEVICEDELETE) .url(UniUtils.DEVICEDELETE)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if (jo.getLong("result").intValue() == 1) { if(jo.getLong("result").intValue()==1){
return jo.getJSONObject("data"); return jo.getJSONObject("data");
} }
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return deviceDelete(data); return deviceDelete(data);
} }
@ -260,18 +257,18 @@ public class UniServiceImpl implements IUniService {
@Override @Override
public JSONObject deviceDetail(JSONObject data) { public JSONObject deviceDetail(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.DEVICEDETAIL) .url(UniUtils.DEVICEDETAIL)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if (jo.getLong("result").intValue() == 1) { if(jo.getLong("result").intValue()==1){
return jo.getJSONObject("data"); return jo.getJSONObject("data");
} }
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return deviceDetail(data); return deviceDetail(data);
} }
@ -280,18 +277,18 @@ public class UniServiceImpl implements IUniService {
@Override @Override
public String authDevice(JSONObject data) { public String authDevice(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.AUTHDEVICE) .url(UniUtils.AUTHDEVICE)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if (jo.getLong("result").intValue() == 1) { if(jo.getLong("result").intValue()==1){
return "success"; return "success";
} }
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return deviceCreate(data); return deviceCreate(data);
} }
@ -305,167 +302,157 @@ public class UniServiceImpl implements IUniService {
@Override @Override
public String authDeviceRevoke(JSONObject data) { public String authDeviceRevoke(JSONObject data) {
long projectId = data.getLong("projectId"); long projectId=data.getLong("projectId");
Request request = new Request.Builder() Request request=new Request.Builder()
.url(UniUtils.AUTHDEVICEREVOKE) .url(UniUtils.AUTHDEVICEREVOKE)
.post(UniUtils.toJsonBody(data)) .post(UniUtils.toJsonBody(data))
.headers(UniUtils.setHeaderParams(auth(projectId))) .headers(UniUtils.setHeaderParams(auth(projectId)))
.build(); .build();
String res = UniUtils.getResult(request); String res=UniUtils.getResult(request);
JSONObject jo = JSON.parseObject(res); JSONObject jo=JSON.parseObject(res);
if (jo.getLong("result").intValue() == 1) { if(jo.getLong("result").intValue()==1){
return "success"; return "success";
} }
if ("token is illegal".equals(jo.getString("msg"))) { if("token is illegal".equals(jo.getString("msg"))){
clearAuthCache(projectId); clearAuthCache(projectId);
return authDeviceRevoke(data); return authDeviceRevoke(data);
} }
return jo.getString("msg"); return jo.getString("msg");
} }
@Override @Override
public Long syncUniDeviceUser(Long deviceId, Long projectId) { public Long syncUniDeviceUser(Long deviceId,Long projectId){
AttendanceUbiDevice device = attendanceUbiDeviceMapper.selectAttendanceUbiDeviceById(deviceId); AttendanceUbiDevice device=attendanceUbiDeviceMapper.selectAttendanceUbiDeviceById(deviceId);
if (Objects.nonNull(device)) { ProProjectInfoSubdeptsUsers userWhere=new ProProjectInfoSubdeptsUsers();
ProProjectInfoSubdeptsUsers userWhere = new ProProjectInfoSubdeptsUsers(); userWhere.setProjectId(projectId);
userWhere.setProjectId(projectId); List<ProProjectInfoSubdeptsUsers> userList=proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userWhere);
List<ProProjectInfoSubdeptsUsers> userList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userWhere); JSONObject jo=new JSONObject();
JSONObject jo = new JSONObject(); jo.put("projectId",projectId);
jo.put("projectId", projectId); jo.put("deviceNo",device.getDeviceNo());
jo.put("deviceNo", device.getDeviceNo()); List<String> admitGuidList=new ArrayList<>();
List<String> admitGuidList = new ArrayList<>(); for(ProProjectInfoSubdeptsUsers u :userList){
for (ProProjectInfoSubdeptsUsers u : userList) { String admitGuid=u.getAdmitGuid();
String admitGuid = u.getAdmitGuid(); if(StringUtils.isNotEmpty(admitGuid)){
if (StringUtils.isNotEmpty(admitGuid)) { admitGuidList.add(admitGuid);
admitGuidList.add(admitGuid); }
} }
} for(int i=0;i<admitGuidList.size();i+=50){
for (int i = 0; i < admitGuidList.size(); i += 50) { String admitGuids="";
String admitGuids = ""; for(int j=0;j<50 && j+i<admitGuidList.size();j++){
for (int j = 0; j < 50 && j + i < admitGuidList.size(); j++) { admitGuids+=admitGuidList.get((i+j))+",";
admitGuids += admitGuidList.get((i + j)) + ","; }
} if(admitGuids.length()>0){
if (admitGuids.length() > 0) { admitGuids=admitGuids.substring(0,admitGuids.length()-1);
admitGuids = admitGuids.substring(0, admitGuids.length() - 1); }
} jo.put("admitGuids",admitGuids);
jo.put("admitGuids", admitGuids); authDevice(jo);
authDevice(jo); }
} return 1l;
return 1l;
}
return 0L;
} }
/** /**
* 同步删除设备 1.删除设备人员关系 2.删除设备 * 同步删除设备 1.删除设备人员关系 2.删除设备
*
* @param ids * @param ids
* @return * @return
*/ */
@Override @Override
public long syncUniDeviceDelete(Long[] ids) { public long syncUniDeviceDelete(Long[] ids) {
long cnt = 0; long cnt=0;
for (Long id : ids) { for(Long id :ids){
cnt += deleteDevice(id); cnt+=deleteDevice(id);
} }
return cnt; return cnt;
} }
/** /**
* 用户设备销权识别主体 * 用户设备销权识别主体
*
* @param id * @param id
*/ */
@Override @Override
public void syncUserRevoke(Long id) { public void syncUserRevoke(Long id) {
ProProjectInfoSubdeptsUsers user = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id); ProProjectInfoSubdeptsUsers user= proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
if (Objects.nonNull(user)) { if(user==null){
AttendanceUbiDevice where = new AttendanceUbiDevice(); return;
where.setProjectId(user.getProjectId()); }
List<AttendanceUbiDevice> devList = attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where); AttendanceUbiDevice where=new AttendanceUbiDevice();
if (devList.size() > 0) { where.setProjectId(user.getProjectId());
for (AttendanceUbiDevice device : devList) { List<AttendanceUbiDevice> devList=attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where);
JSONObject jo = new JSONObject(); for(AttendanceUbiDevice device :devList){
jo.put("projectId", user.getProjectId()); JSONObject jo=new JSONObject();
jo.put("deviceNo", device.getDeviceNo()); jo.put("projectId",user.getProjectId());
jo.put("admitGuids", user.getAdmitGuid()); jo.put("deviceNo",device.getDeviceNo());
authDeviceRevoke(jo); jo.put("admitGuids",user.getAdmitGuid());
} authDeviceRevoke(jo);
}
} }
} }
/** /**
* 用户设备授权识别主体 * 用户设备授权识别主体
*
* @param id * @param id
*/ */
@Override @Override
public void syncUserAuthDevice(Long id) { public void syncUserAuthDevice(Long id) {
ProProjectInfoSubdeptsUsers user = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id); ProProjectInfoSubdeptsUsers user= proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
if (Objects.nonNull(user)) { if(user==null){
AttendanceUbiDevice where = new AttendanceUbiDevice(); return;
where.setProjectId(user.getProjectId()); }
List<AttendanceUbiDevice> devList = attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where); AttendanceUbiDevice where=new AttendanceUbiDevice();
if (devList.size() > 0) { where.setProjectId(user.getProjectId());
for (AttendanceUbiDevice device : devList) { List<AttendanceUbiDevice> devList=attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where);
JSONObject jo = new JSONObject(); for(AttendanceUbiDevice device :devList) {
jo.put("projectId", user.getProjectId()); JSONObject jo=new JSONObject();
jo.put("deviceNo", device.getDeviceNo()); jo.put("projectId",user.getProjectId());
jo.put("admitGuids", user.getAdmitGuid()); jo.put("deviceNo",device.getDeviceNo());
authDevice(jo); jo.put("admitGuids",user.getAdmitGuid());
} authDevice(jo);
}
} }
} }
/** /**
* 私有入场 * 私有入场
*
* @param user * @param user
*/ */
private void syncUserAuthDeviceByInfo(ProProjectInfoSubdeptsUsers user) { private void syncUserAuthDeviceByInfo(ProProjectInfoSubdeptsUsers user) {
AttendanceUbiDevice where = new AttendanceUbiDevice(); AttendanceUbiDevice where=new AttendanceUbiDevice();
where.setProjectId(user.getProjectId()); where.setProjectId(user.getProjectId());
List<AttendanceUbiDevice> devList = attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where); List<AttendanceUbiDevice> devList=attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where);
for (AttendanceUbiDevice device : devList) { for(AttendanceUbiDevice device :devList) {
JSONObject jo = new JSONObject(); JSONObject jo=new JSONObject();
jo.put("projectId", user.getProjectId()); jo.put("projectId",user.getProjectId());
jo.put("deviceNo", device.getDeviceNo()); jo.put("deviceNo",device.getDeviceNo());
jo.put("admitGuids", user.getAdmitGuid()); jo.put("admitGuids",user.getAdmitGuid());
authDevice(jo); authDevice(jo);
} }
} }
private Long deleteDevice(Long id) { private Long deleteDevice(Long id) {
AttendanceUbiDevice device = attendanceUbiDeviceMapper.selectAttendanceUbiDeviceById(id); AttendanceUbiDevice device=attendanceUbiDeviceMapper.selectAttendanceUbiDeviceById(id);
if (device == null) { if(device==null){
return 0l; return 0l;
} }
Long projectId = device.getProjectId(); Long projectId=device.getProjectId();
ProProjectInfoSubdeptsUsers userWhere = new ProProjectInfoSubdeptsUsers(); ProProjectInfoSubdeptsUsers userWhere=new ProProjectInfoSubdeptsUsers();
userWhere.setProjectId(projectId); userWhere.setProjectId(projectId);
List<ProProjectInfoSubdeptsUsers> userList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userWhere); List<ProProjectInfoSubdeptsUsers> userList=proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userWhere);
JSONObject jo = new JSONObject(); JSONObject jo=new JSONObject();
jo.put("projectId", projectId); jo.put("projectId",projectId);
jo.put("deviceNo", device.getDeviceNo()); jo.put("deviceNo",device.getDeviceNo());
jo.put("source", device.getSource()); jo.put("source",device.getSource());
List<String> admitGuidList = new ArrayList<>(); List<String> admitGuidList=new ArrayList<>();
for (ProProjectInfoSubdeptsUsers u : userList) { for(ProProjectInfoSubdeptsUsers u :userList){
String admitGuid = u.getAdmitGuid(); String admitGuid=u.getAdmitGuid();
if (StringUtils.isNotEmpty(admitGuid)) { if(StringUtils.isNotEmpty(admitGuid)){
admitGuidList.add(admitGuid); admitGuidList.add(admitGuid);
} }
} }
for (int i = 0; i < admitGuidList.size(); i += 50) { for(int i=0;i<admitGuidList.size();i+=50){
String admitGuids = ""; String admitGuids="";
for (int j = 0; j < 50 && j + i < admitGuidList.size(); j++) { for(int j=0;j<50 && j+i<admitGuidList.size();j++){
admitGuids += admitGuidList.get((i + j)) + ","; admitGuids+=admitGuidList.get((i+j))+",";
} }
if (admitGuids.length() > 0) { if(admitGuids.length()>0){
admitGuids = admitGuids.substring(0, admitGuids.length() - 1); admitGuids=admitGuids.substring(0,admitGuids.length()-1);
} }
jo.put("admitGuids", admitGuids); jo.put("admitGuids",admitGuids);
authDeviceRevoke(jo); authDeviceRevoke(jo);
} }
@ -474,20 +461,20 @@ public class UniServiceImpl implements IUniService {
} }
@Override @Override
public Long syncUniDevice(Long deviceId, Long projectId) { public Long syncUniDevice(Long deviceId,Long projectId){
AttendanceUbiDevice device = attendanceUbiDeviceMapper.selectAttendanceUbiDeviceById(deviceId); AttendanceUbiDevice device=attendanceUbiDeviceMapper.selectAttendanceUbiDeviceById(deviceId);
if (device != null) { if(device!=null){
JSONObject jo = new JSONObject(); JSONObject jo=new JSONObject();
jo.put("projectId", projectId); jo.put("projectId",projectId);
jo.put("name", device.getName()); jo.put("name",device.getName());
jo.put("tag", device.getTag()); jo.put("tag",device.getTag());
jo.put("source", device.getSource()); jo.put("source",device.getSource());
jo.put("sceneGuid", ""); jo.put("sceneGuid","");
jo.put("deviceNo", device.getDeviceNo()); jo.put("deviceNo",device.getDeviceNo());
jo.put("addition", "{'recType':'1'}"); jo.put("addition","{'recType':'1'}");
String ret = deviceCreate(jo); String ret= deviceCreate(jo);
if ("success".equals(ret) || "device is occupied".equals(ret)) { if("success".equals(ret)||"device is occupied".equals(ret)){
JSONObject joDetail = deviceDetail(jo); JSONObject joDetail=deviceDetail(jo);
device.setHasRegister(1l); device.setHasRegister(1l);
device.setLastActiveTime(new Date()); device.setLastActiveTime(new Date());
device.setDeviceModel(joDetail.getString("deviceModel")); device.setDeviceModel(joDetail.getString("deviceModel"));
@ -497,7 +484,7 @@ public class UniServiceImpl implements IUniService {
device.setAddition(joDetail.getString("addition")); device.setAddition(joDetail.getString("addition"));
device.setRecType(joDetail.getLong("recType")); device.setRecType(joDetail.getLong("recType"));
attendanceUbiDeviceMapper.updateAttendanceUbiDevice(device); attendanceUbiDeviceMapper.updateAttendanceUbiDevice(device);
return 1l; return 1l;
} }
} }
return 0l; return 0l;
@ -505,89 +492,83 @@ public class UniServiceImpl implements IUniService {
/** /**
* 人員考勤入场 * 人員考勤入场
*
* @param puser * @param puser
* @param authFlag * @param authFlag
*/ */
@Override @Override
public void syncUniUser(ProProjectInfoSubdeptsUsers puser, boolean authFlag) { public void syncUniUser(ProProjectInfoSubdeptsUsers puser, boolean authFlag) {
AttendanceUbiDevice where = new AttendanceUbiDevice(); JSONObject jo;
where.setProjectId(puser.getProjectId()); if(StringUtils.isNotEmpty(puser.getUserInfos())){
List<AttendanceUbiDevice> devList = attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where); jo = JSON.parseObject(puser.getUserInfos());
if (devList.size() > 0) { }else{
JSONObject jo; jo = new JSONObject();
if (StringUtils.isNotEmpty(puser.getUserInfos())) { }
jo = JSON.parseObject(puser.getUserInfos()); Long projectId=puser.getProjectId();
} else { String admitGuid=puser.getAdmitGuid();
jo = new JSONObject(); String faceGuid=puser.getFaceGuid();
} JSONObject userJo=new JSONObject();
Long projectId = puser.getProjectId(); userJo.put("projectId",projectId);
String admitGuid = puser.getAdmitGuid(); userJo.put("name",puser.getUserName());
String faceGuid = puser.getFaceGuid(); userJo.put("phone",puser.getUserPhone());
JSONObject userJo = new JSONObject(); userJo.put("tag",puser.getUserName());
userJo.put("projectId", projectId); userJo.put("cardNo",projectId);
userJo.put("name", puser.getUserName()); userJo.put("idCardNo",puser.getCardCode());
userJo.put("phone", puser.getUserPhone()); userJo.put("password","");
userJo.put("tag", puser.getUserName()); userJo.put("addition","");
userJo.put("cardNo", projectId); boolean hasUpdate=false;
userJo.put("idCardNo", puser.getCardCode()); if(StringUtils.isEmpty(admitGuid)){
userJo.put("password", ""); //未注册人员
userJo.put("addition", ""); admitGuid=admitCreate(userJo);
boolean hasUpdate = false;
if (StringUtils.isEmpty(admitGuid)) {
//未注册人员
admitGuid = admitCreate(userJo);
puser.setAdmitGuid(admitGuid);
hasUpdate = true;
} else {
//已注册
userJo.put("admitGuid", admitGuid);
String upMsg = admitUpdate(userJo);
if ("admit not exist".equals(upMsg)) {
userJo.remove("admitGuid");
userJo.put("projectId", projectId);
admitGuid = admitCreate(userJo);
puser.setAdmitGuid(admitGuid);
hasUpdate = true;
}
}
JSONObject faceJo = new JSONObject();
faceJo.put("projectId", projectId);
faceJo.put("base64", "");
faceJo.put("admitGuid", admitGuid);
puser.setAdmitGuid(admitGuid); puser.setAdmitGuid(admitGuid);
String url = puser.getUserPicture(); hasUpdate=true;
if (!StringUtils.isBlank(url) && !url.startsWith("http")) { }else{
url = "http://62.234.3.186" + url; //已注册
} userJo.put("admitGuid",admitGuid);
faceJo.put("url", url); String upMsg= admitUpdate(userJo);
faceJo.put("faceTag", ""); if("admit not exist".equals(upMsg)){
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest(); userJo.remove("admitGuid");
if (StringUtils.isNotEmpty(faceGuid)) { userJo.put("projectId",projectId);
JSONObject faceDel = new JSONObject(); admitGuid=admitCreate(userJo);
faceDel.put("projectId", projectId); puser.setAdmitGuid(admitGuid);
faceDel.put("admitGuid", admitGuid); hasUpdate=true;
faceDel.put("faceGuid", faceGuid);
faceDelete(faceDel);
} }
}
JSONObject faceJo=new JSONObject();
faceJo.put("projectId",projectId);
faceJo.put("base64","");
faceJo.put("admitGuid",admitGuid);
puser.setAdmitGuid(admitGuid);
String url=puser.getUserPicture();
if(!StringUtils.isBlank(url) && !url.startsWith("http")){
url="http://62.234.3.186"+url;
}
faceJo.put("url",url);
faceJo.put("faceTag","");
HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest();
if(StringUtils.isNotEmpty(faceGuid)){
JSONObject faceDel=new JSONObject();
faceDel.put("projectId",projectId);
faceDel.put("admitGuid",admitGuid);
faceDel.put("faceGuid",faceGuid);
faceDelete(faceDel);
}
//注册图像 //注册图像
JSONObject faceRes = faceRegister(faceJo); JSONObject faceRes = faceRegister(faceJo);
if (faceRes != null) { if(faceRes!=null) {
jo.put("uniFaceInfo", faceRes.toJSONString()); jo.put("uniFaceInfo", faceRes.toJSONString());
puser.setFaceGuid(faceRes.getString("faceGuid")); puser.setFaceGuid(faceRes.getString("faceGuid"));
hasUpdate = true; hasUpdate=true;
} }
puser.setUserInfos(jo.toJSONString()); puser.setUserInfos(jo.toJSONString());
if (hasUpdate) { if(hasUpdate){
proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(puser); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(puser);
} }
// 人员入场 // 人员入场
if (authFlag) { if(authFlag){
syncUserAuthDeviceByInfo(puser); syncUserAuthDeviceByInfo(puser);
}
} }
} }

36
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
View File

@ -523,7 +523,7 @@ public class SysUserServiceImpl implements ISysUserService
public Long registerUser(SysUser user) throws ServiceException public Long registerUser(SysUser user) throws ServiceException
{ {
SysUser sysUser = userMapper.selectByPhone(user.getPhonenumber()); SysUser sysUser = userMapper.selectByPhone(user.getPhonenumber());
String userType = user.getUserType(); String userPost = user.getUserType();
if(Objects.nonNull(sysUser)){ if(Objects.nonNull(sysUser)){
user.setUserId(sysUser.getUserId()); user.setUserId(sysUser.getUserId());
sysUser.setUserName(user.getUserName()); sysUser.setUserName(user.getUserName());
@ -540,7 +540,7 @@ public class SysUserServiceImpl implements ISysUserService
user.setCreateTime(user.getUpdateTime()); user.setCreateTime(user.getUpdateTime());
user.setWorkType(user.getWorkType()); user.setWorkType(user.getWorkType());
if(StringUtils.isEmpty(user.getPassword())){ if(StringUtils.isEmpty(user.getPassword())){
user.setPassword(SecurityUtils.encryptPassword(user.getPhonenumber())); user.setPassword(SecurityUtils.encryptPassword(user.getPhonenumber()+"@"+user.getUserType()));
} }
userMapper.insertUser(user); userMapper.insertUser(user);
try { try {
@ -587,14 +587,14 @@ public class SysUserServiceImpl implements ISysUserService
} }
} }
Long userId = user.getUserId(); Long userId = user.getUserId();
if(Objects.nonNull(userType) && Objects.nonNull(user.getDeptId())){ if(Objects.nonNull(userPost) && Objects.nonNull(user.getDeptId())){
// 删除用户与角色关联 // 删除用户与角色关联
List<SysUserRole> sysUserRoleList = new ArrayList<>(); List<SysUserRole> sysUserRoleList = new ArrayList<>();
SysUserRole userRole = new SysUserRole(); SysUserRole userRole = new SysUserRole();
userRole.setUserId(userId); userRole.setUserId(userId);
userRole.setDeptId(user.getDeptId()); userRole.setDeptId(user.getDeptId());
userRoleMapper.deleteUserRoleByUserRole(userRole); userRoleMapper.deleteUserRoleByUserRole(userRole);
if(Objects.equals(userType, UserTypeEnums.FBWTDL.getCode())){ if(Objects.equals(userPost, UserTypeEnums.FBWTDL.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getDeptId()); List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getDeptId());
if(StringUtils.isEmpty(list)){ if(StringUtils.isEmpty(list)){
//新增单位角色... //新增单位角色...
@ -605,7 +605,7 @@ public class SysUserServiceImpl implements ISysUserService
} }
sysUserRoleList.add(userRole); sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList); userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(userType, UserTypeEnums.FBXMJL.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.FBXMJL.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getDeptId()); List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getDeptId());
if(StringUtils.isEmpty(list)){ if(StringUtils.isEmpty(list)){
//新增单位角色... //新增单位角色...
@ -616,7 +616,7 @@ public class SysUserServiceImpl implements ISysUserService
} }
sysUserRoleList.add(userRole); sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList); userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(userType, UserTypeEnums.FBBZZZ.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.FBBZZZ.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getDeptId()); List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getDeptId());
if(StringUtils.isEmpty(list)){ if(StringUtils.isEmpty(list)){
//新增单位角色... //新增单位角色...
@ -627,7 +627,7 @@ public class SysUserServiceImpl implements ISysUserService
} }
sysUserRoleList.add(userRole); sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList); userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(userType, UserTypeEnums.FBLWRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.FBLWRY.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBLWRY.getKeys()+"_"+user.getDeptId()); List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBLWRY.getKeys()+"_"+user.getDeptId());
if(StringUtils.isEmpty(list)){ if(StringUtils.isEmpty(list)){
//新增单位角色... //新增单位角色...
@ -638,7 +638,7 @@ public class SysUserServiceImpl implements ISysUserService
} }
sysUserRoleList.add(userRole); sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList); userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(userType, UserTypeEnums.FBCLRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.FBCLRY.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBCLRY.getKeys()+"_"+user.getDeptId()); List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBCLRY.getKeys()+"_"+user.getDeptId());
if(StringUtils.isEmpty(list)){ if(StringUtils.isEmpty(list)){
//新增单位角色... //新增单位角色...
@ -649,7 +649,7 @@ public class SysUserServiceImpl implements ISysUserService
} }
sysUserRoleList.add(userRole); sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList); userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(userType, UserTypeEnums.FBAQRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.FBAQRY.getCode())){
List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBAQRY.getKeys()+"_"+user.getDeptId()); List<SysRole> list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.FBAQRY.getKeys()+"_"+user.getDeptId());
if(StringUtils.isEmpty(list)){ if(StringUtils.isEmpty(list)){
//新增单位角色... //新增单位角色...
@ -660,23 +660,23 @@ public class SysUserServiceImpl implements ISysUserService
} }
sysUserRoleList.add(userRole); sysUserRoleList.add(userRole);
userRoleMapper.batchUserRole(sysUserRoleList); userRoleMapper.batchUserRole(sysUserRoleList);
}else if(Objects.equals(userType, UserTypeEnums.JSDWRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.JSDWRY.getCode())){
}else if(Objects.equals(userType, UserTypeEnums.JLDWRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.JLDWRY.getCode())){
}else if(Objects.equals(userType, UserTypeEnums.SGDWRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.SGDWRY.getCode())){
}else if(Objects.equals(userType, UserTypeEnums.CLFBRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.CLFBRY.getCode())){
}else if(Objects.equals(userType, UserTypeEnums.HQFBRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.HQFBRY.getCode())){
}else if(Objects.equals(userType, UserTypeEnums.TSSBRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.TSSBRY.getCode())){
}else if(Objects.equals(userType, UserTypeEnums.KTDWRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.KTDWRY.getCode())){
}else if(Objects.equals(userType, UserTypeEnums.SJDWRY.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.SJDWRY.getCode())){
}else if(Objects.equals(userType, UserTypeEnums.OTHERS.getCode())){ }else if(Objects.equals(userPost, UserTypeEnums.OTHERS.getCode())){
} }
} }