diff --git a/src/main/java/com/glxp/api/controller/auth/RegisterController.java b/src/main/java/com/glxp/api/controller/auth/RegisterController.java index 5bdf2a9..05a9473 100644 --- a/src/main/java/com/glxp/api/controller/auth/RegisterController.java +++ b/src/main/java/com/glxp/api/controller/auth/RegisterController.java @@ -2,25 +2,38 @@ package com.glxp.api.controller.auth; import java.util.Map; +import javax.annotation.Resource; import javax.servlet.http.HttpSession; +import javax.validation.Valid; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import com.alibaba.fastjson2.JSON; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.auth.UserRegisterEntity; +import com.glxp.api.service.auth.UserRegisterService; import com.glxp.api.util.CaptchaUtils; +import cn.hutool.core.util.ReUtil; +import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; @RestController @Slf4j public class RegisterController { private static final Logger logger = LoggerFactory.getLogger(RegisterController.class); - + @Resource + private UserRegisterService userRegisterService; @PostMapping("/admin/auth/register/getCheckcode") public BaseResponse getCheckcode(@RequestBody Map params, HttpSession httpSession) { @@ -34,6 +47,57 @@ public class RegisterController { return CaptchaUtils.checkCode(params); } + /** + * 根据手机号获取注册信息 + * + * @param mobile 手机号 + */ + + @GetMapping("/admin/auth/register/get/{mobile}") + public BaseResponse getInfo(@PathVariable String mobile) { + UserRegisterEntity userRegisterEntity = userRegisterService.selectByMobile(mobile); + if(userRegisterEntity==null) + userRegisterEntity = new UserRegisterEntity(); + return ResultVOUtils.success(userRegisterEntity); + } + + @PostMapping("/admin/auth/register/save") + public BaseResponse saveRegister(@RequestBody @Valid UserRegisterEntity userRegisterEntity, HttpSession httpSession, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + //校验邮箱是否正确 + if (StrUtil.isNotBlank(userRegisterEntity.getEmail())) { + boolean match = ReUtil.isMatch("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", userRegisterEntity.getEmail()); + if (!match) { + return ResultVOUtils.error(500, "邮箱格式错误"); + } + } + UserRegisterEntity userRegisterEntity2 = userRegisterService.selectByCompanyName(userRegisterEntity.getCompanyName()); + if (userRegisterEntity2 !=null ) { + if(StringUtils.isEmpty(userRegisterEntity.getId())) + return ResultVOUtils.error(500, "该单位已被注册！"); + if(!userRegisterEntity2.getId().equals(userRegisterEntity.getId())) + return ResultVOUtils.error(500, "该单位已被注册！"); + } + if(StringUtils.isEmpty(userRegisterEntity.getCheckStatus())) + userRegisterEntity.setCheckStatus("0"); + boolean b = false; + if(!StringUtils.isEmpty(userRegisterEntity.getId())) { + b = userRegisterService.updateUserRegister(userRegisterEntity); + } else { + b = userRegisterService.insertUserRegister(userRegisterEntity); + } + + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success(); + } + } diff --git a/src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java b/src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java new file mode 100644 index 0000000..356bf26 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/auth/UserRegisterDao.java @@ -0,0 +1,36 @@ +package com.glxp.api.dao.auth; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import com.glxp.api.entity.auth.UserRegisterEntity; +import com.glxp.api.req.auth.UserResisterFilterRequest; + +@Mapper +public interface UserRegisterDao { + + List filterUserRegisters(UserResisterFilterRequest userResisterFilterRequest); + + UserRegisterEntity selectByCompanyName(String companyName); + + UserRegisterEntity selectByUserName(String userName); + + boolean insertUserRegister(UserRegisterEntity userRegisterEntity); + + boolean updateUserRegister(UserRegisterEntity userRegisterEntity); + + boolean deleteById(String id); + boolean deleteByMobile(@Param("mobile")String mobile , @Param("checkStatus")String checkStatus); + + UserRegisterEntity selectById(String id); + + UserRegisterEntity selectByCustomerId(@Param("id") String id); + + UserRegisterEntity selectByMobile(String mobile); + + boolean deleteByCustomerId(String id); + + String isExit(String mobile); +} diff --git a/src/main/java/com/glxp/api/entity/auth/UserRegisterEntity.java b/src/main/java/com/glxp/api/entity/auth/UserRegisterEntity.java new file mode 100644 index 0000000..6801c9d --- /dev/null +++ b/src/main/java/com/glxp/api/entity/auth/UserRegisterEntity.java @@ -0,0 +1,25 @@ +package com.glxp.api.entity.auth; + +import lombok.Data; + +@Data +public class UserRegisterEntity { + + private String id; + private String companyId; + private String mobile; + private String email; + private String userId; + private String realName; + private String contactWay; + private String companyName; + private String creditNum; + private String registerAddress; + private String bussinessStatus; + private String legalPerson; + private String legalIdCard; + private String checkStatus; + private String registerTime; + private String checkTime; + private String comments; +} diff --git a/src/main/java/com/glxp/api/req/auth/UserResisterFilterRequest.java b/src/main/java/com/glxp/api/req/auth/UserResisterFilterRequest.java new file mode 100644 index 0000000..f9ea3a7 --- /dev/null +++ b/src/main/java/com/glxp/api/req/auth/UserResisterFilterRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.req.auth; + +import com.glxp.api.util.page.ListPageRequest; + +import lombok.Data; + +@Data +public class UserResisterFilterRequest extends ListPageRequest { + + private String companyName; + private String checkStatus; + private String companyId; +} diff --git a/src/main/java/com/glxp/api/service/auth/UserRegisterService.java b/src/main/java/com/glxp/api/service/auth/UserRegisterService.java new file mode 100644 index 0000000..e9ff512 --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/UserRegisterService.java @@ -0,0 +1,33 @@ +package com.glxp.api.service.auth; + +import java.util.List; + +import com.glxp.api.entity.auth.UserRegisterEntity; +import com.glxp.api.req.auth.UserResisterFilterRequest; + +public interface UserRegisterService { + + List filterUserRegisters(UserResisterFilterRequest userResisterFilterRequest); + + boolean insertUserRegister(UserRegisterEntity userRegisterEntity); + + UserRegisterEntity selectByCompanyName(String companyName); + + boolean updateUserRegister(UserRegisterEntity userRegisterEntity); + + boolean deleteById(String id); + + UserRegisterEntity selectByUserName(String userName); + + boolean deleteByMobile(String mobile,String checkStatus); + + UserRegisterEntity selectById(String id); + + UserRegisterEntity selectByMobile(String mobile); + + boolean isExit(String mobile); + + boolean deleteByCustomerId(String id); + + UserRegisterEntity selectByCustomerId(String id); +} diff --git a/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java new file mode 100644 index 0000000..b58c934 --- /dev/null +++ b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java @@ -0,0 +1,100 @@ +package com.glxp.api.service.auth.impl; + +import java.util.Collections; +import java.util.List; + +import javax.annotation.Resource; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.auth.UserRegisterDao; +import com.glxp.api.entity.auth.UserRegisterEntity; +import com.glxp.api.req.auth.UserResisterFilterRequest; +import com.glxp.api.service.auth.UserRegisterService; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; + +@Service +@Transactional(rollbackFor = Exception.class) +public class UserRegisterServiceImpl implements UserRegisterService { + + @Resource + private UserRegisterDao userRegisterDao; + + + @Override + public List filterUserRegisters(UserResisterFilterRequest userResisterFilterRequest) { + if (userResisterFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (userResisterFilterRequest.getPage() - 1) * userResisterFilterRequest.getLimit(); + PageHelper.offsetPage(offset, userResisterFilterRequest.getLimit()); + return userRegisterDao.filterUserRegisters(userResisterFilterRequest); + } + + @Override + public boolean insertUserRegister(UserRegisterEntity userRegisterEntity) { + if(StringUtils.isEmpty(userRegisterEntity.getId())) + userRegisterEntity.setId(CustomUtil.getId()); + userRegisterEntity.setRegisterTime(DateUtil.getDateTime()); + return userRegisterDao.insertUserRegister(userRegisterEntity); + } + + @Override + public UserRegisterEntity selectByCompanyName(String companyName) { + return userRegisterDao.selectByCompanyName(companyName); + } + + @Override + public boolean updateUserRegister(UserRegisterEntity userRegisterEntity) { + return userRegisterDao.updateUserRegister(userRegisterEntity); + } + + @Override + public boolean deleteById(String id) { + return userRegisterDao.deleteById(id); + } + + @Override + public UserRegisterEntity selectByUserName(String userName) { + return userRegisterDao.selectByUserName(userName); + } + + @Override + public boolean deleteByMobile(String mobile, String checkStatus) { + return userRegisterDao.deleteByMobile(mobile,checkStatus); + } + + + @Override + public UserRegisterEntity selectById(String id) { + return userRegisterDao.selectById(id); + } + + @Override + public UserRegisterEntity selectByMobile(String mobile) { + return userRegisterDao.selectByMobile(mobile); + } + + @Override + public boolean isExit(String mobile) { + String data = userRegisterDao.isExit(mobile); + if (data != null) + return true; + else + return false; + } + + @Override + public boolean deleteByCustomerId(String id) { + return userRegisterDao.deleteByCustomerId(id); + } + + @Override + public UserRegisterEntity selectByCustomerId(String id) { + return userRegisterDao.selectByCustomerId(id); + } +} diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index d4c0f65..f5a94f2 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -96,7 +96,6 @@ import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; -import com.glxp.api.entity.system.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncDataSetEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; @@ -167,7 +166,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -1418,7 +1416,7 @@ public class HeartService { //下载最近更新扫码单据--上级服务 @Transactional(propagation = Propagation.NESTED) public void dlAllOrder() { - Date startTime = new Date(); + /*Date startTime = new Date(); BaseResponse> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_ORDER + "", "3"); List pageSimpleResponse = baseResponse != null ? baseResponse.getData() : new ArrayList<>(); if (pageSimpleResponse != null) { @@ -1511,7 +1509,7 @@ public class HeartService { } } } - } + }*/ } // 下载最近更新国家库数据-上级服务 diff --git a/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml b/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml new file mode 100644 index 0000000..61b26f6 --- /dev/null +++ b/src/main/resources/mybatis/mapper/auth/UserRegisterDao.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + INSERT INTO user_register + (id,companyId,mobile,email,userId,realName,contactWay,companyName,creditNum, + registerAddress,bussinessStatus,legalPerson,legalIdCard,checkStatus,registerTime, + checkTime,comments) + values (#{id,jdbcType=VARCHAR},#{companyId,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR}, + #{email,jdbcType=VARCHAR},#{userId,jdbcType=VARCHAR},#{realName,jdbcType=VARCHAR}, + #{contactWay,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR},#{creditNum,jdbcType=VARCHAR}, + #{registerAddress,jdbcType=VARCHAR},#{bussinessStatus,jdbcType=VARCHAR},#{legalPerson,jdbcType=VARCHAR}, + #{legalIdCard,jdbcType=VARCHAR},#{checkStatus,jdbcType=VARCHAR},#{registerTime,jdbcType=TIMESTAMP}, + #{checkTime,jdbcType=TIMESTAMP},#{comments,jdbcType=VARCHAR}) + + + + UPDATE user_register + + `companyId`=#{companyId}, + mobile=#{mobile}, + `email`=#{email}, + userId=#{userId}, + realName=#{realName}, + companyName=#{companyName}, + contactWay=#{contactWay}, + creditNum=#{creditNum}, + registerAddress=#{registerAddress}, + bussinessStatus=#{bussinessStatus}, + checkStatus=#{checkStatus}, + legalPerson=#{legalPerson}, + legalIdCard=#{legalIdCard}, + checkStatus=#{checkStatus}, + registerTime=#{registerTime}, + checkTime=#{checkTime}, + comments=#{comments}, + + WHERE id=#{id} + + + + delete + from user_register + where id = #{id} + + + delete + from user_register + where mobile = #{mobile} and checkStatus=#{checkStatus} + + + + delete + from user_register + where userId = #{userId} + + + + + + + + +