diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java index ea54754d..363ee891 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java @@ -92,12 +92,16 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity @Excel(name = "删除标识") private Long isDel; - /** 委托人正面照片 */ + /** 班组长正面照片 */ private String groupLeaderCardImgPos; - /** 委托人反面照片 */ + /** 班组长反面照片 */ private String groupLeaderCardImgInv; - /** 委托人半身照片 */ + /** 班组长半身照片 */ private String groupLeaderUserPicture; + /** 班组长半身照片 */ + private String groupLeaderSubPowerPath; + /** 班组长学历信息 */ + private String groupLeaderDegreeGrade; public void setId(Long id) { @@ -302,6 +306,22 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity this.groupLeaderUserPicture = groupLeaderUserPicture; } + public String getGroupLeaderSubPowerPath() { + return groupLeaderSubPowerPath; + } + + public void setGroupLeaderSubPowerPath(String groupLeaderSubPowerPath) { + this.groupLeaderSubPowerPath = groupLeaderSubPowerPath; + } + + public String getGroupLeaderDegreeGrade() { + return groupLeaderDegreeGrade; + } + + public void setGroupLeaderDegreeGrade(String groupLeaderDegreeGrade) { + this.groupLeaderDegreeGrade = groupLeaderDegreeGrade; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java index f0ae7409..a5056338 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoController.java @@ -92,6 +92,18 @@ public class ProProjectInfoController extends BaseController } } + /** + * 重置项目二维码 + * @param proId 项目主键 + * @return + */ + @RequiresPermissions("manage:proProjectInfo:edit") + @GetMapping("/resetProQrCode/{proId}") + public AjaxResult resetProQrCode(@PathVariable("proId") Long proId) + { + return toAjax(proProjectInfoService.resetProQrCode(proId)); + } + /** * 新增项目信息 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java index 70ad2477..b61289cb 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoService.java @@ -43,6 +43,13 @@ public interface IProProjectInfoService */ public int updateProProjectInfo(ProProjectInfo proProjectInfo); + /** + * 重置项目二维码 + * @param id 项目主键 + * @return + */ + public int resetProQrCode(Long id); + /** * 批量删除项目信息 * diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java index 57996b2b..17fffccc 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java @@ -23,7 +23,6 @@ import com.yanzhu.manage.utils.WxQrCodeUtils; import com.yanzhu.system.api.RemoteDeptService; import com.yanzhu.system.api.domain.SysDept; import com.yanzhu.system.api.domain.SysUser; -import me.chanjar.weixin.mp.api.WxMpService; import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; @@ -177,16 +176,20 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService @Override public int updateProProjectInfo(ProProjectInfo proProjectInfo) { - try { - String accessToken = wxMaService.getAccessToken(); - String imgPath = profileConfig.getPath()+"/"+System.currentTimeMillis()+".png"; - log.info("accessToken...{}",accessToken); - String scene = "QRPID="+proProjectInfo.getId()+"&signType=1"; - WxQrCodeUtils.generateQrCode(imgPath, "pages/project_qr/index", scene, accessToken); - // TODO:生成二维码 - proProjectInfo.setProjectQrCode(imgPath); - }catch (Exception e){ - log.error(e.getMessage()); + if(StringUtils.isEmpty(proProjectInfo.getProjectQrCode())){ + try { + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + log.info("accessToken...{}",accessToken); + // 生成二维码 + String scene = "QRPID="+proProjectInfo.getId()+"&signType=1"; + WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", scene, accessToken); + proProjectInfo.setProjectQrCode(profilePath); + }catch (Exception e){ + log.error(e.getMessage()); + } } proProjectInfo.setUpdateTime(DateUtils.getNowDate()); proProjectInfo.setUpdateBy(SecurityContextHolder.getUserName()); @@ -228,6 +231,31 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService return res; } + /** + * 重置项目二维码 + * @param id 项目主键 + * @return + */ + @Override + public int resetProQrCode(Long id){ + ProProjectInfo proProjectInfo = proProjectInfoMapper.selectProProjectInfoById(id); + int res = 0; + try { + // 生成二维码 + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + log.info("accessToken...{}",accessToken); + WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=1&QRPID="+proProjectInfo.getId(), accessToken); + proProjectInfo.setProjectQrCode(profilePath); + res = proProjectInfoMapper.updateProProjectInfo(proProjectInfo); + }catch (Exception e){ + log.error(e.getMessage()); + } + return res; + } + /** * 批量删除项目信息 * diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java index a028ff8e..8ce443ae 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java @@ -1,26 +1,34 @@ package com.yanzhu.manage.service.impl; -import java.util.List; -import java.util.Objects; - +import cn.binarywang.wx.miniapp.api.WxMaService; import com.yanzhu.common.core.constant.SecurityConstants; -import com.yanzhu.common.core.domain.R; -import com.yanzhu.common.core.enums.CardTypeEnums; -import com.yanzhu.common.core.enums.UserTypeEnums; +import com.yanzhu.common.core.enums.*; +import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.StringUtils; import com.yanzhu.common.security.utils.SecurityUtils; +import com.yanzhu.manage.config.ProfileConfig; import com.yanzhu.manage.domain.ProProjectInfoSubdepts; +import com.yanzhu.manage.domain.ProProjectInfoSubdeptsGroup; +import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; +import com.yanzhu.manage.enums.UserPostEnums; +import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsGroupMapper; import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsMapper; +import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper; +import com.yanzhu.manage.service.IProProjectInfoSubdeptsGroupService; +import com.yanzhu.manage.service.IUniService; +import com.yanzhu.manage.utils.WxQrCodeUtils; import com.yanzhu.system.api.RemoteUserService; import com.yanzhu.system.api.domain.SysUser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsGroupMapper; -import com.yanzhu.manage.domain.ProProjectInfoSubdeptsGroup; -import com.yanzhu.manage.service.IProProjectInfoSubdeptsGroupService; import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Objects; + /** * 分包单位班组Service业务层处理 * @@ -31,6 +39,12 @@ import org.springframework.transaction.annotation.Transactional; public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSubdeptsGroupService { + @Autowired + private IUniService uniService; + + @Autowired + private WxMaService wxMaService; + @Autowired private RemoteUserService remoteUserService; @@ -40,6 +54,11 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu @Autowired private ProProjectInfoSubdeptsGroupMapper proProjectInfoSubdeptsGroupMapper; + @Autowired + private ProProjectInfoSubdeptsUsersMapper proProjectInfoSubdeptsUsersMapper; + + private static final Logger log = LoggerFactory.getLogger(ProProjectInfoSubdeptsGroupServiceImpl.class); + /** * 查询分包单位班组 * @@ -83,13 +102,14 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsGroup.setSubDeptCode(info.getSubDeptCode()); proProjectInfoSubdeptsGroup.setSubDeptType(info.getSubDeptType()); } - // 单位委托人信息 + // 班组组长信息 if(StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ SysUser sysUser = new SysUser(); sysUser.setUserName(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); sysUser.setNickName(proProjectInfoSubdeptsGroup.getGroupLeaderName()); sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode()); sysUser.setCardType(CardTypeEnums.SFZ.getCode()); + sysUser.setPhonenumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); sysUser.setCardCode(proProjectInfoSubdeptsGroup.getGroupLeaderCode()); sysUser.setUserPicture(proProjectInfoSubdeptsGroup.getGroupLeaderUserPicture()); sysUser.setCardImgPos(proProjectInfoSubdeptsGroup.getGroupLeaderCardImgPos()); @@ -99,17 +119,63 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu sysUser.setCreateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdeptsGroup.getSubDeptName()); sysUser.setActiveProjectId(proProjectInfoSubdeptsGroup.getProjectId()); + Long userId = sysUser.getUserId(); try { - remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); + userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); }catch (Exception e){ // 已注册账号！！忽略异常... } + if(Objects.nonNull(userId)){ + proProjectInfoSubdeptsGroup.setCreateBy(SecurityUtils.getUsername()); + proProjectInfoSubdeptsGroup.setCreateTime(DateUtils.getNowDate()); + int res = proProjectInfoSubdeptsGroupMapper.insertProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); - // TODO:实名制接入 + // 系统添加的人员默认增加入场信息 + uniService.syncUniUser(userId,info.getId()); + + if(res>0){ + // 保存单位人员信息 + ProProjectInfoSubdeptsUsers subdeptsUser = new ProProjectInfoSubdeptsUsers(); + subdeptsUser.setComId(info.getComId()); + subdeptsUser.setProjectId(info.getId()); + subdeptsUser.setSubDeptId(proProjectInfoSubdeptsGroup.getSubDeptId()); + subdeptsUser.setSubDeptName(proProjectInfoSubdeptsGroup.getSubDeptName()); + subdeptsUser.setSubDeptType(proProjectInfoSubdeptsGroup.getSubDeptType()); + subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdeptsGroup.getGroupLeaderSubPowerPath()); + subdeptsUser.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId()); + subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); + subdeptsUser.setUserId(userId); + subdeptsUser.setUserPost(UserPostEnums.BZZ.getCode()); + subdeptsUser.setCraftType(proProjectInfoSubdeptsGroup.getCraftType()); + subdeptsUser.setCraftPost(proProjectInfoSubdeptsGroup.getCraftPost()); + subdeptsUser.setDegreeGrade(proProjectInfoSubdeptsGroup.getGroupLeaderDegreeGrade()); + subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr()); + subdeptsUser.setSubStep(1L); + subdeptsUser.setUseStatus(UseStateEnums.IN.getCode()); + subdeptsUser.setCreateBy(SecurityUtils.getUsername()); + subdeptsUser.setApproveStatus(ApproveStatus.passed.getCode()); + subdeptsUser.setCreateTime(DateUtils.getNowDate()); + res = proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(subdeptsUser); + if(res>0){ + try { + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + log.info("accessToken...{}",accessToken); + // 生成二维码 + WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=4&QRPID="+info.getId()+"&PARID="+subdeptsUser.getId(), accessToken); + subdeptsUser.setQrCode(profilePath); + res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); + }catch (Exception e){ + log.error(e.getMessage()); + } + } + } + return res; + } } - proProjectInfoSubdeptsGroup.setCreateBy(SecurityUtils.getUsername()); - proProjectInfoSubdeptsGroup.setCreateTime(DateUtils.getNowDate()); - return proProjectInfoSubdeptsGroupMapper.insertProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); + return 0; } /** @@ -122,13 +188,14 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu @Transactional public int updateProProjectInfoSubdeptsGroup(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup) { - // 单位委托人信息 + // 班组组长信息 if(StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ SysUser sysUser = new SysUser(); sysUser.setUserName(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); sysUser.setNickName(proProjectInfoSubdeptsGroup.getGroupLeaderName()); sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode()); sysUser.setCardType(CardTypeEnums.SFZ.getCode()); + sysUser.setPhonenumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); sysUser.setCardCode(proProjectInfoSubdeptsGroup.getGroupLeaderCode()); sysUser.setUserPicture(proProjectInfoSubdeptsGroup.getGroupLeaderUserPicture()); sysUser.setCardImgPos(proProjectInfoSubdeptsGroup.getGroupLeaderCardImgPos()); @@ -138,17 +205,115 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu sysUser.setCreateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdeptsGroup.getSubDeptName()); sysUser.setActiveProjectId(proProjectInfoSubdeptsGroup.getProjectId()); + Long userId = sysUser.getUserId(); try { - remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); + userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); }catch (Exception e){ // 已注册账号！！忽略异常... } - // TODO:实名制接入 + if(Objects.nonNull(userId)){ + proProjectInfoSubdeptsGroup.setUpdateBy(SecurityUtils.getUsername()); + proProjectInfoSubdeptsGroup.setUpdateTime(DateUtils.getNowDate()); + int res = proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); + + // 判断班组组长是否变更 + ProProjectInfoSubdeptsGroup entity = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupById(proProjectInfoSubdeptsGroup.getId()); + if(Objects.equals(entity.getGroupLeaderPhone(),proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ + ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); + query.setProjectId(proProjectInfoSubdeptsGroup.getProjectId()); + query.setPhoneNumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); + List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); + if (StringUtils.isEmpty(dataList)) { + throw new ServiceException("用户信息异常..."); + } + ProProjectInfoSubdeptsUsers subdeptsUser = dataList.get(0); + subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdeptsGroup.getGroupLeaderSubPowerPath()); + subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); + subdeptsUser.setUserPost(UserPostEnums.BZZ.getCode()); + subdeptsUser.setCraftType(proProjectInfoSubdeptsGroup.getCraftType()); + subdeptsUser.setCraftPost(proProjectInfoSubdeptsGroup.getCraftPost()); + subdeptsUser.setDegreeGrade(proProjectInfoSubdeptsGroup.getGroupLeaderDegreeGrade()); + subdeptsUser.setUpdateBy(SecurityUtils.getUsername()); + subdeptsUser.setUpdateTime(DateUtils.getNowDate()); + proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); + }else{ + // 判断当前用户是否已有账号 + ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); + query.setProjectId(proProjectInfoSubdeptsGroup.getProjectId()); + query.setPhoneNumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); + List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); + if (StringUtils.isEmpty(dataList)) { + if(res>0){ + // 保存单位人员信息 + ProProjectInfoSubdeptsUsers subdeptsUser = new ProProjectInfoSubdeptsUsers(); + subdeptsUser.setComId(proProjectInfoSubdeptsGroup.getComId()); + subdeptsUser.setProjectId(proProjectInfoSubdeptsGroup.getProjectId()); + subdeptsUser.setSubDeptId(proProjectInfoSubdeptsGroup.getSubDeptId()); + subdeptsUser.setSubDeptName(proProjectInfoSubdeptsGroup.getSubDeptName()); + subdeptsUser.setSubDeptType(proProjectInfoSubdeptsGroup.getSubDeptType()); + subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdeptsGroup.getGroupLeaderSubPowerPath()); + subdeptsUser.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId()); + subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); + subdeptsUser.setUserId(userId); + subdeptsUser.setUserPost(UserPostEnums.BZZ.getCode()); + subdeptsUser.setCraftType(proProjectInfoSubdeptsGroup.getCraftType()); + subdeptsUser.setCraftPost(proProjectInfoSubdeptsGroup.getCraftPost()); + subdeptsUser.setDegreeGrade(proProjectInfoSubdeptsGroup.getGroupLeaderDegreeGrade()); + subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr()); + subdeptsUser.setSubStep(1L); + subdeptsUser.setCreateBy(SecurityUtils.getUsername()); + subdeptsUser.setApproveStatus(ApproveStatus.passed.getCode()); + subdeptsUser.setCreateTime(DateUtils.getNowDate()); + res = proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(subdeptsUser); + if(res>0){ + try { + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + log.info("accessToken...{}",accessToken); + // 生成二维码 + WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=4&QRPID="+subdeptsUser.getProjectName()+"&PARID="+subdeptsUser.getId(), accessToken); + subdeptsUser.setQrCode(profilePath); + res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); + }catch (Exception e){ + log.error(e.getMessage()); + } + } + } + }else{ + ProProjectInfoSubdeptsUsers subdeptsUser = dataList.get(0); + subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdeptsGroup.getGroupLeaderSubPowerPath()); + subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); + subdeptsUser.setUserPost(UserPostEnums.BZZ.getCode()); + subdeptsUser.setCraftType(proProjectInfoSubdeptsGroup.getCraftType()); + subdeptsUser.setCraftPost(proProjectInfoSubdeptsGroup.getCraftPost()); + subdeptsUser.setDegreeGrade(proProjectInfoSubdeptsGroup.getGroupLeaderDegreeGrade()); + subdeptsUser.setUpdateBy(SecurityUtils.getUsername()); + subdeptsUser.setUpdateTime(DateUtils.getNowDate()); + subdeptsUser.setUseStatus(UseStateEnums.IN.getCode()); + try { + String accessToken = wxMaService.getAccessToken(); + String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; + String savePath = ProfileConfig.profilePath+"/"+filePath; + String profilePath = ProfileConfig.profile+"/"+filePath; + log.info("accessToken...{}",accessToken); + // 生成二维码 + WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=4&QRPID="+subdeptsUser.getProjectId()+"&PARID="+subdeptsUser.getId(), accessToken); + subdeptsUser.setQrCode(profilePath); + res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); + }catch (Exception e){ + log.error(e.getMessage()); + } + } + } + // 系统添加的人员默认增加入场信息 + uniService.syncUniUser(userId,proProjectInfoSubdeptsGroup.getProjectId()); + return res; + } } - proProjectInfoSubdeptsGroup.setUpdateBy(SecurityUtils.getUsername()); - proProjectInfoSubdeptsGroup.setUpdateTime(DateUtils.getNowDate()); - return proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); + return 0; } /** diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java index d418925f..aeabeaf1 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java @@ -1,5 +1,6 @@ package com.yanzhu.manage.service.impl; +import cn.binarywang.wx.miniapp.api.WxMaService; import com.yanzhu.common.core.constant.CacheConstants; import com.yanzhu.common.core.constant.SecurityConstants; import com.yanzhu.common.core.domain.R; @@ -47,7 +48,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept private IUniService uniService; @Autowired - private WxMpService wxMpService; + private WxMaService wxMaService; @Autowired private RedisService redisService; @@ -160,7 +161,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept uniService.syncUniUser(subdeptsUser.getUserId(),subdeptsUser.getProjectId()); try { if(r>0){ - String accessToken = wxMpService.getAccessToken(); + String accessToken = wxMaService.getAccessToken(); String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; String savePath = ProfileConfig.profilePath+"/"+filePath; String profilePath = ProfileConfig.profile+"/"+filePath; @@ -175,7 +176,6 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept }catch (Exception e){ log.error(e.getMessage()); } - } return res; } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index 594399e9..1f38328c 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -1,5 +1,6 @@ package com.yanzhu.manage.service.impl; +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; @@ -49,7 +50,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu private IUniService uniService; @Autowired - private WxMpService wxMpService; + private WxMaService wxMaService; @Autowired private BasTemplateMapper basTemplateMapper; @@ -127,7 +128,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu if(res>0 && Objects.nonNull(proProjectInfoSubdeptsUsers.getUserPost())){ // 生成二维码 try { - String accessToken = wxMpService.getAccessToken(); + String accessToken = wxMaService.getAccessToken(); String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; String savePath = ProfileConfig.profilePath+"/"+filePath; String profilePath = ProfileConfig.profile+"/"+filePath; @@ -562,7 +563,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdepts.setApproveStatus(ApproveStatus.exempt.getCode()); // 生成二维码 try { - String accessToken = wxMpService.getAccessToken(); + String accessToken = wxMaService.getAccessToken(); String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; String savePath = ProfileConfig.profilePath+"/"+filePath; String profilePath = ProfileConfig.profile+"/"+filePath; @@ -577,7 +578,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsMapper.updateProProjectInfoSubdepts(proProjectInfoSubdepts); }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.XMJL.getCode())){ try { - String accessToken = wxMpService.getAccessToken(); + String accessToken = wxMaService.getAccessToken(); String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; String savePath = ProfileConfig.profilePath+"/"+filePath; String profilePath = ProfileConfig.profile+"/"+filePath; @@ -593,7 +594,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsGroup.setApproveStatus(ApproveStatus.exempt.getCode()); proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); try { - String accessToken = wxMpService.getAccessToken(); + String accessToken = wxMaService.getAccessToken(); String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; String savePath = ProfileConfig.profilePath+"/"+filePath; String profilePath = ProfileConfig.profile+"/"+filePath; diff --git a/yanzhu-ui-app/miniprogram/config.js b/yanzhu-ui-app/miniprogram/config.js index 09d706dd..93df9fa6 100644 --- a/yanzhu-ui-app/miniprogram/config.js +++ b/yanzhu-ui-app/miniprogram/config.js @@ -2,9 +2,9 @@ module.exports = { timeout: 60000, appId: "wx46466c7828eede2b", - //baseUrl: 'https:xiangguan.sxyanzhu.com', - baseUrl: 'http://127.0.0.1:8080', - //baseImgUrl: 'https:xiangguan.sxyanzhu.com/file', - baseImgUrl: 'http://127.0.0.1:9300', + baseUrl: 'https:xiangguan.sxyanzhu.com', + //baseUrl: 'http://127.0.0.1:8080', + baseImgUrl: 'https:xiangguan.sxyanzhu.com/file', + //baseImgUrl: 'http://127.0.0.1:9300', noSecuritys:['/code','/auth/wxLogin','/auth/getMaOpenId','/auth/getMaPhoneNumber','/auth/maLogin'] }; \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/api/manage/proProjectInfo.js b/yanzhu-ui-vue3/src/api/manage/proProjectInfo.js index 422e33ab..ea5b33f9 100644 --- a/yanzhu-ui-vue3/src/api/manage/proProjectInfo.js +++ b/yanzhu-ui-vue3/src/api/manage/proProjectInfo.js @@ -35,6 +35,15 @@ export function updateProProjectInfo(data) { }) } +// 重置项目二维码 +export function resetProQrCode(id) { + return request({ + url: '/manage/proProjectInfo/resetProQrCode/'+id, + method: 'get' + }) +} + + // 删除项目信息 export function delProProjectInfo(id) { return request({ diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue index 3612317a..5da913ae 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue @@ -122,14 +122,16 @@ 修改 - - + + + 重置二维码 + 项目产值管理 - @@ -369,7 +371,6 @@ - @@ -387,7 +388,7 @@