diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplate.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplate.java new file mode 100644 index 00000000..f49ab18b --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplate.java @@ -0,0 +1,19 @@ +package com.yxt.supervise.crm.api.projecttemplate; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:43 + */ +@Data +@ApiModel(value = "模版消息发送的员工", description = "模版消息发送的员工") +@TableName("project_template") +public class ProjectTemplate { + private String id; + private String ids; + private String userProjectSid;//用户项目关联sid + private String templateSid;//微信模版消息sid +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateDto.java new file mode 100644 index 00000000..d954c9a7 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateDto.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.crm.api.projecttemplate; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/9/27 15:45 + */ +@Data +public class ProjectTemplateDto implements Dto { + private String id; + private String sid; + private String userProjectSid;//用户项目关联sid + private List templateSid;//微信模版消息sid +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateQuery.java new file mode 100644 index 00000000..5f363ba4 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateQuery.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.crm.api.projecttemplate; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:46 + */ +@Data +public class ProjectTemplateQuery implements Query { + private String id; + private String ids; + private String userProjectSid;//用户项目关联sid + private String templateSid;//微信模版消息sid +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateVo.java new file mode 100644 index 00000000..ebb661ea --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttemplate/ProjectTemplateVo.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.projecttemplate; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:46 + */ +@Data +public class ProjectTemplateVo implements Vo { + private String id; + private String ids; + private String userProjectSid;//用户项目关联sid + private String templateSid;//微信模版消息sid + private String userSid; +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessage.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessage.java new file mode 100644 index 00000000..df3de7ad --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessage.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.crm.api.templatemessage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:43 + */ +@Data +@ApiModel(value = "模版消息", description = "模版消息") +@TableName("template_message") +public class TemplateMessage extends BaseEntity { + private String typeSid; + private String name;// +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageDto.java new file mode 100644 index 00000000..7569922a --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageDto.java @@ -0,0 +1,18 @@ +package com.yxt.supervise.crm.api.templatemessage; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/9/27 15:45 + */ +@Data +public class TemplateMessageDto implements Dto { + private String id; + private String sid; + private String typeSid; + private String name;// +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageQuery.java new file mode 100644 index 00000000..fc42f0f3 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageQuery.java @@ -0,0 +1,14 @@ +package com.yxt.supervise.crm.api.templatemessage; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:46 + */ +@Data +public class TemplateMessageQuery implements Query { + private String typeSid; + private String name;// +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageVo.java new file mode 100644 index 00000000..6cd7cb21 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessage/TemplateMessageVo.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.crm.api.templatemessage; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:46 + */ +@Data +public class TemplateMessageVo implements Vo { + private String id; + private String ids; + private String typeSid; + private String name;// +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageType.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageType.java new file mode 100644 index 00000000..aede403e --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageType.java @@ -0,0 +1,17 @@ +package com.yxt.supervise.crm.api.templatemessagetype; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:43 + */ +@Data +@ApiModel(value = "模版消息类型", description = "模版消息类型") +@TableName("template_message_message") +public class TemplateMessageType extends BaseEntity { + private String name;// +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeDto.java new file mode 100644 index 00000000..054d4b5b --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeDto.java @@ -0,0 +1,16 @@ +package com.yxt.supervise.crm.api.templatemessagetype; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:45 + */ +@Data +public class TemplateMessageTypeDto implements Dto { + private String id; + private String sid; + private String typeSid; + private String name;// +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeQuery.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeQuery.java new file mode 100644 index 00000000..2bf50f85 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeQuery.java @@ -0,0 +1,14 @@ +package com.yxt.supervise.crm.api.templatemessagetype; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:46 + */ +@Data +public class TemplateMessageTypeQuery implements Query { + private String typeSid; + private String name;// +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeVo.java new file mode 100644 index 00000000..3b87d12d --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/templatemessagetype/TemplateMessageTypeVo.java @@ -0,0 +1,15 @@ +package com.yxt.supervise.crm.api.templatemessagetype; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/9/27 15:46 + */ +@Data +public class TemplateMessageTypeVo implements Vo { + private String id; + private String sid; + private String name;// +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectVo.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectVo.java index 8cf22826..b472a124 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectVo.java +++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectVo.java @@ -11,6 +11,34 @@ public class UserProjectVo implements Query { private String sid; private String projectSid; private String userSid; + private String name; + private String orgName; + //是否绑定openid;1 未绑定 2绑定 + private String isOpenId; + + public String getIsOpenId() { + return isOpenId; + } + + public void setIsOpenId(String isOpenId) { + this.isOpenId = isOpenId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } public String getId() { return id; diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateMapper.java new file mode 100644 index 00000000..7c228ef8 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateMapper.java @@ -0,0 +1,34 @@ +package com.yxt.supervise.crm.biz.projecttemplate; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplate; +import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/4/12 17:09 + */ +@Mapper +public interface ProjectTemplateMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from project_information") + List listAll(); + List getProjectBySid( @Param("sid") String sid); + @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid left join user_project u on u.projectSid =p.sid where u.userSid=#{sid}") + List getProjectByUserSid( @Param("sid") String sid); + @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid where p.bankSid=#{sid}") + List getProjectByBankSid( @Param("sid") String sid); + @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid") + List getProjectByUser( @Param("sid") String sid); + void insertFiles(List> maps); + List getProjectListByUserSid(@Param("userSid") String userSid); +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateMapper.xml new file mode 100644 index 00000000..811a88b0 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + insert into project_files (sid, url, mainSid) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR} + ) + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateRest.java new file mode 100644 index 00000000..57c80213 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateRest.java @@ -0,0 +1,57 @@ +package com.yxt.supervise.crm.biz.projecttemplate; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateDto; +import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateQuery; +import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 17:10 + */ +@Api(tags = "模版消息发送的员工") +@RestController +@RequestMapping("v1/ProjectTemplate") +public class ProjectTemplateRest { + @Autowired + ProjectTemplateService ProjectTemplateService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = ProjectTemplateService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody ProjectTemplateDto dto) { + return ProjectTemplateService.save(dto); + } + + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody ProjectTemplateDto dto) { + return ProjectTemplateService.update(dto); + } + + @ApiOperation("根据sid查询企业信息") + @GetMapping("/getEnterpriseBySid/{sid}") + public ResultBean getEnterpriseBySid(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + List ProjectTemplateVo=ProjectTemplateService.getByUserProjectSid(sid); + return rb.success().setData(ProjectTemplateVo); + } + + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateService.java new file mode 100644 index 00000000..491cf796 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttemplate/ProjectTemplateService.java @@ -0,0 +1,84 @@ +package com.yxt.supervise.crm.biz.projecttemplate; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.bankmanager.BankManager; +import com.yxt.supervise.crm.api.enterpriseproject.EnterpriseProjectVo; +import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplate; +import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateDto; +import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateQuery; +import com.yxt.supervise.crm.api.projecttemplate.ProjectTemplateVo; +import com.yxt.supervise.crm.api.userproject.UserProject; +import com.yxt.supervise.crm.biz.bankmanager.BankManagerService; +import com.yxt.supervise.crm.biz.enterpriseproject.EnterpriseProjectService; +import com.yxt.supervise.crm.biz.loanbankinformation.LoanBankInformationService; +import com.yxt.supervise.crm.biz.projecttypedictionary.ProjectTypeDictionaryService; +import com.yxt.supervise.crm.biz.storehouseproject.StoreHouseProjectService; +import com.yxt.supervise.crm.biz.userproject.UserProjectService; +import com.yxt.supervise.system.sysuser.SysUser; +import com.yxt.supervise.system.sysuser.SysUserVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +/** + * @author wangpengfei + * @date 2023/9/27 15:45 + */ +@Service +public class ProjectTemplateService extends MybatisBaseService { + + public PagerVo listPageVo(PagerQuery pq) { + ProjectTemplateQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); +// if(StringUtils.isNotBlank(query.getEntryName())){ +// qw.like("info.entryName",query.getEntryName()); +// } +// if(StringUtils.isNotBlank(query.getProjectType())){ +// qw.like("td.projectType",query.getProjectType()); +// } +// if(StringUtils.isNotBlank(query.getBankName())){ +// qw.like("bank.bankName",query.getBankName()); +// } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List listAll() { + List pagging = baseMapper.listAll(); + return pagging; + } + @Transactional + public ResultBean save(ProjectTemplateDto dto) { + ResultBean rb=new ResultBean(); + ProjectTemplate entity=new ProjectTemplate(); + for(String template:dto.getTemplateSid()){ + BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setTemplateSid(template); + baseMapper.insert(entity); + } + return rb.success().setMsg("保存成功"); + } + @Transactional + public ResultBean update(ProjectTemplateDto dto) { + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("userProjectSid",dto.getUserProjectSid())); + save(dto); + return rb.success().setMsg("修改项目信息成功"); + } + public List getByUserProjectSid(String userProjectSid){ + List projects=baseMapper.getProjectBySid(userProjectSid); + return projects; + } + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageMapper.java new file mode 100644 index 00000000..f35a11f4 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageMapper.java @@ -0,0 +1,32 @@ +package com.yxt.supervise.crm.biz.templatemessage; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessage; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/4/12 17:09 + */ +@Mapper +public interface TemplateMessageMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from template_message where typeSid =#{typeSid}") + List listAll(@Param("typeSid")String typeSid); + + List getProjectBySid( @Param("sid") String sid); + + void insertFiles(List> maps); + + List getProjectListByUserSid(@Param("userSid") String userSid); +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageMapper.xml new file mode 100644 index 00000000..f041eefe --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + insert into project_files (sid, url, mainSid) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR} + ) + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageRest.java new file mode 100644 index 00000000..4baa2f59 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageRest.java @@ -0,0 +1,64 @@ +package com.yxt.supervise.crm.biz.templatemessage; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; + +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessageDto; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessageQuery; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/4/12 17:10 + */ +@Api(tags = "模版消息发送的员工") +@RestController +@RequestMapping("v1/TemplateMessage") +public class TemplateMessageRest { + @Autowired + TemplateMessageService TemplateMessageService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = TemplateMessageService.listPageVo(pq); + return rb.success().setData(pv); + } + @PostMapping("/listAll") + public ResultBean listPage() { + ResultBean rb = ResultBean.fireFail(); + Map pv = TemplateMessageService.listAll(); + return rb.success().setData(pv); + } + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody TemplateMessageDto dto) { + return TemplateMessageService.save(dto); + } + + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody TemplateMessageDto dto) { + return TemplateMessageService.update(dto); + } + + @ApiOperation("根据sid查询企业信息") + @GetMapping("/getEnterpriseBySid/{sid}") + public ResultBean getEnterpriseBySid(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + List TemplateMessageVo=TemplateMessageService.getByUserProjectSid(sid); + return rb.success().setData(TemplateMessageVo); + } + + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageService.java new file mode 100644 index 00000000..97f7c935 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessage/TemplateMessageService.java @@ -0,0 +1,88 @@ +package com.yxt.supervise.crm.biz.templatemessage; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.enterpriseinformation.EnterpriseInformation; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessage; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessageDto; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessageQuery; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageType; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo; +import com.yxt.supervise.crm.biz.templatemessagetype.TemplateMessageTypeRest; +import com.yxt.supervise.crm.biz.templatemessagetype.TemplateMessageTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/9/27 15:45 + */ +@Service +public class TemplateMessageService extends MybatisBaseService { + @Autowired + TemplateMessageTypeService templateMessageTypeService; + public PagerVo listPageVo(PagerQuery pq) { + TemplateMessageQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); +// if(StringUtils.isNotBlank(query.getEntryName())){ +// qw.like("info.entryName",query.getEntryName()); +// } +// if(StringUtils.isNotBlank(query.getProjectType())){ +// qw.like("td.projectType",query.getProjectType()); +// } +// if(StringUtils.isNotBlank(query.getBankName())){ +// qw.like("bank.bankName",query.getBankName()); +// } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public Map listAll() { + Mapmap=new HashMap<>(); + Listlist=templateMessageTypeService.listAll(); + for(TemplateMessageTypeVo templateMessageTypeVo:list){ + List pagging = baseMapper.listAll(templateMessageTypeVo.getSid()); + map.put(templateMessageTypeVo.getName(),pagging); + } + + return map; + } + @Transactional + public ResultBean save(TemplateMessageDto dto) { + ResultBean rb=new ResultBean(); + TemplateMessage entity=new TemplateMessage(); +// for(String template:dto.getTemplateSid()){ +// BeanUtil.copyProperties(dto, entity, "id", "sid"); +// entity.setTemplateSid(template); +// baseMapper.insert(entity); +// } + return rb.success().setMsg("保存成功"); + } + @Transactional + public ResultBean update(TemplateMessageDto dto) { + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + TemplateMessage entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改项目信息成功"); + } + public List getByUserProjectSid(String userProjectSid){ + List projects=baseMapper.getProjectBySid(userProjectSid); + return projects; + } + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeMapper.java new file mode 100644 index 00000000..b0b4b672 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeMapper.java @@ -0,0 +1,34 @@ +package com.yxt.supervise.crm.biz.templatemessagetype; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageType; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +/** + * @author wangpengfei + * @date 2023/4/12 17:09 + */ +@Mapper +public interface TemplateMessageTypeMapper extends BaseMapper { + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from project_information") + List listAll(); + List getProjectBySid( @Param("sid") String sid); + @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid left join user_project u on u.projectSid =p.sid where u.userSid=#{sid}") + List getProjectByUserSid( @Param("sid") String sid); + @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid where p.bankSid=#{sid}") + List getProjectByBankSid( @Param("sid") String sid); + @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid") + List getProjectByUser( @Param("sid") String sid); + void insertFiles(List> maps); + List getProjectListByUserSid(@Param("userSid") String userSid); +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeMapper.xml new file mode 100644 index 00000000..b54dcd3d --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + insert into project_files (sid, url, mainSid) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR} + ) + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeRest.java new file mode 100644 index 00000000..6b4fa891 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeRest.java @@ -0,0 +1,61 @@ +package com.yxt.supervise.crm.biz.templatemessagetype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessageVo; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeDto; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeQuery; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/4/12 17:10 + */ +@Api(tags = "模版消息发送的员工") +@RestController +@RequestMapping("v1/TemplateMessageType") +public class TemplateMessageTypeRest { + @Autowired + TemplateMessageTypeService TemplateMessageTypeService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = TemplateMessageTypeService.listPageVo(pq); + return rb.success().setData(pv); + } + @PostMapping("/listAll") + public ResultBean listPage() { + ResultBean rb = ResultBean.fireFail(); + List pv = TemplateMessageTypeService.listAll(); + return rb.success().setData(pv); + } + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody TemplateMessageTypeDto dto) { + return TemplateMessageTypeService.save(dto); + } + + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody TemplateMessageTypeDto dto) { + return TemplateMessageTypeService.update(dto); + } + + @ApiOperation("根据sid查询企业信息") + @GetMapping("/getEnterpriseBySid/{sid}") + public ResultBean getEnterpriseBySid(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + List TemplateMessageTypeVo=TemplateMessageTypeService.getByUserProjectSid(sid); + return rb.success().setData(TemplateMessageTypeVo); + } + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeService.java new file mode 100644 index 00000000..93c1ab21 --- /dev/null +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/templatemessagetype/TemplateMessageTypeService.java @@ -0,0 +1,74 @@ +package com.yxt.supervise.crm.biz.templatemessagetype; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.crm.api.templatemessage.TemplateMessage; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageType; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeDto; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeQuery; +import com.yxt.supervise.crm.api.templatemessagetype.TemplateMessageTypeVo; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/9/27 15:45 + */ +@Service +public class TemplateMessageTypeService extends MybatisBaseService { + + public PagerVo listPageVo(PagerQuery pq) { + TemplateMessageTypeQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); +// if(StringUtils.isNotBlank(query.getEntryName())){ +// qw.like("info.entryName",query.getEntryName()); +// } +// if(StringUtils.isNotBlank(query.getProjectType())){ +// qw.like("td.projectType",query.getProjectType()); +// } +// if(StringUtils.isNotBlank(query.getBankName())){ +// qw.like("bank.bankName",query.getBankName()); +// } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List listAll() { + List pagging = baseMapper.listAll(); + return pagging; + } + @Transactional + public ResultBean save(TemplateMessageTypeDto dto) { + ResultBean rb=new ResultBean(); + TemplateMessageType entity=new TemplateMessageType(); +// for(String template:dto.getTemplateSid()){ +// BeanUtil.copyProperties(dto, entity, "id", "sid"); +// entity.setTemplateSid(template); +// baseMapper.insert(entity); +// } + return rb.success().setMsg("保存成功"); + } + @Transactional + public ResultBean update(TemplateMessageTypeDto dto) { + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + TemplateMessageType entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改项目信息成功"); + } + public List getByUserProjectSid(String userProjectSid){ + List projects=baseMapper.getProjectBySid(userProjectSid); + return projects; + } + +} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java index aa6738ef..91291a66 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java @@ -19,7 +19,7 @@ import java.util.List; public interface UserProjectMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List userProjectList(); - List getUserProjectBySid( @Param("projectSid") String projectSid,@Param("userType")String userType); + List getUserProjectBySid( @Param("projectSid") String projectSid); List getUsersByprojectSid( @Param("projectSid") String projectSid); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml index 65fc8ef6..6cba4b98 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml @@ -17,7 +17,7 @@ FROM user_project + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java index 8937c5ad..b4134bf3 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java @@ -450,8 +450,8 @@ public class SysUserRest implements SysUserFeign { } @Override - public ResultBean reGetPwd(String userName, String userPhone) { - return sysUserService.reGetPwd(userName, userPhone); + public ResultBean reGetPwd(String userName, String userPhone,String verificationCode) { + return sysUserService.reGetPwd(userName, userPhone,verificationCode); } @Override @@ -707,6 +707,10 @@ public class SysUserRest implements SysUserFeign { public ResultBean getUserByType(@RequestParam("userType") String userType){ return sysUserService.getUserByType(userType); } + @GetMapping("getUserOrgBySid") + public ResultBean getUserOrgBySid(@RequestParam("sid") String sid){ + return sysUserService.getUserOrgBySid(sid); + } @PostMapping("/uploadfile") public ResultBean uploadImage(@RequestParam(value = "file") MultipartFile file) { diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java index a294fab8..59a94fab 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java @@ -258,6 +258,7 @@ public class SysUserService extends MybatisBaseService { } redisUtil.remove(user.getUserName()); // 3.给用户发送手机短信 +// MsgWs.SendWaitWorkMsg(mobile, user.getUserName() + SmsFeign.MSG_NEWPWD + substring); return true; } @@ -592,14 +593,16 @@ public class SysUserService extends MybatisBaseService { * 发送手机端登录验证码 * * @param mobile - * @param type 1、登录2、修改密码3、找回密码 + * @param type 1、登录2、修改密码3、找回密码 4绑定 * @return */ public ResultBean sendVerificationCodeForApp(String mobile, String type) { ResultBean rb=new ResultBean().fireFail(); - SysUser sysUser = baseMapper.selectOne(new QueryWrapper().eq("mobile",mobile)); - if(null==sysUser){ - return rb.setMsg("您的平台应用未被授权，请联系工作人员。"); + if(type.equals("4")){ + SysUser sysUser = baseMapper.selectOne(new QueryWrapper().eq("mobile",mobile)); + if(null==sysUser){ + return rb.setMsg("您的平台应用未被授权，请联系工作人员。"); + } } Date date = new Date(); String redisKey = ""; @@ -635,8 +638,8 @@ public class SysUserService extends MybatisBaseService { content = "登录验证码：" + verificationCode + "，有效期5分钟，如非本人操作，请忽略。"; } else if(type.equals("4")){ content = "账户绑定验证码：" + verificationCode + "，有效期5分钟，如非本人操作，请忽略。"; - }else { - content = "修改密码验证码：" + verificationCode + "，用于修改登录密码,有效期5分钟，如非本人操作，请忽略该短信。"; + }else if(type.equals("3")){ + content = "找回密码验证码：" + verificationCode + "，用于找回密码,有效期5分钟，如非本人操作，请忽略该短信。"; } String res = com.yxt.supervise.utils.MsgWs.SendWaitWorkMsg(mobile, content); // String res = "1"; @@ -809,13 +812,23 @@ public class SysUserService extends MybatisBaseService { /** * @param mobile 手机号 * @param verificationCode 验证码 + * @param type 验证码类型 * @description: 绑定微信验证验证码是否正确 * @return: * @Author: dimengzhe * @Date: 2021/10/6 11:02 */ - public Map mobileValidateWxRegister(String mobile, String verificationCode) { - String key = "binding" + mobile; + public Map mobileValidateWxRegister(String mobile, String verificationCode,String type) { + String key = ""; + if (type.equals("1")) { + key = "loginCode"+ mobile; + } else if (type.equals("2")) { + key = "updatePwdCode"+mobile; + } else if (type.equals("3")) { + key = "resetPwdCode"+mobile; + }else if(type.equals("4")){ + key = "binding"+mobile; + } String code = redisUtil.get(key); if (StringUtils.isNotBlank(code)) { code = code.substring(0, 4); @@ -977,9 +990,22 @@ public class SysUserService extends MybatisBaseService { return baseMapper.selectByMobile(mobile); } - public ResultBean reGetPwd(String userName, String userPhone) { + public ResultBean reGetPwd(String userName, String userPhone,String verificationCode) { ResultBean rb = ResultBean.fireFail(); - return null; + String userSid = baseMapper.fetchByUserNameAndUserPhone(userName, userPhone); + + if (StringUtils.isNotBlank(userSid)) { + Mapvali=mobileValidateWxRegister(userPhone,verificationCode,"3"); + if(!vali.get("code").equals("200")){ + return rb.setMsg(vali.get("details").toString()); + } + Boolean aBoolean = initPwd(userSid); + if (!aBoolean) { + return ResultBean.fireFail().setMsg("初始化密码失败"); + } + return ResultBean.fireSuccess().setMsg("初始化密码成功"); + } + return rb.setMsg("姓名或手机号填写不正确"); } public int updateIsEnable(String sid, String isEnable) { @@ -1411,7 +1437,7 @@ public class SysUserService extends MybatisBaseService { // SysUser sysUser = baseMapper.selectOne(new QueryWrapper().eq("mobile",mobile)); if (sysUser != null) { //手机号存在再验证验证码 - Map vali = mobileValidateWxRegister(mobile,code); + Map vali = mobileValidateWxRegister(mobile,code,"4"); if(!vali.get("code").equals("200")){ return rb.setMsg(vali.get("details").toString()); } @@ -1438,7 +1464,7 @@ public class SysUserService extends MybatisBaseService { // 校验手机验证码 String code = sysUserWxBindMobileDto.getCode(); - Map vali = mobileValidateWxRegister(mobile,code); + Map vali = mobileValidateWxRegister(mobile,code,"4"); if(!vali.get("code").equals("200")){ return rb.setMsg(vali.get("details").toString()); } @@ -1471,6 +1497,11 @@ public class SysUserService extends MybatisBaseService { List list=baseMapper.getUserByType(userType); return rb.success().setData(list); } + public ResultBean getUserOrgBySid(String sid){ + ResultBean rb=new ResultBean(); + List list=baseMapper.getUserOrgBySid(sid); + return rb.success().setData(list); + } public ResultBean updateSysUserImage(Map map){ String userSid = map.get("userSid"); diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserRest.java index 7f8c58eb..3e19ad5f 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserRest.java @@ -194,7 +194,7 @@ public class WxSysUserRest implements WxSysUserFeign { return rb.setMsg("该手机号已注册"); } //验证码是否正确 - Map map = sysUserService.mobileValidateWxRegister(mobile, verificationCode); + Map map = sysUserService.mobileValidateWxRegister(mobile, verificationCode,"1"); String code = map.get("code").toString(); boolean isSave = false; if (Tools.CODE_SUCCESS.equals(code)) { @@ -373,7 +373,7 @@ public class WxSysUserRest implements WxSysUserFeign { @ApiOperation(value = "验证验证码是否正确") @GetMapping("/mobileValidateWxRegister") public Map mobileValidateWxRegister(String mobile,String verificationCode){ - return sysUserService.mobileValidateWxRegister(mobile, verificationCode); + return sysUserService.mobileValidateWxRegister(mobile, verificationCode,"4"); } @PostMapping("/wxBindMobile") @ApiOperation(value = "微信绑定手机")