skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/controller/UserCollectController.java
@@ -98,5 +98,12 @@ return R.data(userCollectService.getMyCollect(userId)); } /** * 获取我的收藏的水库 */ @PostMapping("/getMyCollectVO") @ApiOperation(value = "获取我的收藏的水库", notes = "获取我的收藏的水库") public R getMyCollectVO(String userId){ return R.data(userCollectService.getMyCollectVO(userId)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java
@@ -1,10 +1,8 @@ package cn.gistack.sm.collect.mapper; import cn.gistack.sm.collect.vo.CollectVO; import cn.gistack.sm.collect.entity.UserCollect; import cn.gistack.sm.feedback.entity.Feedback; import cn.gistack.sm.feedback.vo.FeedbackVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,4 +10,5 @@ public interface UserCollectMapper extends BaseMapper<UserCollect> { String getMyCollect(@Param("userId") String userId); List<CollectVO> getMyCollectVO(@Param("userId") String userId); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml
@@ -27,7 +27,39 @@ </select> <select id="getMyCollectVO" resultType="cn.gistack.sm.collect.vo.CollectVO"> SELECT SRUC.res_id, arb."name" as resName, arb."eng_scal" as engScal, arb."res_reg_code" as resRegCode, arb."res_type" as resType, case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode, case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName, case when town."ad_grad" = 3 THEN town."ad_code" when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode, case when town."ad_grad" = 3 THEN town."ad_name" when county."ad_grad" = 3 THEN county."ad_name" END AS countyName, case when town."ad_grad" = 2 THEN town."ad_code" when county."ad_grad" = 2 THEN county."ad_code" ELSE city."ad_code" END AS cityCode, case when town."ad_grad" = 2 THEN town."ad_name" when county."ad_grad" = 2 THEN county."ad_name" ELSE city."ad_name" END AS cityName FROM YWXT.SM_RES_USER_COLLECT SRUC LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = SRUC.RES_ID LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = arb."interior_ad_guid" LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code" LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code" LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code" WHERE SRUC.STATUS = 1 AND IS_DELETED = 0 AND USER_ID = #{userId} </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/IUserCollectService.java
@@ -1,11 +1,10 @@ package cn.gistack.sm.collect.service; import cn.gistack.sm.collect.vo.CollectVO; import cn.gistack.sm.collect.entity.UserCollect; import cn.gistack.sm.feedback.entity.Feedback; import cn.gistack.sm.feedback.vo.FeedbackVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import java.util.List; /** * @PROJECT_NAME: skjcmanager @@ -18,4 +17,7 @@ String getMyCollect(String userId); String updateCollect(UserCollect userCollect); List<CollectVO> getMyCollectVO(String userId); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java
@@ -1,5 +1,6 @@ package cn.gistack.sm.collect.service.impl; import cn.gistack.sm.collect.vo.CollectVO; import cn.gistack.sm.collect.entity.UserCollect; import cn.gistack.sm.collect.mapper.UserCollectMapper; import cn.gistack.sm.collect.service.IUserCollectService; @@ -7,9 +8,10 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.stereotype.Service; import java.util.List; @Service public class UserCollectServiceImpl extends BaseServiceImpl<UserCollectMapper, UserCollect> implements IUserCollectService { @@ -46,5 +48,10 @@ return baseMapper.getMyCollect(userCollect.getUserId()); } @Override public List<CollectVO> getMyCollectVO(String userId) { return baseMapper.getMyCollectVO(userId); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/vo/CollectVO.java
New file @@ -0,0 +1,29 @@ package cn.gistack.sm.collect.vo; import lombok.Data; @Data public class CollectVO { //水库名称 private String resName; //水库编码 private String resId; private String resType; //市 private String cityCode; private String cityName; //区 private String countyCode; private String countyName; //乡镇 private String townCode; private String townName; //管理行政区 //工程规模 private String engScal; //注册登记号 private String resRegCode; }
