Merge branch 'dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@@ -182,6 +182,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
             userEntity.setPhone(formDTO.getPhone());
             userEntity.setRealName(formDTO.getSurName());
             userEntity.setGender(formDTO.getGender().toString());
+            userEntity.setSource(formDTO.getSource());
             if (paUserDao.insert(userEntity) < NumConstant.ONE) {
                 throw new RenException(PaConstant.SAVE_USER_EXCEPTION);
             }

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

@@ -50,14 +50,15 @@ public class ResiMineGridController {
 
 	/**
 	 * @return
-	 * @param formDTO
+	 * @param appId
 	 * @Author sun
 	 * @Description 单客户-获取用户最近访问网格
 	 * @Date 2020/8/3
 	 **/
 	@GetMapping("latestgridinfo")
-	public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) {
-		ValidatorUtils.validateEntity(formDTO);
+	public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) {
+		LatestGridInfoFormDTO formDTO = new LatestGridInfoFormDTO();
+		formDTO.setAppId(appId);
 		formDTO.setUserId(token.getUserId());
 		return new Result<LatestGridInfoResultDTO>().ok(resiMineGridService.latestGridInfo(formDTO));
 	}

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

@@ -257,6 +257,6 @@ public interface EpmetUserOpenFeignClient {
      * @Description 单客户-获取用户最近访问网格
      * @Date 2020/8/3
      **/
-    @GetMapping(value = "epmetuser/gridlatest/latestgridinfo")
+    @PostMapping(value = "epmetuser/gridlatest/latestgridinfo")
     Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO);
 }

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

@@ -138,7 +138,7 @@ public class GridLatestController {
      * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
      * @Date 2020/8/3
      **/
-    @GetMapping("latestgridinfo")
+    @PostMapping("latestgridinfo")
     public Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
         return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
     }