Merge remote-tracking branch 'origin/dev_abandon_grid' into develop

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

@@ -121,57 +121,34 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 		JSONObject toResult = JSON.parseObject(data);
 		Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
 		if (null != toResult.get("code")) {
-			mapToResult.setCode((Integer) toResult.get("code"));
+			mapToResult.setCode(((Integer) toResult.get("code")).intValue());
 		}
 		if (!mapToResult.success()) {
 			logger.error(String.format("根据appId查询客户信息失败，对应appId->" + formDTO.getAppId()));
 			throw new RenException(mapToResult.getMsg());
 		}
-		Object publicCustomerResultDTO = mapToResult.getData();
+		Object PublicCustomerResultDTO = mapToResult.getData();
-		JSONObject json = JSON.parseObject(publicCustomerResultDTO.toString());
+		JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
-		Map map = (Map) json.get("customer");
+		Map<String, Object> map = (Map) json.get("customer");
 		PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
 		logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer);
 
 		//2.调用epmet-user服务，根据客户Id和用户Id查询最后一次访问记录
-		LatestGridInfoResultDTO result = null;
 		formDTO.setCustomerId(customer.getId());
-		Result<List<LatestGridInfoResultDTO>> userResult = epmetUserOpenFeignClient.latestGridList(formDTO);
+		Result<LatestGridInfoResultDTO> userResult = epmetUserOpenFeignClient.latestGridInfo(formDTO);
 		if (!userResult.success()) {
 			logger.error(String.format("居民端获取用户最近访问网格失败,接口入参客户Id->%s,appId->%s,调用epmet-user-server服务返回->%s", formDTO.getCustomerId(), formDTO.getAppId(), JSON.toJSONString(userResult)));
-			return result;
+			return null;
-		}
-
-		for (LatestGridInfoResultDTO girdInfo : userResult.getData()) {
-			try {
-				GridInfoCache grid = CustomerOrgRedis.getGridInfo(girdInfo.getGridId());
-				if (grid == null) {
-					logger.warn("latestGridInfo get gridInfo return null,gridId:{}", girdInfo.getGridId());
-					continue;
-				} else {
-					Integer abandonFlag = grid.getAbandonFlag();
-					if (NumConstant.ONE == abandonFlag) {
-						logger.warn("latestGridInfo gridId:{} has abandoned", girdInfo.getGridId());
-						continue;
-					} else {
-						result = girdInfo;
-						//匹配到了未弃用的网格 跳出
-						break;
-					}
-				}
-			} catch (Exception e) {
-				logger.warn("latestGridInfo get gridInfo exception,gridId:{}", girdInfo.getGridId());
-			}
 		}
-
 		// 查询注册网格的弃用状态
+		LatestGridInfoResultDTO result = userResult.getData();
 		Result<List<UserBaseInfoResultDTO>> userBaseInfo = epmetUserOpenFeignClient.queryUserBaseInfo(Arrays.asList(formDTO.getUserId()));
 		if (!userBaseInfo.success()){
 			throw new EpmetException("查询用户基本信息失败");
 		}
 		GridInfoCache grid = CustomerOrgRedis.getGridInfo(userBaseInfo.getData().get(NumConstant.ZERO).getRegisteredGridId());
 		if (grid != null) {
-			result.setRegisterGridStatus(grid.getAbandonFlag().compareTo(NumConstant.ONE) == NumConstant.ZERO ? true : false);
+			result.setRegisterGridStatus(grid.getAbandonFlag());
 		}
 		return result;
 	}

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

@@ -35,9 +35,4 @@ public class LatestGridInfoFormDTO implements Serializable {
      */
     private String userId;
 
-    /**
-     * 前n个 默认10
-     */
-    private Integer top = 10;
-
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java

@@ -24,8 +24,8 @@ public class LatestGridInfoResultDTO implements Serializable {
 	private String gridId;
 
 	/**
-	 * 居民注册网格弃用状态 true：弃用，false：正常使用
+	 * 居民注册网格弃用状态 1：弃用，0：正常使用
 	 */
-	private Boolean registerGridStatus = false;
+	private Integer registerGridStatus = 0;
 
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.feign;
 
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -259,7 +260,7 @@ public interface EpmetUserOpenFeignClient {
      * @Date 2020/8/3
      **/
     @PostMapping(value = "epmetuser/gridlatest/latestgridinfo")
-    Result<List<LatestGridInfoResultDTO>> latestGridList(@RequestBody LatestGridInfoFormDTO formDTO);
+    Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO);
 
     /**
      * @Description  查询工作人员的信息

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

@@ -180,7 +180,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<List<LatestGridInfoResultDTO>> latestGridList(LatestGridInfoFormDTO formDTO) {
+    public Result<LatestGridInfoResultDTO> latestGridInfo(LatestGridInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestGridInfo", formDTO);
     }
 

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

@@ -139,8 +139,8 @@ public class GridLatestController {
      * @Date 2020/8/3
      **/
     @PostMapping("latestgridinfo")
-    public Result<List<LatestGridInfoResultDTO>> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
+    public Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
-        return new Result<List<LatestGridInfoResultDTO>>().ok(gridLatestService.latestGridInfo(formDTO));
+        return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
     }
 
 }

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

@@ -73,5 +73,5 @@ public interface GridLatestDao extends BaseDao<GridLatestEntity> {
      * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
      * @Date 2020/8/3
      **/
-    List<LatestGridInfoResultDTO> selectLatestGridInfo(LatestGridInfoFormDTO formDTO);
+    LatestGridInfoResultDTO selectLatestGridInfo(LatestGridInfoFormDTO formDTO);
 }

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

@@ -139,5 +139,5 @@ public interface GridLatestService extends BaseService<GridLatestEntity> {
      * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
      * @Date 2020/8/3
      **/
-    List<LatestGridInfoResultDTO> latestGridInfo(LatestGridInfoFormDTO formDTO);
+    LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO);
 }

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

@@ -36,6 +36,7 @@ import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
+import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.service.GridLatestService;
 import com.epmet.util.ModuleConstant;
@@ -204,7 +205,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
      * @Date 2020/8/3
      **/
     @Override
-    public List<LatestGridInfoResultDTO> latestGridInfo(LatestGridInfoFormDTO formDTO) {
+    public LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO) {
 
         return baseDao.selectLatestGridInfo(formDTO);
     }

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

@@ -109,6 +109,6 @@
             AND gl.CUSTOMER_USER_ID = #{userId}
         ORDER BY
             gl.LATEST_TIME DESC
-            LIMIT #{top}
+            LIMIT 1
     </select>
 </mapper>