个人中心-信息修改

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java

@@ -0,0 +1,39 @@
+package com.epmet.resi.mine.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/3 9:58
+ */
+@Data
+public class InitInfoResultDTO implements Serializable {
+	private static final long serialVersionUID = 144944007101324497L;
+	/**
+	 * 头像
+	 */
+	private String headImgUrl;
+	/**
+	 * 姓
+	 */
+	private String surname;
+	/**
+	 * 名
+	 */
+	private String name;
+	/**
+	 * 路牌号
+	 */
+	private String street;
+	/**
+	 * 小区名称
+	 */
+	private String district;
+	/**
+	 * 详细地址
+	 */
+	private String buildingAddress;
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/PersonalCenterController.java

@@ -0,0 +1,55 @@
+package com.epmet.modules.mine.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.EditInfoFormDTO;
+import com.epmet.modules.mine.service.PersonalCenterService;
+import com.epmet.resi.mine.dto.result.InitInfoResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+/**
+ * 个人中心
+ * @author zhaoqifeng
+ * @date 2020/11/3 9:48
+ */
+@Slf4j
+@RestController
+@RequestMapping("personalcenter")
+public class PersonalCenterController {
+	@Autowired
+	private PersonalCenterService personalCenterService;
+
+	/**
+	 * 修改信息页面初始化
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 10:03
+	 * @param tokenDto
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.mine.dto.result.InitInfoResultDTO>
+	 */
+	@PostMapping("initinfo")
+	public Result<InitInfoResultDTO> initInfo(@LoginUser TokenDto tokenDto) {
+		InitInfoResultDTO resultDTO =  personalCenterService.initInfo(tokenDto);
+		return new Result<InitInfoResultDTO>().ok(resultDTO);
+
+	}
+
+	/**
+	 * 修改信息
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 10:03
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
+	@PostMapping("editinfo")
+	public Result editInfo(@LoginUser TokenDto tokenDto, @RequestBody EditInfoFormDTO formDTO) {
+		personalCenterService.editInfo(tokenDto, formDTO);
+		return new Result();
+	}
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/PersonalCenterService.java

@@ -0,0 +1,17 @@
+package com.epmet.modules.mine.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.dto.form.EditInfoFormDTO;
+import com.epmet.resi.mine.dto.result.InitInfoResultDTO;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/3 9:50
+ */
+public interface PersonalCenterService {
+
+	InitInfoResultDTO initInfo(TokenDto tokenDto);
+
+	void editInfo(TokenDto tokenDto, EditInfoFormDTO formDTO);
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java

@@ -0,0 +1,51 @@
+package com.epmet.modules.mine.service.impl;
+
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.EditInfoFormDTO;
+import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.modules.mine.service.PersonalCenterService;
+import com.epmet.resi.mine.dto.result.InitInfoResultDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/3 9:50
+ */
+@Slf4j
+@Service
+public class PersonalCenterServiceImpl implements PersonalCenterService {
+
+	@Autowired
+	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+	@Override
+	public InitInfoResultDTO initInfo(TokenDto tokenDto) {
+		Result<ResiUserBaseInfoResultDTO> baseInfoResult =  epmetUserOpenFeignClient.selectUserBaseInfo(tokenDto);
+		if (!baseInfoResult.success()) {
+			throw new RenException(baseInfoResult.getCode(), baseInfoResult.getMsg());
+		}
+		InitInfoResultDTO resultDTO = new InitInfoResultDTO();
+		resultDTO.setHeadImgUrl(baseInfoResult.getData().getHeadImgUrl());
+		resultDTO.setSurname(baseInfoResult.getData().getSurname());
+		resultDTO.setName(baseInfoResult.getData().getName());
+		resultDTO.setStreet(baseInfoResult.getData().getStreet());
+		resultDTO.setDistrict(baseInfoResult.getData().getDistrict());
+		resultDTO.setBuildingAddress(baseInfoResult.getData().getBuildingAddress());
+		return resultDTO;
+	}
+
+	@Override
+	public void editInfo(TokenDto tokenDto, EditInfoFormDTO formDTO) {
+		formDTO.setUserId(tokenDto.getUserId());
+		Result result = epmetUserOpenFeignClient.editUserInfo(formDTO);
+		if (!result.success()) {
+			throw new RenException(result.getCode(), result.getMsg());
+		}
+	}
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java

@@ -0,0 +1,52 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/3 9:55
+ */
+@NoArgsConstructor
+@Data
+public class EditInfoFormDTO implements Serializable {
+
+	private static final long serialVersionUID = 1280489016677129419L;
+	/**
+	 * 头像
+	 */
+	@NotBlank(message = "头像不能为空")
+	private String userId;
+	/**
+	 * 头像
+	 */
+	@NotBlank(message = "头像不能为空")
+	private String headImgUrl;
+	/**
+	 * 姓
+	 */
+	@NotBlank(message = "姓不能为空")
+	private String surname;
+	/**
+	 * 名
+	 */
+	@NotBlank(message = "名不能为空")
+	private String name;
+	/**
+	 * 路牌号
+	 */
+	@NotBlank(message = "路牌号不能为空")
+	private String street;
+	/**
+	 * 小区名称
+	 */
+	private String district;
+	/**
+	 * 详细地址
+	 */
+	private String buildingAddress;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -327,4 +327,14 @@ public interface EpmetUserOpenFeignClient {
      **/
     @PostMapping(value = "epmetuser/staffagencyvisited/getstaffbasicinfo")
     Result<StaffBasicInfo> getStaffBasicInfo(@RequestBody StaffBasicInfoFormDTO formDTO);
+
+    /**
+     * 修改个人信息
+     * @author zhaoqifeng
+     * @date 2020/11/3 10:28
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("/epmetuser/userresiinfo/edituserinfo")
+    Result editUserInfo(@RequestBody EditInfoFormDTO formDTO);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -220,4 +220,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<StaffBasicInfo> getStaffBasicInfo(StaffBasicInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", formDTO);
     }
+
+    @Override
+    public Result editUserInfo(EditInfoFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "editUserInfo", formDTO);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java

@@ -26,10 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserResiInfoDTO;
-import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.excel.UserResiInfoExcel;
@@ -163,4 +160,17 @@ public class UserResiInfoController {
         return new Result<IssueInitiatorResultDTO>().ok(userResiInfoService.selectIssueInitiator(formDTO));
     }
 
+    /**
+     * 修改个人信息
+     * @author zhaoqifeng
+     * @date 2020/11/3 10:28
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     */
+    @PostMapping("edituserinfo")
+    public Result editUserInfo(@RequestBody EditInfoFormDTO formDTO) {
+        userResiInfoService.editUserInfo(formDTO);
+        return new Result();
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java

@@ -87,4 +87,13 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @Date 2020/7/22 10:58
 	 **/
 	UserResiInfoDTO selectByUserId(String userId);
+
+	/**
+	 * 根据用户ID更新
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 14:16
+	 * @param entity
+	 * @return void
+	 */
+	void updateByUserId(UserResiInfoEntity entity);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java

@@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
-import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
@@ -151,4 +148,13 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
 	 * @date 2020/5/11 10:59
 	 */
 	IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO);
+
+	/**
+	 * 修改个人信息
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 10:29
+	 * @param formDTO
+	 * @return void
+	 */
+	void editUserInfo(EditInfoFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -325,4 +325,22 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		return userResiInfoDao.selectIssueInitiator(formDTO);
 	}
 
+	/**
+	 * 修改个人信息
+	 *
+	 * @param formDTO
+	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 10:29
+	 */
+	@Override
+	public void editUserInfo(EditInfoFormDTO formDTO) {
+		//更新居民注册信息表
+		baseDao.updateByUserId(ConvertUtils.sourceToTarget(formDTO, UserResiInfoEntity.class));
+		//更新baseInfo
+		UserBaseInfoEntity baseInfo = ConvertUtils.sourceToTarget(formDTO, UserBaseInfoEntity.class);
+		baseInfo.setRealName(formDTO.getSurname() + formDTO.getName());
+		userBaseInfoService.insertOrUpdate(baseInfo);
+	}
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -37,6 +37,16 @@
         uri.updated_by AS "updatedby",
         uri.updated_time AS "updatedtime"
     </sql>
+    <update id="updateByUserId">
+        update user_resi_info set
+            SURNAME = #{surname},
+            NAME = #{name},
+            STREET = #{street},
+            DISTRICT = #{district},
+            BUILDING_ADDRESS = #{buildingAddress}
+        where USER_ID = #{userId}
+        and DEL_FLAG = '0'
+    </update>
 
     <!-- 查询用户注册信息   -->
     <select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"