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);
redisService.setCacheObject("doSyncProContractor.contractorId::"+json.getString("contractorId"),quartzProSubdepts,2L,TimeUnit.HOURS);
}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);
}
}else{
@ -331,7 +328,6 @@ public class AttendanceJgwTask {
redisService.setCacheObject("doSyncDirectlyUnderGroup.teamLeaderId::"+json.getString("leaderId"),quartzProSubdeptsGroup,2L,TimeUnit.HOURS);
}else{
QuartzProSubdeptsGroup quartzProSubdeptsGroup = list.get(0);
quartzProSubdeptsGroup.setSource(code.toUpperCase()+"::"+json.getString("id"));
quartzProSubdeptsGroup.setIsDel(Convert.toLong(json.getString("deleteFlag"),0L));
quartzProSubdeptsGroup.setUpdateBy("JGW-TASK");
quartzProSubdeptsGroup.setUpdateTime(DateUtils.getNowDate());
@ -656,7 +652,6 @@ public class AttendanceJgwTask {
}else{
QuartzProSubdeptsUsers quartzProSubdeptsUsers = list.get(0);
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.setUpdateTime(DateUtils.getNowDate());
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="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="source != null">source = #{source},</if>
</trim>
where id = #{id}
</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="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="source != null">source = #{source},</if>
</trim>
where id = #{id}
</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="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="source != null">source = #{source},</if>
</trim>
where id = #{id}
</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);
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.enums.*;
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.StringUtils;
import com.yanzhu.common.security.utils.SecurityUtils;
@ -451,7 +450,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
userQuery.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId());
List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
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){
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.enums.*;
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.StringUtils;
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.ProProjectInfoSubdeptsGroup;
import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers;
import com.yanzhu.manage.mapper.AttendanceUbiDeviceMapper;
import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsGroupMapper;
import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsMapper;
import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper;
@ -57,9 +55,6 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
@Autowired
private RemoteUserService remoteUserService;
@Autowired
private AttendanceUbiDeviceMapper attendanceUbiDeviceMapper;
@Autowired
private ProProjectInfoSubdeptsMapper proProjectInfoSubdeptsMapper;
@ -585,7 +580,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
proProjectInfoSubdeptsGroupMapper.updateUseStatusByParams(proProjectInfoSubdepts.getId());
proProjectInfoSubdeptsUsersMapper.updateUseStatusByParams(proProjectInfoSubdepts.getId(),null);
if("SYSTEM".equals(Convert.toStr(proProjectInfoSubdepts.getSource(),"SYSTEM")) && users.size()>0){
if(users.size()>0){
for(ProProjectInfoSubdeptsUsers user:users){
uniService.syncUserRevoke(user.getId());
}

33
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;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
@ -29,9 +30,6 @@ import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.concurrent.TimeUnit;
/**
* 闸机服务
*/
@Service
public class UniServiceImpl implements IUniService{
@ -46,7 +44,6 @@ public class UniServiceImpl implements IUniService {
@Autowired
private ProProjectInfoSubdeptsUsersMapper proProjectInfoSubdeptsUsersMapper;
private void clearAuthCache(long projectId){
String cacheKey=CacheConstants.UNI_AUTH+projectId;
redisService.deleteObject(cacheKey);
@ -322,11 +319,9 @@ public class UniServiceImpl implements IUniService {
}
return jo.getString("msg");
}
@Override
public Long syncUniDeviceUser(Long deviceId,Long projectId){
AttendanceUbiDevice device=attendanceUbiDeviceMapper.selectAttendanceUbiDeviceById(deviceId);
if (Objects.nonNull(device)) {
ProProjectInfoSubdeptsUsers userWhere=new ProProjectInfoSubdeptsUsers();
userWhere.setProjectId(projectId);
List<ProProjectInfoSubdeptsUsers> userList=proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userWhere);
@ -353,12 +348,9 @@ public class UniServiceImpl implements IUniService {
}
return 1l;
}
return 0L;
}
/**
* 同步删除设备 1.删除设备人员关系 2.删除设备
*
* @param ids
* @return
*/
@ -373,17 +365,17 @@ public class UniServiceImpl implements IUniService {
/**
* 用户设备销权识别主体
*
* @param id
*/
@Override
public void syncUserRevoke(Long id) {
ProProjectInfoSubdeptsUsers user= proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
if (Objects.nonNull(user)) {
if(user==null){
return;
}
AttendanceUbiDevice where=new AttendanceUbiDevice();
where.setProjectId(user.getProjectId());
List<AttendanceUbiDevice> devList=attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where);
if (devList.size() > 0) {
for(AttendanceUbiDevice device :devList){
JSONObject jo=new JSONObject();
jo.put("projectId",user.getProjectId());
@ -392,22 +384,20 @@ public class UniServiceImpl implements IUniService {
authDeviceRevoke(jo);
}
}
}
}
/**
* 用户设备授权识别主体
*
* @param id
*/
@Override
public void syncUserAuthDevice(Long id) {
ProProjectInfoSubdeptsUsers user= proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
if (Objects.nonNull(user)) {
if(user==null){
return;
}
AttendanceUbiDevice where=new AttendanceUbiDevice();
where.setProjectId(user.getProjectId());
List<AttendanceUbiDevice> devList=attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where);
if (devList.size() > 0) {
for(AttendanceUbiDevice device :devList) {
JSONObject jo=new JSONObject();
jo.put("projectId",user.getProjectId());
@ -416,12 +406,9 @@ public class UniServiceImpl implements IUniService {
authDevice(jo);
}
}
}
}
/**
* 私有入场
*
* @param user
*/
private void syncUserAuthDeviceByInfo(ProProjectInfoSubdeptsUsers user) {
@ -505,16 +492,11 @@ public class UniServiceImpl implements IUniService {
/**
* 人員考勤入场
*
* @param puser
* @param authFlag
*/
@Override
public void syncUniUser(ProProjectInfoSubdeptsUsers puser, boolean authFlag) {
AttendanceUbiDevice where = new AttendanceUbiDevice();
where.setProjectId(puser.getProjectId());
List<AttendanceUbiDevice> devList = attendanceUbiDeviceMapper.selectAttendanceUbiDeviceList(where);
if (devList.size() > 0) {
JSONObject jo;
if(StringUtils.isNotEmpty(puser.getUserInfos())){
jo = JSON.parseObject(puser.getUserInfos());
@ -589,6 +571,5 @@ public class UniServiceImpl implements IUniService {
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
{
SysUser sysUser = userMapper.selectByPhone(user.getPhonenumber());
String userType = user.getUserType();
String userPost = user.getUserType();
if(Objects.nonNull(sysUser)){
user.setUserId(sysUser.getUserId());
sysUser.setUserName(user.getUserName());
@ -540,7 +540,7 @@ public class SysUserServiceImpl implements ISysUserService
user.setCreateTime(user.getUpdateTime());
user.setWorkType(user.getWorkType());
if(StringUtils.isEmpty(user.getPassword())){
user.setPassword(SecurityUtils.encryptPassword(user.getPhonenumber()));
user.setPassword(SecurityUtils.encryptPassword(user.getPhonenumber()+"@"+user.getUserType()));
}
userMapper.insertUser(user);
try {
@ -587,14 +587,14 @@ public class SysUserServiceImpl implements ISysUserService
}
}
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<>();
SysUserRole userRole = new SysUserRole();
userRole.setUserId(userId);
userRole.setDeptId(user.getDeptId());
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());
if(StringUtils.isEmpty(list)){
//新增单位角色...
@ -605,7 +605,7 @@ public class SysUserServiceImpl implements ISysUserService
}
sysUserRoleList.add(userRole);
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());
if(StringUtils.isEmpty(list)){
//新增单位角色...
@ -616,7 +616,7 @@ public class SysUserServiceImpl implements ISysUserService
}
sysUserRoleList.add(userRole);
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());
if(StringUtils.isEmpty(list)){
//新增单位角色...
@ -627,7 +627,7 @@ public class SysUserServiceImpl implements ISysUserService
}
sysUserRoleList.add(userRole);
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());
if(StringUtils.isEmpty(list)){
//新增单位角色...
@ -638,7 +638,7 @@ public class SysUserServiceImpl implements ISysUserService
}
sysUserRoleList.add(userRole);
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());
if(StringUtils.isEmpty(list)){
//新增单位角色...
@ -649,7 +649,7 @@ public class SysUserServiceImpl implements ISysUserService
}
sysUserRoleList.add(userRole);
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());
if(StringUtils.isEmpty(list)){
//新增单位角色...
@ -660,23 +660,23 @@ public class SysUserServiceImpl implements ISysUserService
}
sysUserRoleList.add(userRole);
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())){
}
}