diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java index 59c49028e..5cdfcf475 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerBaseInfoDAO.java @@ -2,10 +2,13 @@ package com.cool.store.dao; import com.cool.store.entity.HyPartnerBaseInfoDO; import com.cool.store.mapper.HyPartnerBaseInfoMapper; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; /** * @Author suzhuhong @@ -25,6 +28,13 @@ public class HyPartnerBaseInfoDAO { return hyPartnerBaseInfoMapper.insertSelective(record); } + public int batchInsert( List records){ + if (CollectionUtils.isEmpty(records)){ + return 0; + } + return hyPartnerBaseInfoMapper.batchInsert(records); + } + /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 @@ -57,6 +67,13 @@ public class HyPartnerBaseInfoDAO { return hyPartnerBaseInfoMapper.getByPartnerLineId(partnerLineId); } + public List getByPartnerLineIds(List partnerLineId){ + if (CollectionUtils.isEmpty(partnerLineId)){ + return new ArrayList<>(); + } + return hyPartnerBaseInfoMapper.getByPartnerLineIds(partnerLineId); + } + public Long getLineIdByIdCard(String idCard){ if (StringUtils.isEmpty(idCard)){ return null; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java index 2d47cdf3c..22f149762 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java @@ -3,6 +3,8 @@ package com.cool.store.mapper; import com.cool.store.entity.HyPartnerBaseInfoDO; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author zhangchenbiao * @date 2023-05-29 03:51 @@ -16,6 +18,8 @@ public interface HyPartnerBaseInfoMapper { */ int insertSelective(@Param("record") HyPartnerBaseInfoDO record); + int batchInsert(@Param("records") List records); + /** * * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 @@ -38,6 +42,9 @@ public interface HyPartnerBaseInfoMapper { HyPartnerBaseInfoDO getByPartnerLineId(@Param("partnerLineId") Long partnerLineId); + + List getByPartnerLineIds(@Param("partnerLineId") List partnerLineIds); + Long getLineIdByIdCard(@Param("idCard") String idCard); int cleanIdCardInfoByPartnerLineId(@Param("idCard") String idCard, diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml index a108097d9..b6415daac 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml @@ -27,6 +27,21 @@ id_card_photo_front, id_card_photo_black, live_address, user_portrait, status, latest_log_message, pass_reason, certify_file, create_time, update_time + + + insert into + hy_partner_base_info + ( + partner_id, + partner_line_id + ) + values + + (#{record.partnerId}, + #{record.partnerLineId} + + + insert into hy_partner_base_info @@ -142,6 +157,9 @@ + + + update hy_partner_base_info @@ -231,6 +249,19 @@ where partner_line_id = #{partnerLineId} + + - + insert into hy_partner_line_info ( diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/GaoDeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/GaoDeService.java new file mode 100644 index 000000000..0bf437cdc --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/GaoDeService.java @@ -0,0 +1,17 @@ +package com.cool.store.service; + +/** + * @Author suzhuhong + * @Date 2023/6/21 15:01 + * @Version 1.0 + */ +public interface GaoDeService { + + /** + * 根据经纬度生成图片 + * @param latitudeLongitude + * @return + */ + String getGaoDePicture(String latitudeLongitude); + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/GaoDeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/GaoDeServiceImpl.java new file mode 100644 index 000000000..e7704edf3 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/GaoDeServiceImpl.java @@ -0,0 +1,31 @@ +package com.cool.store.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.cool.store.service.GaoDeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; + +/** + * @Author suzhuhong + * @Date 2023/6/21 15:04 + * @Version 1.0 + */ +@Service +@Slf4j +public class GaoDeServiceImpl implements GaoDeService { + + @Resource + RestTemplate restTemplate; + @Override + public String getGaoDePicture(String latitudeLongitude) { + String url = "https://restapi.amap.com/v3/staticmap?location=120.21201,30.2084&zoom=10&size=750*300&markers=mid,,A:116.481485,39.990464&key=fb6332444cab4eba54655571dfc68f5b&markersStyle=-1"; + ResponseEntity forEntity = restTemplate.getForEntity(url, String.class); + String body = forEntity.getBody(); + log.info("--------------{}", JSONObject.toJSON(body)); + return body; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 4f9b18ed3..2f98fb61a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -29,6 +29,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.sql.Array; import java.text.MessageFormat; import java.util.*; import java.util.stream.Collectors; @@ -57,6 +58,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { EnterpriseUserService enterpriseUserService; @Resource AliyunService aliyunService; + @Resource + HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO; @Override public StageCountVO selectStagePendingCount(String userId) { @@ -141,6 +144,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { //过滤出已结束的线索 这块线索需要重新生成新的线索 List closeLineList = partnerLineInfoList.stream().filter(x -> x.getCloseTime() != null).collect(Collectors.toList()); List closeLineIdList = closeLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); + //已结束的线索 需要重新生成一条新的线索 List list = new ArrayList<>(); closeLineList.stream().forEach(x->{ @@ -153,6 +157,14 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { list.add(hyPartnerLineInfoDO); }); hyPartnerLineInfoDAO.batchInsert(list); + List hyPartnerBaseInfoDOS = new ArrayList<>(); + list.forEach(x->{ + HyPartnerBaseInfoDO newHyPartnerBaseInfoDO = new HyPartnerBaseInfoDO(); + newHyPartnerBaseInfoDO.setPartnerId(x.getPartnerId()); + newHyPartnerBaseInfoDO.setPartnerLineId(x.getId()); + hyPartnerBaseInfoDOS.add(newHyPartnerBaseInfoDO); + }); + hyPartnerBaseInfoDAO.batchInsert(hyPartnerBaseInfoDOS); //将老的线索置为删除状态 hyPartnerLineInfoDAO.batchDeleted(closeLineIdList); //没有结束的线索直接分配招商经理 @@ -160,7 +172,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { List otherLineIdList = otherLineList.stream().map(HyPartnerLineInfoDO::getId).collect(Collectors.toList()); hyPartnerLineInfoDAO.updateInvestmentManager(userId, otherLineIdList); - return null; + return Boolean.TRUE; } @Override diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java index 62ec2a36c..d2dd62549 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java @@ -25,6 +25,7 @@ import com.cool.store.response.ResponseResult; import com.cool.store.service.AliyunService; import com.cool.store.service.EnterpriseSyncService; import com.cool.store.service.EnterpriseUserService; +import com.cool.store.service.GaoDeService; import com.cool.store.vo.cuser.IdentityCardInfoVO; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -47,6 +48,8 @@ public class TestController { @Resource private EnterpriseUserService enterpriseUserService; @Resource + GaoDeService gaoDeService; + @Resource private ISVHttpRequest isvHttpRequest; @Resource private HyOpenAreaInfoMapper hyOpenAreaInfoMapper; @@ -239,4 +242,8 @@ public class TestController { return ResponseResult.success(enterpriseUserService.getDevelopmentByZoneId(zoneId)); } + @GetMapping("getGaoDePicture") + public ResponseResult getDevelopmentByZoneId(){ + return ResponseResult.success(gaoDeService.getGaoDePicture("")); + } }