From 7fc4d003842b3a47eaeae471a7f1a95770674abd Mon Sep 17 00:00:00 2001 From: ganhao Date: Sat, 16 May 2026 19:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E7=9A=84=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnterpriseMineController.java | 27 ++++++--- .../domain/bo/UpdatePhoneBo.java | 37 +++++++++++++ .../mapper/EnterpriseUserRefMapper.java | 10 ++++ .../service/IEnterpriseUserService.java | 9 +++ .../enterprise/IAppEnterpriseMineService.java | 23 -------- .../impl/AppEnterpriseMineServiceImpl.java | 40 -------------- .../impl/EnterpriseUserServiceImpl.java | 55 ++++++++++++++++++- .../EnterpriseUserRefMapper.xml | 19 +++++++ .../src/main/resources/application-dev.yml | 26 +++++++++ 9 files changed, 175 insertions(+), 71 deletions(-) create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/UpdatePhoneBo.java delete mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseMineService.java delete mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseMineServiceImpl.java diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseMineController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseMineController.java index 668ee50a..04d5ab7e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseMineController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseMineController.java @@ -1,15 +1,19 @@ package com.zdxt.enforcementcode.controller.app.enterprise; -import com.zdxt.enforcementcode.service.enterprise.IAppEnterpriseMineService; +import com.zdxt.enforcementcode.domain.bo.UpdatePhoneBo; +import com.zdxt.enforcementcode.domain.vo.EnterpriseUserVo; +import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationDetailVo; +import com.zdxt.enforcementcode.service.IEnterpriseUserService; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -25,23 +29,32 @@ public class AppEnterpriseMineController { @Autowired - private IAppEnterpriseMineService appEnterpriseMineService; + private IEnterpriseUserService enterpriseUserService; + + /** * 企业端-查询用户信息 */ @ApiResponse(description = "企业端-查询用户信息") @GetMapping("/userMine") - public SysUserVo userMine(String userId) { - return appEnterpriseMineService.queryLoginUserId(userId); + public R userMine(Long userId) { + EnterpriseUserVo enterpriseUserVo = enterpriseUserService.queryById(userId); + return R.ok(enterpriseUserVo); } /** * 企业端-修改联系电话 + * @param updatePhoneBo 修改手机号码请求对象 * @return */ @ApiResponse(description = "企业端-修改用户联系电话") @PostMapping("/updatePhone") - public int updatePhone(String userId, String phone) { - return appEnterpriseMineService.updateUserPhone(userId, phone); + public R updatePhone(@RequestBody @Validated UpdatePhoneBo updatePhoneBo) { + boolean flag = enterpriseUserService.updatePhoneNumber(updatePhoneBo.getUserId(), updatePhoneBo.getPhoneNumber()); + if (flag) { + return R.ok("修改成功"); + } else { + return R.fail("修改失败"); + } } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/UpdatePhoneBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/UpdatePhoneBo.java new file mode 100644 index 00000000..29530022 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/UpdatePhoneBo.java @@ -0,0 +1,37 @@ +package com.zdxt.enforcementcode.domain.bo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 企业用户修改手机号码业务对象 + * + * @author Lion Li + * @date 2026-05-16 + */ +@Data +@Schema(description = "企业用户修改手机号码请求对象") +public class UpdatePhoneBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @Schema(description = "用户ID") + @NotNull(message = "用户ID不能为空") + private Long userId; + + /** + * 新手机号码 + */ + @Schema(description = "新手机号码") + @NotBlank(message = "手机号码不能为空") + private String phoneNumber; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseUserRefMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseUserRefMapper.java index 0dfe6607..cb360e55 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseUserRefMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnterpriseUserRefMapper.java @@ -3,8 +3,11 @@ package com.zdxt.enforcementcode.mapper; import com.zdxt.enforcementcode.domain.EnterpriseUserRef; import com.zdxt.enforcementcode.domain.vo.EnterpriseUserRefVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.List; + /** * 企业用户与企业的关联Mapper接口 * @@ -14,4 +17,11 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @Mapper public interface EnterpriseUserRefMapper extends BaseMapperPlus { + /** + * 根据用户ID查询企业关联信息 + * + * @param userId 用户ID + * @return 企业用户关联信息列表 + */ + List selectByUserId(@Param("userId") Long userId); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseUserService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseUserService.java index 03642f64..7316e0eb 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseUserService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseUserService.java @@ -74,4 +74,13 @@ public interface IEnterpriseUserService { EnterpriseUserVo queryByUserName(String userName); EnterpriseUserVo queryByLoginName(String loginName); + + /** + * 修改企业用户手机号码 + * + * @param userId 用户ID + * @param phoneNumber 新手机号码 + * @return 是否修改成功 + */ + Boolean updatePhoneNumber(Long userId, String phoneNumber); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseMineService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseMineService.java deleted file mode 100644 index 975cae68..00000000 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseMineService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.zdxt.enforcementcode.service.enterprise; - -import org.dromara.system.domain.vo.SysUserVo; - - -/** - * 企业执法-我的Service接口 - */ -public interface IAppEnterpriseMineService { - - /** - * 企业端-根据用户ID查询用户信息 - * - * @param userId 用户ID - * @return 用户信息 - */ - SysUserVo queryLoginUserId(String userId); - - /** - * 企业端-修改用户联系电话 - */ - int updateUserPhone(String userId, String phone); -} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseMineServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseMineServiceImpl.java deleted file mode 100644 index 3532d84d..00000000 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseMineServiceImpl.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.zdxt.enforcementcode.service.enterprise.impl; - -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.zdxt.enforcementcode.mapper.enterprise.AppEnterpriseMineMapper; -import com.zdxt.enforcementcode.service.enterprise.IAppEnterpriseMineService; -import org.dromara.system.domain.SysUser; -import org.dromara.system.domain.vo.SysUserVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class AppEnterpriseMineServiceImpl implements IAppEnterpriseMineService { - - @Autowired - private AppEnterpriseMineMapper appEnterpriseMineMapper; - /** - * 企业端-获取用户信息 - * @param userId 用户ID - * @return - */ - @Override - public SysUserVo queryLoginUserId(String userId) { - SysUserVo sysUserVo = appEnterpriseMineMapper.queryLoginUserId(userId); - return sysUserVo; - } - - /** - * 企业端-修改用户联系电话 - * @param userId - * @param phone - * @return - */ - @Override - public int updateUserPhone(String userId, String phone) { - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(SysUser::getUserId, Long.parseLong(userId)) - .set(SysUser::getPhonenumber, phone); - return appEnterpriseMineMapper.update(null, updateWrapper); - } -} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserServiceImpl.java index aaf1ae16..809fddd0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserServiceImpl.java @@ -1,8 +1,11 @@ package com.zdxt.enforcementcode.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.zdxt.enforcementcode.domain.EnterpriseUser; import com.zdxt.enforcementcode.domain.bo.EnterpriseUserBo; +import com.zdxt.enforcementcode.domain.vo.EnterpriseUserRefVo; import com.zdxt.enforcementcode.domain.vo.EnterpriseUserVo; import com.zdxt.enforcementcode.mapper.EnterpriseUserMapper; +import com.zdxt.enforcementcode.mapper.EnterpriseUserRefMapper; import com.zdxt.enforcementcode.service.IEnterpriseUserService; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -32,6 +35,9 @@ public class EnterpriseUserServiceImpl implements IEnterpriseUserService { private final EnterpriseUserMapper baseMapper; + private final EnterpriseUserRefMapper enterpriseUserRefMapper; + + /** * 查询企业用户信息 * @@ -40,7 +46,15 @@ public class EnterpriseUserServiceImpl implements IEnterpriseUserService { */ @Override public EnterpriseUserVo queryById(Long userId){ - return baseMapper.selectVoById(userId); + EnterpriseUserVo enterpriseUserVo = new EnterpriseUserVo(); + List enterpriseUserRefVo = enterpriseUserRefMapper.selectByUserId(userId); + if(enterpriseUserRefVo.size()>0){ + EnterpriseUserRefVo enterpriseUserRefVo1 = enterpriseUserRefVo.get(0); + enterpriseUserVo = baseMapper.selectVoById(userId); + enterpriseUserVo.setDeptName(enterpriseUserRefVo1.getEnterpriseName()); + enterpriseUserVo.setDeptId(enterpriseUserRefVo1.getEnterpriseId()); + } + return enterpriseUserVo; } /** @@ -161,4 +175,43 @@ public class EnterpriseUserServiceImpl implements IEnterpriseUserService { lqw.eq(EnterpriseUser::getLoginName, loginName); return baseMapper.selectVoOne(lqw); } + + /** + * 修改企业用户手机号码 + * + * @param userId 用户ID + * @param phoneNumber 新手机号码 + * @return 是否修改成功 + */ + @Override + public Boolean updatePhoneNumber(Long userId, String phoneNumber) { + if (userId == null || StringUtils.isBlank(phoneNumber)) { + log.warn("修改手机号码失败：用户ID或手机号码为空"); + return false; + } + + // 验证手机号格式 +// if (!phoneNumber.matches("^1[3-9]\\d{9}$")) { +// log.warn("修改手机号码失败：手机号格式不正确，phoneNumber={}", phoneNumber); +// return false; +// } +// + try { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(EnterpriseUser::getUserId, userId) + .set(EnterpriseUser::getPhonenumber, phoneNumber); + + int result = baseMapper.update(null, updateWrapper); + if (result > 0) { + log.info("成功修改用户[{}]的手机号码为[{}]", userId, phoneNumber); + return true; + } else { + log.warn("修改用户[{}]的手机号码失败，用户不存在", userId); + return false; + } + } catch (Exception e) { + log.error("修改用户[{}]的手机号码时发生异常", userId, e); + return false; + } + } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseUserRefMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseUserRefMapper.xml index 88b3cfc0..1b4e5785 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseUserRefMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnterpriseUserRefMapper.xml @@ -3,4 +3,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index de0c491c..d1299ea0 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -311,3 +311,29 @@ mssq: hcpappid: zfjdm hcpsign: ENC(SZL+KT860YpMBuK6GbNWTp0TYVeSu/DTYjKPRCm5xVJk9tI+O6/hqsE5zH9orApgjX6ggAS2hbGefmUsJwIkos0YtIgueK89ilDHtEy6/S0RWrnoi6F9aByxVG/mAwPxTPIXxwUECjvuET1rByTi7juNbufzWzJfYrH4dFXLmzbF5Cv5jJHM8R7Rq6DGL9X9UCqmROJygXv9KvrxN3OcnVoTHb0wQepEq6kplkd3SswLnPSDpb7q5vcs1XMxYcFRDLyqjmQYVRcx3HMsQZOGkTahOdzIfI/tL4D4upgYK1TFpaCiBL98vX/bh/s9RPmiHkyqMd8/R/NnoB8q5/5LldqxBhPCBi6RbPFGM/UfojdXeS5z2Uk/2w==) hcptimestamp: 20240710172956 + + +#深圳易平台对接密钥 +szypt: + #测试 + agentid: ENC(JHe/LoW7bh5Cxpn8BJ2Q6Q==) + url: ENC(pRnuGFcSRfkkLTp7NLU5EvD5QpSdkobiPlxjRhGE5l/Uvrur9isTzMkqYoYgMrHt) + corpid: ENC(jrCQGAujvdFRc5tCE8g8oM9F0Ln7shZoXB7WeM3Tzhs=) + corpsecret: ENC(Z8hjBADO1lZDAhOB7/ku9FpPIkYk4mGwyFH01vSwefMxweTeGaMuajSc9vD4bPL1wdgVhS/ZPeI=) + +#市认证网关 +srnwsrnwgg: + #正式 + url: ENC(pHNm/o0+6S+HjrM5nuMiPRfkrHS1tXYD5i25OBtM4dWSi6MvH6iXfw==) + systemCode: ENC(cHDdxMKpJ/rbuj4PVCxylN+zPd9I2KT0) + integrationKey: ENC(txSndcPbZK5mYjW7Doa/n9Ips2PLa9NV) + paasId: szsfj_zhifajianduma_001 + paasToken: ENC(VfUgR5OXHJcKvBBfq/2ysuNPH6I7tCCeWHYSzXKicGChlMiw9mVPGD51naX9w42E) + #市认证数据加密字符 + secretKey: ENC(xWBA5VwT23j14A8+6I15HCerJvo3zaRxzVE2xc0i7wZ7wq/SCflOEkHCc8wwdi0KHkDGjKIoHhs=) +# #测试 +# url: ENC(jFwf6bYIMn+FOtbCkyPr0r+TBOPrp84tNotl912ilUZy2e9Y8cbH3uDQ5jtr6SAa) +# systemCode: ENC(ECOnqNVVPmCmnqhde6tsS5JEQYPtlmCv) +# integrationKey: ENC(8RZtrfL4t5tsEk7lfrw00+4hSxbjxcVM) +# paasId: szsfj_zhifajianduma_001 +# paasToken: ENC(0Cg8Vtpay+3hwRm+vJB0utikr4dXcEguwSaxlbTWkgQ4parB8pN2rL2xrhQ8eUd5)