* 预选代码优化

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -27,6 +27,8 @@ import net.bytebuddy.asm.Advice;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
@@ -38,10 +40,15 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 @RestController
 @RequestMapping("/api/wx")
 public class MiniAppController extends BaseController {
+
+    private Logger logger = LoggerFactory.getLogger(MiniAppController.class);
+
     @Autowired
     private ITaPersonService taPersonService;
 
@@ -70,7 +77,7 @@ public class MiniAppController extends BaseController {
     private ITaBuildingDynamicService buildingDynamicService;
 
     @Autowired
-    private  ITaNewsService newsService;
+    private ITaNewsService newsService;
 
     @Autowired
     private ITaUserService userService;
@@ -101,15 +108,16 @@ public class MiniAppController extends BaseController {
      */
     @GetMapping(value = "/", produces = "text/plain;charset=utf-8")
     public String access(@RequestParam(name = "signature", required = false) String signature,
-                          @RequestParam(name = "timestamp", required = false) String timestamp,
-                          @RequestParam(name = "nonce", required = false) String nonce,
-                          @RequestParam(name = "echostr", required = false) String echostr) {
+                         @RequestParam(name = "timestamp", required = false) String timestamp,
+                         @RequestParam(name = "nonce", required = false) String nonce,
+                         @RequestParam(name = "echostr", required = false) String echostr) {
         return echostr;
     }
 
 
     /**
      * 小程序数据预拉取 https://developers.weixin.qq.com/miniprogram/dev/framework/ability/pre-fetch.html
+     *
      * @param appid
      * @param timestamp
      * @param token
@@ -153,7 +161,7 @@ public class MiniAppController extends BaseController {
         queryExt.eq("status", CommConstant.STATUS_NORMAL);
         List<TaCustomImg> taCustomImg = iTaCustomImgService.list(queryExt);
 
-        return ResponseBean.success(new HashMap<String, Object>(){{
+        return ResponseBean.success(new HashMap<String, Object>() {{
             put("miniapp", taMiniapp);
             put("org", taOrg);
             put("cityList", taOrgCityList);
@@ -175,7 +183,7 @@ public class MiniAppController extends BaseController {
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 
-         if (StringUtils.isBlank(code)) {
+        if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
         if (StringUtils.isBlank(appid)) {
@@ -191,18 +199,18 @@ public class MiniAppController extends BaseController {
         try {
             TaMiniapp miniapp = taMiniappService.getById(appid);
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
-            Integer orgId =miniapp.getOrgId();
+            Integer orgId = miniapp.getOrgId();
             Map<String, Object> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
             miniResp.put("unionid", session.getUnionid());
-            miniResp.put("name",miniapp.getName());
+            miniResp.put("name", miniapp.getName());
             miniResp.put("tpls", miniAppService.getTpls(appid));
 
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-            personQueryWrapper.eq("mini_openid",session.getOpenid());
-            personQueryWrapper.eq("org_id",orgId);
+            personQueryWrapper.eq("mini_openid", session.getOpenid());
+            personQueryWrapper.eq("org_id", orgId);
             int count = taPersonService.count(personQueryWrapper);
 
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
@@ -210,36 +218,36 @@ public class MiniAppController extends BaseController {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
 
-            if(null!=from&&from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count>0){
+            if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
                 // 校验是否点击过此人的分享
-                boolean checkPoint = checkSharePersonFrom(from,taPerson.getPersonId(),targetId,orgId);
-                if (checkPoint){
+                boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
+                if (checkPoint) {
                     // 添加积分
                     applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
                 }
             }
 
 
-            Map<Object,Object> map = new HashMap<>();
-            map.put("openId",session.getOpenid());
-            map.put("orgId",orgId);
-            map.put("personId",taPerson.getPersonId());
+            Map<Object, Object> map = new HashMap<>();
+            map.put("openId", session.getOpenid());
+            map.put("orgId", orgId);
+            map.put("personId", taPerson.getPersonId());
             miniResp.put("token", JWTUtils.newTokenByMap(map));
-            if(StringUtils.isEmpty(taPerson.getFromCode())){
+            if (StringUtils.isEmpty(taPerson.getFromCode())) {
                 taPerson.setFromCode(from);
             }
-            if(StringUtils.isEmpty(taPerson.getRecommendPerson())){
+            if (StringUtils.isEmpty(taPerson.getRecommendPerson())) {
                 taPerson.setRecommendPerson(recommender);
                 TaPerson type = taPersonService.getById(recommender);
-                if(null != type){
-                    if(!StringUtils.isEmpty(type.getPersonType())){
+                if (null != type) {
+                    if (!StringUtils.isEmpty(type.getPersonType())) {
                         taPerson.setRecommendPersonType(type.getPersonType());
                     }
                 }
             }
             taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
-            if(StringUtils.isNotBlank(from) &&StringUtils.isNotBlank(recommender) &&StringUtils.isNotBlank(targetId)){
+            if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
                 TaPerson recommenderPerson = taPersonService.getById(recommender);
                 taSharePersonFrom.setCreateDate(LocalDateTime.now());
@@ -248,43 +256,43 @@ public class MiniAppController extends BaseController {
                 taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
                 taSharePersonFrom.setTargetId(targetId);
                 taSharePersonFrom.setTargetType(from);
-                if(CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())){
+                if (CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())) {
                     taSharePersonFrom.setSharePerson(recommenderPerson.getUserId().toString());
-                }else {
+                } else {
                     taSharePersonFrom.setSharePerson(recommenderPerson.getPersonId());
                 }
                 QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
-                sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
-                if(from.equals("dynamic_share")){ // activity_share
+                sharePersonFromQueryWrapper.eq("person_id", taPerson.getPersonId());
+                if (from.equals("dynamic_share")) { // activity_share
                     //产品不认了
                     taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
                     TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
                     taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());
-                }else {
+                    sharePersonFromQueryWrapper.eq("building_id", buildingDynamic.getBuildingId());
+                } else {
                     taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
                 }
-                if (from.contains("card")){
+                if (from.contains("card")) {
                     // 因为targetId 是 personId ，需要查询出 userId
                     TaPerson person = taPersonService.getById(targetId);
 
                     QueryWrapper<TaPersonBuilding> personBuildingQueryWrapper = new QueryWrapper<>();
-                    personBuildingQueryWrapper.eq("user_id",person.getUserId());
+                    personBuildingQueryWrapper.eq("user_id", person.getUserId());
                     TaPersonBuilding personBuilding = personBuildingService.getOne(personBuildingQueryWrapper);
                     taSharePersonFrom.setBuildingId(personBuilding.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id",personBuilding.getBuildingId());
-                }else if (from.contains("news")){
+                    sharePersonFromQueryWrapper.eq("building_id", personBuilding.getBuildingId());
+                } else if (from.contains("news")) {
                     TaNews news = newsService.getById(targetId);
                     taSharePersonFrom.setBuildingId(news.getBuildingId());
-                    sharePersonFromQueryWrapper.eq("building_id",news.getBuildingId());
-                }else if (from.contains("building")){
+                    sharePersonFromQueryWrapper.eq("building_id", news.getBuildingId());
+                } else if (from.contains("building")) {
                     taSharePersonFrom.setBuildingId(targetId);
-                    sharePersonFromQueryWrapper.eq("building_id",targetId);
+                    sharePersonFromQueryWrapper.eq("building_id", targetId);
                 }
                 Integer isFirstTime = taSharePersonFromService.count(sharePersonFromQueryWrapper);
-                if(isFirstTime>0){
+                if (isFirstTime > 0) {
                     taSharePersonFrom.setIsFirstTime(false);
-                }else {
+                } else {
                     taSharePersonFrom.setIsFirstTime(true);
                 }
                 taSharePersonFromService.save(taSharePersonFrom);
@@ -296,10 +304,10 @@ public class MiniAppController extends BaseController {
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
             // 所有人员都返回 org yansen 2019-11-13 19:56:18
 //            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
-                QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
-                orgQueryWrapper.eq("org_id", orgId);
-                TaOrg org = taOrgService.getOne(orgQueryWrapper);
-                taPerson.setOrg(org);
+            QueryWrapper<TaOrg> orgQueryWrapper = new QueryWrapper<>();
+            orgQueryWrapper.eq("org_id", orgId);
+            TaOrg org = taOrgService.getOne(orgQueryWrapper);
+            taPerson.setOrg(org);
 //            }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);
@@ -311,8 +319,8 @@ public class MiniAppController extends BaseController {
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id", orgId);
             queryWrapper.eq("img_type", "auth");
-            List<TaCustomImg>  taCustomImgs = iTaCustomImgService.list(queryWrapper);
-            result.put("avatarAuth", CollectionUtils.isEmpty(taCustomImgs) ? false : "1".equals(taCustomImgs.get(0).getImgUrl()) ? true: false);
+            List<TaCustomImg> taCustomImgs = iTaCustomImgService.list(queryWrapper);
+            result.put("avatarAuth", CollectionUtils.isEmpty(taCustomImgs) ? false : "1".equals(taCustomImgs.get(0).getImgUrl()) ? true : false);
 
             String token = (String) miniResp.get("token");
             sysTokenService.saveToken(token);
@@ -321,11 +329,11 @@ public class MiniAppController extends BaseController {
             QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
             tdPointsRulesQueryWrapper.eq("org_id", orgId);
             List<TdPointsRules> rulesPointList = iTdPointsRulesService.list(tdPointsRulesQueryWrapper);
-            result.put("rulesPointList",rulesPointList);
+            result.put("rulesPointList", rulesPointList);
 
             // 定位城市
             String location = null == lon ? null : lon + "," + lat;
-            TdCity tdCity = iTdCityService.getLocationCity(location, orgId);
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, getPersonId(request));
             result.put("city", tdCity);
 
             return ResponseBean.success(result);
@@ -354,13 +362,13 @@ public class MiniAppController extends BaseController {
     }
 
     private boolean checkSharePersonFrom(String from, String personId, String targetId, Integer orgId) {
-        QueryWrapper<TaSharePersonFrom> queryWrapper =  new QueryWrapper<>();
-        queryWrapper.eq("target_type",from);
-        queryWrapper.eq("person_id",personId);
-        queryWrapper.eq("target_id",targetId);
-        queryWrapper.eq("org_id",orgId);
+        QueryWrapper<TaSharePersonFrom> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_type", from);
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.eq("target_id", targetId);
+        queryWrapper.eq("org_id", orgId);
         List<TaSharePersonFrom> list = taSharePersonFromService.list(queryWrapper);
-        if (list.size() > 0){
+        if (list.size() > 0) {
             return false;
         }
         return true;
@@ -432,7 +440,7 @@ public class MiniAppController extends BaseController {
         Map<String, Object> result = new HashMap<>();
         result.put("person", person);
         result.put("extraInfo", extraInfo);
-        result.put("miniApp",miniapp);
+        result.put("miniApp", miniapp);
 
         return ResponseBean.success(result);
     }
@@ -458,18 +466,18 @@ public class MiniAppController extends BaseController {
         // 更新用户绑定手机
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(),orgId);
+        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), orgId);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
-        cus.eq("phone",phoneNoInfo.getPhoneNumber());
+        QueryWrapper<TaRecommendCustomer> cus = new QueryWrapper<>();
+        cus.eq("phone", phoneNoInfo.getPhoneNumber());
         cus.orderByDesc("create_date");
         List<TaRecommendCustomer> customer = taRecommendCustomerService.list(cus);
-        if (customer.size()>0){
-            for(int i =0;i<customer.size();i++){
+        if (customer.size() > 0) {
+            for (int i = 0; i < customer.size(); i++) {
                 customer.get(i).setPersonId(person.getPersonId());
                 customer.get(i).setPicture(person.getAvatarurl());
                 customer.get(i).setCountry(person.getCountry());
@@ -478,7 +486,7 @@ public class MiniAppController extends BaseController {
             }
 //            TaRecommendCustomer customers = customer.get(0);
 
-            if(!taRecommendCustomerService.updateBatchById(customer)){
+            if (!taRecommendCustomerService.updateBatchById(customer)) {
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
 //            if(null != customers.getRecommendPerson()&&!StringUtils.isEmpty(customers.getRecommendPerson())&& StringUtils.isEmpty(person.getRecommendPerson())){
@@ -516,6 +524,7 @@ public class MiniAppController extends BaseController {
 
     /**
      * 生成二维码
+     *
      * @return
      */
     @PostMapping("/qrcode")
@@ -526,6 +535,7 @@ public class MiniAppController extends BaseController {
 
     /**
      * 获取二维码参数
+     *
      * @param serialNo
      * @return
      */
@@ -545,10 +555,10 @@ public class MiniAppController extends BaseController {
         }
     }
 
-    public Integer getOrgId(HttpServletRequest request){
+    public Integer getOrgId(HttpServletRequest request) {
 
         Map map = JWTUtils.getUserIdAndOrgId(request);
-        if (null != map && null != map.get("orgId")){
+        if (null != map && null != map.get("orgId")) {
             return Integer.valueOf(map.get("orgId").toString());
         }
 

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -234,37 +234,37 @@ public class TaHousingResourcesController extends BaseController {
             //此处处理我的预选，我的认筹，和我的锁定
             //我的预选记录
             QueryWrapper<TaPreselectionRecord> taPreselectionRecordQueryWrapper = new QueryWrapper<>();
-            taPreselectionRecordQueryWrapper.eq("org_id",orgId);
-            taPreselectionRecordQueryWrapper.eq("sales_batch_id",salesBatchId);
-            taPreselectionRecordQueryWrapper.eq("person_id",getPersonId(request));
-            taPreselectionRecordQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            taPreselectionRecordQueryWrapper.eq("org_id", orgId);
+            taPreselectionRecordQueryWrapper.eq("sales_batch_id", salesBatchId);
+            taPreselectionRecordQueryWrapper.eq("person_id", getPersonId(request));
+            taPreselectionRecordQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             List<TaPreselectionRecord> taPreselectionRecordList = taPreselectionRecordService.list(taPreselectionRecordQueryWrapper);
             //我的认筹记录
             QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
-            taRaiseRecordQueryWrapper.eq("org_id",orgId);
-            taRaiseRecordQueryWrapper.eq("sales_batch_id",salesBatchId);
-            taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
-            taRaiseRecordQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            taRaiseRecordQueryWrapper.eq("org_id", orgId);
+            taRaiseRecordQueryWrapper.eq("sales_batch_id", salesBatchId);
+            taRaiseRecordQueryWrapper.eq("person_id", getPersonId(request));
+            taRaiseRecordQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             List<TaRaiseRecord> taRaiseRecordList = taRaiseRecordService.list(taRaiseRecordQueryWrapper);
 
             //认筹记录对应的有效房源,我的锁定的房源也在里面
             QueryWrapper<TaRaiseHouse> taRaiseHouseQueryWrapper = new QueryWrapper<>();
-            taRaiseHouseQueryWrapper.in(taRaiseRecordList.size() > 0,"raise_record_id",taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
+            taRaiseHouseQueryWrapper.in(taRaiseRecordList.size() > 0, "raise_record_id", taRaiseRecordList.stream().map(TaRaiseRecord::getRaiseRecordId).collect(Collectors.toList()));
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(taRaiseHouseQueryWrapper);
 
             taHousingResourcesPOList.forEach(e -> {
                 taPreselectionRecordList.forEach(p -> {
                     //我的预选
-                    if (e.getHouseId().equals(p.getHouseId())){
+                    if (e.getHouseId().equals(p.getHouseId())) {
                         e.setMinePreselection("mine");
                     }
                 });
                 //我的认筹和锁定
                 taRaiseHouseList.forEach(r -> {
                     //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId())){
+                    if (e.getHouseId().equals(r.getHouseId())) {
                         e.setMineRaise("mine");
-                        if (r.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)){
+                        if (r.getHouseLockingStatus().equals(CommConstant.HOUSE_LOCKING_STATUS_LOCKED)) {
                             e.setMineLocked("mine");
                         }
                     }
@@ -332,7 +332,7 @@ public class TaHousingResourcesController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaHousingResourcesPO taHousingResourcesPO = iTaHousingResourcesService.getHousingDetailById(personId, houseId);
-            if (taHousingResourcesPO.getStatus() != null && taHousingResourcesPO.getStatus() == CommConstant.STATUS_NORMAL){
+            if (taHousingResourcesPO.getStatus() != null && taHousingResourcesPO.getStatus() == CommConstant.STATUS_NORMAL) {
                 responseBean.addSuccess(taHousingResourcesPO);
                 return responseBean;
             }
@@ -397,4 +397,25 @@ public class TaHousingResourcesController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 批量更新房源认筹基础热度
+     *
+     * @param housingResourcesList
+     * @param salesBatchId
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/house/batchUpdateRaiseHeat", method = RequestMethod.PUT)
+    public ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList,
+                                             Integer raiseHeat, Integer salesBatchId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaHousingResourcesService.batchUpdateRaiseHeat(housingResourcesList, raiseHeat, salesBatchId, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("batchUpdateRaiseHeat -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
 }

src/main/java/com/huiju/estateagents/controller/TaRaiseController.java

@@ -10,7 +10,6 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 import com.huiju.estateagents.service.ITaRaiseService;
-import com.huiju.estateagents.service.ITaSalesBatchService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/huiju/estateagents/controller/TdCityController.java

@@ -28,8 +28,8 @@ import java.util.List;
 
 /**
  * <p>
-    *  前端控制器
-    * </p>
+ * 前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2019-08-07
@@ -51,16 +51,17 @@ public class TdCityController extends BaseController {
 
     /**
      * 中心端城市
+     *
      * @return
      */
-    @RequestMapping(value="/center/tdCity",method= RequestMethod.GET)
-    public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype){
+    @RequestMapping(value = "/center/tdCity", method = RequestMethod.GET)
+    public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            List<TdCity> result = iTdCityService.selectCity(leveltype,"");
+            List<TdCity> result = iTdCityService.selectCity(leveltype, "");
             responseBean.addSuccess(result);
-        }catch (Exception e){
-            logger.error("tdCityList -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -69,8 +70,8 @@ public class TdCityController extends BaseController {
     /**
      * 业务端城市
      */
-    @RequestMapping(value="/admin/tdCityList/tdCity",method= RequestMethod.GET)
-    public ResponseBean adminTdCityList(HttpServletRequest request){
+    @RequestMapping(value = "/admin/tdCityList/tdCity", method = RequestMethod.GET)
+    public ResponseBean adminTdCityList(HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean<>();
         List<TaOrgCity> taOrgCityList = taOrgCityMapper.selectAdminTdCityList(getOrgId(request));
         responseBean.addSuccess(taOrgCityList);
@@ -80,10 +81,11 @@ public class TdCityController extends BaseController {
 
     /**
      * 查询列表
+     *
      * @return
      */
-    @RequestMapping(value="/wx/tdCity",method= RequestMethod.GET)
-    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype,HttpServletRequest request){
+    @RequestMapping(value = "/wx/tdCity", method = RequestMethod.GET)
+    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         String appId = request.getHeader("appId");
         try {
@@ -94,8 +96,8 @@ public class TdCityController extends BaseController {
             /**leveltype,暂时保留*/
             List<TdCity> result = iTdCityService.selectWxCity(leveltype, taMiniapp.getOrgId());
             responseBean.addSuccess(result);
-        }catch (Exception e){
-            logger.error("tdCityList -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -103,20 +105,21 @@ public class TdCityController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param tdCity 实体对象
      * @return
      */
-    @RequestMapping(value="/tdCity",method= RequestMethod.POST)
-    public ResponseBean tdCityAdd(@RequestBody TdCity tdCity){
+    @RequestMapping(value = "/tdCity", method = RequestMethod.POST)
+    public ResponseBean tdCityAdd(@RequestBody TdCity tdCity) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTdCityService.save(tdCity)){
+            if (iTdCityService.save(tdCity)) {
                 responseBean.addSuccess(tdCity);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
-            logger.error("tdCityAdd -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -124,20 +127,21 @@ public class TdCityController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/tdCity/{id}", method= RequestMethod.DELETE)
-    public ResponseBean tdCityDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/tdCity/{id}", method = RequestMethod.DELETE)
+    public ResponseBean tdCityDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTdCityService.removeById(id)){
+            if (iTdCityService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
-            logger.error("tdCityDelete -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -145,21 +149,22 @@ public class TdCityController extends BaseController {
 
     /**
      * 修改对象
+     *
      * @param tdCity 实体对象
      * @return
      */
-    @RequestMapping(value="/edit/tdCity/",method= RequestMethod.PUT)
+    @RequestMapping(value = "/edit/tdCity/", method = RequestMethod.PUT)
     public ResponseBean tdCityUpdate(@PathVariable List<TdCity> cities,
-                                        @RequestBody TdCity tdCity){
+                                     @RequestBody TdCity tdCity) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTdCityService.updateBatchById(cities)){
+            if (iTdCityService.updateBatchById(cities)) {
                 responseBean.addSuccess(tdCity);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
-            logger.error("tdCityUpdate -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -167,34 +172,36 @@ public class TdCityController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/tdCity/{id}",method= RequestMethod.GET)
-    public ResponseBean tdCityGet(@PathVariable Integer id){
+    @RequestMapping(value = "/tdCity/{id}", method = RequestMethod.GET)
+    public ResponseBean tdCityGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTdCityService.getById(id));
-        }catch (Exception e){
-            logger.error("tdCityDelete -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
-    
+
     /**
      * 根据经纬度查询城市ID
      * 经度在前，纬度在后，经纬度间以“,”分割，经纬度小数点后不要超过 6 位
+     *
      * @return
      */
-    @RequestMapping(value="/wx/location/city",method= RequestMethod.GET)
-    public ResponseBean wxLocationCityDetail(@RequestParam(value = "location") String location,HttpServletRequest request){
+    @RequestMapping(value = "/wx/location/city", method = RequestMethod.GET)
+    public ResponseBean wxLocationCityDetail(@RequestParam(value = "location") String location, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            TdCity tdCity = iTdCityService.getLocationCity(location, orgId);
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, null);
             responseBean.addSuccess(tdCity);
-        }catch (Exception e){
-            logger.error("tdCityList -=- {}",e.toString());
+        } catch (Exception e) {
+            logger.error("tdCityList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/java/com/huiju/estateagents/entity/TaPersonPositon.java

@@ -0,0 +1,86 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 人员表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPersonPositon implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.UUID)
+    private Integer id;
+
+    /**
+     * 人员ID
+     */
+    private String personId;
+
+    /**
+     * 精度
+     */
+    private String lon;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 城市编码
+     */
+    private String citycode;
+
+    /**
+     * 国家
+     */
+    private String country;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+}

src/main/java/com/huiju/estateagents/entity/TaRaise.java

@@ -131,5 +131,4 @@ public class TaRaise implements Serializable {
     @TableField(exist = false)
     private Integer remark;
 
-
 }

src/main/java/com/huiju/estateagents/mapper/TaHousingResourcesMapper.java

@@ -86,7 +86,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @param blockName
      * @param unitName
      * @param floorName
-     * @param roomName
+     * @param roomNamesa
      * @param apartmentId
      * @param status
      * @param houseId
@@ -98,4 +98,18 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
                                                    @Param("apartmentId") String apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
 
     List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId,@Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
+
+    /**
+     * 批量更新房源认筹基础认读
+     *
+     * @param housingResourcesList
+     * @param raiseHeat
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    Integer batchUpdateRaiseHeat(@Param("housingResourcesList") List<TaHousingResources> housingResourcesList,
+                                 @Param("raiseHeat") Integer raiseHeat,
+                                 @Param("salesBatchId") Integer salesBatchId,
+                                 @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonPositon;
 import com.huiju.estateagents.po.PersonPO;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.*;
@@ -24,7 +25,7 @@ import java.util.Map;
  */
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
-    List<Map<String,Object>> selectCardList(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("buildingId")String buildingId,@Param("orgId")Integer orgId);
+    List<Map<String, Object>> selectCardList(IPage<Map<String, Object>> page, @Param("personType") String personType, @Param("status") int status, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId);
 
     int setFieldIncrement(@Param("personId") String personId, @Param("field") String field, @Param("increment") int increment);
 
@@ -39,20 +40,21 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     TaPerson getById(@Param("personId") String personId);
 
 
-    List<String>getUserProjects(@Param("personId") Integer personId);
+    List<String> getUserProjects(@Param("personId") Integer personId);
 
     TaPerson selectByIdPerson(@Param("openid") String openid);
 
-    List<String> getConsultantByName(@Param("name")String name);
+    List<String> getConsultantByName(@Param("name") String name);
 
-    String getConsultantByTel(@Param("tel")String tel);
+    String getConsultantByTel(@Param("tel") String tel);
 
-    List<Map<String,Object>> selectCardListofMine(IPage<Map<String,Object>> page, @Param("personType") String personType, @Param("status") int status,@Param("personIds")List<String> personIds);
+    List<Map<String, Object>> selectCardListofMine(IPage<Map<String, Object>> page, @Param("personType") String personType, @Param("status") int status, @Param("personIds") List<String> personIds);
 
     //---------- 用户总数 start ------------
 
     /**
      * 总用户数
+     *
      * @return
      */
     @ResultType(Integer.class)
@@ -61,6 +63,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 总注册数
+     *
      * @return
      */
     @ResultType(Integer.class)
@@ -69,6 +72,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 渠道代理后台总用户数
+     *
      * @return
      */
     @ResultType(Integer.class)
@@ -77,6 +81,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 渠道代理后台总注册数
+     *
      * @return
      */
     @ResultType(Integer.class)
@@ -85,15 +90,17 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 根据时间段查询
+     *
      * @param personType
      * @return
      */
-    Integer selectRecentlyCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    Integer selectRecentlyCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     //---------- 用户总数 end ------------
 
     /**
      * 用户行为
+     *
      * @param personType
      * @param startDate
      * @param endDate
@@ -101,8 +108,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      */
     List<PersonPO> selectUserBehavior(@Param("org") Integer orgId,
                                       @Param("personType") String personType,
-                                      @Param("startDate")LocalDate startDate,
-                                      @Param("endDate")LocalDate endDate,
+                                      @Param("startDate") LocalDate startDate,
+                                      @Param("endDate") LocalDate endDate,
                                       @Param("buildingId") String buildingId,
                                       @Param("eventType") String eventType,
                                       @Param("event") String event,
@@ -110,25 +117,27 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 活跃用户数 / 最近新增的用户数
+     *
      * @param personType
      * @param dateType
      * @return
      */
-    List<Map<String, Object>> selectActiveUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectActiveUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     /**
      * 新增用户数
+     *
      * @param personType
      * @param startDate
      * @param endDate
      * @return
      */
-    List<Map<String, Object>> selectNewsUserCount(@Param("orgId") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectNewsUserCount(@Param("orgId") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     /**
      * 性别比例
-     *
-     *  据说 1 男  2 女
+     * <p>
+     * 据说 1 男  2 女
      *
      * @return
      */
@@ -138,6 +147,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 城市比例
+     *
      * @param personType
      * @return
      */
@@ -164,6 +174,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 用户来源 的饼图
+     *
      * @param recommendPersonType
      * @return
      */
@@ -171,33 +182,36 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 用户来源 柱状
+     *
      * @return
      */
-    List<Map<String, Object>> selectUserSourceColumnar(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectUserSourceColumnar(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     /**
      * 用户来源 数据列表
      */
-    List<Map<String,Object>> selectUserSourceData(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectUserSourceData(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     // ------------- 用户来源 end ------------
 
     @Update("UPDATE ta_person  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE person_id = #{newsId}")
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
 
-    IPage<TaPerson> getPersonList(IPage<TaPerson> page, @Param("personType")String personType, @Param("name") String name, @Param("phone") String phone,@Param("status") Integer status,@Param("buildingId") String buildingId,@Param("personTags") String personTags);
+    IPage<TaPerson> getPersonList(IPage<TaPerson> page, @Param("personType") String personType, @Param("name") String name, @Param("phone") String phone, @Param("status") Integer status, @Param("buildingId") String buildingId, @Param("personTags") String personTags);
 
     /**
      * 渠道下的经纪人
+     *
      * @param pg
      * @param name
      * @param phone
      * @return
      */
-    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone,@Param("orgid") Integer orgid,@Param("channelId") Integer channelId);
+    IPage<TaPerson> channelBrokerList(IPage<TaChannel> pg, @Param("name") String name, @Param("phone") String phone, @Param("orgid") Integer orgid, @Param("channelId") Integer channelId);
 
     /**
      * 渠道邀请经纪人
+     *
      * @param pg
      * @param id
      * @return
@@ -206,21 +220,31 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 获取用户总积分
+     *
      * @param orgId
      * @return
      */
     Integer sumPointsByOrgId(@Param("orgId") Integer orgId);
 
     //更新city拼音为cityId
-    void upDatePersonCityToId (@Param("personId")String personId);
+    void upDatePersonCityToId(@Param("personId") String personId);
 
     /**
      * 判断置业顾问绑定状态
+     *
      * @return
      */
     Integer judgeBindStatusByCondition(@Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("phone") String phone);
 
-    IPage<TaPerson> selectDriftCustomerPageList(IPage<TaPerson> page,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId,@Param("personEstateDrift") String personEstateDrift,@Param("sceneType") String sceneType);
+    IPage<TaPerson> selectDriftCustomerPageList(IPage<TaPerson> page, @Param("buildingId") String buildingId, @Param("orgId") Integer orgId, @Param("personEstateDrift") String personEstateDrift, @Param("sceneType") String sceneType);
 
-    int selectFromNum(@Param("orgId") Integer orgId,@Param("personType") String personType);
+    int selectFromNum(@Param("orgId") Integer orgId, @Param("personType") String personType);
+
+    /**
+     * 保存用户位置信息
+     *
+     * @param record
+     * @return
+     */
+    Integer savePersonPosition(TaPersonPositon record);
 }

src/main/java/com/huiju/estateagents/mapper/TaPreselectionRecordMapper.java

@@ -52,5 +52,5 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      * @param bo
      * @return
      */
-    List<TaPreselectionRecord> selectPreSelectRecordList(Page page, @Param("bo") PresecretRecordRequestBO bo);
+    List<TaPreselectionRecordPO> selectPreSelectRecordList(Page page, @Param("bo") PresecretRecordRequestBO bo);
 }

src/main/java/com/huiju/estateagents/mapper/TaSalesBatchMapper.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaHousingResources;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaSalesBatch;
 import org.apache.ibatis.annotations.Mapper;
@@ -40,4 +41,5 @@ public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
      * @return
      */
     Map<String, Object> getTotalHousesAndHeat(@Param("salesBatchId") Integer salesBatchId);
+
 }

src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java

@@ -113,4 +113,15 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @return
      */
     ResponseBean saveExcelValue(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId);
+
+    /**
+     * 批量更新认筹基础数据
+     *
+     * @param housingResourcesList
+     * @param raiseHeat
+     * @param salesBatchId
+     * @param orgId
+     * @return
+     */
+    ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList,Integer raiseHeat, Integer salesBatchId, Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITaPersonService.java

@@ -8,6 +8,7 @@ import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.entity.TaPersonPositon;
 
 import java.util.List;
 import java.util.Map;
@@ -23,15 +24,15 @@ import java.util.Map;
 public interface ITaPersonService extends IService<TaPerson> {
     TaPerson mergePersonWxInfo(WxMaUserInfo userInfo);
 
-    TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId);
+    TaPerson updatePersonPhone(String miniOpenid, String phone, Integer orgId);
 
-    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize,String buildingId,Integer orgId);
+    IPage<Map<String, Object>> getCardList(int pageNumber, int pageSize, String buildingId, Integer orgId);
 
     ResponseBean checkPhoneAndPass(String phone, String pass);
 
     ResponseBean resetPassword(String phone, String pass, String plat);
 
-    ResponseBean getCardDetail(String openid, String id,String personId);
+    ResponseBean getCardDetail(String openid, String id, String personId);
 
     ResponseBean resgiteAgent(String name, String phone, Integer sex, String explain, String openid);
 
@@ -41,11 +42,11 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     TaPerson getPersonByTel(String userPhone);
 
-    IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone,Integer status,String buildingId,String personTags);
+    IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone, Integer status, String buildingId, String personTags);
 
-    IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize,String buildingId);
+    IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize, String buildingId);
 
-    TaPerson newPersonByOpenid(String openid,Integer orgId);
+    TaPerson newPersonByOpenid(String openid, Integer orgId);
 
     ResponseBean bindCard(String phone, String pass, String openid);
 
@@ -53,33 +54,35 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     ResponseBean editConsultant(String id, String paramStr);
 
-    Map<String,Object> getExtraInfo(String personId);
+    Map<String, Object> getExtraInfo(String personId);
 
     List<TaPerson> getPersonsByOpenId(String openid);
 
-    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId, String sceneType);
+    IPage<TaPerson> getDriftCustomerList(int pageNumber, int pageSize, String building, Integer orgId, String sceneType);
 
     String getPersonIdByCustomerId(String customerId);
 
-    IPage<Map<String,Object>> getSavedConsaultants(int pageNumber, int pageSize,String personId);
+    IPage<Map<String, Object>> getSavedConsaultants(int pageNumber, int pageSize, String personId);
 
 
     List<TaPersonBuilding> getPersonBuildings(String personId);
 
-    String agentCodeGenerator ();
+    String agentCodeGenerator();
 
     Integer sumPointsByOrgId(Integer orgId);
 
     /**
      * 渠道管理下的经纪人
+     *
      * @param name
      * @param phone
      * @return
      */
-    ResponseBean channelBrokerList(String name, String phone,Integer pageNum,Integer pageSize,Integer orgid,Integer channelId);
+    ResponseBean channelBrokerList(String name, String phone, Integer pageNum, Integer pageSize, Integer orgid, Integer channelId);
 
     /**
      * 渠道下邀请经纪人
+     *
      * @param id
      * @param phone
      * @param pageNum
@@ -89,14 +92,23 @@ public interface ITaPersonService extends IService<TaPerson> {
     ResponseBean InviteClientsList(String id, String phone, Integer pageNum, Integer pageSize);
 
     //更新city拼音为cityId
-    void upDatePersonCityToId (String personId);
+    void upDatePersonCityToId(String personId);
 
     Integer judgeBindStatusByCondition(Integer userId, Integer orgId, String phone);
 
     /**
      * 第三方获取人员信息接口
+     *
      * @param personId
      * @return
      */
     ResponseBean ThirdUserInfo(String personId);
+
+    /**
+     * 保存用户位置信息
+     *
+     * @param record
+     * @return
+     */
+    Integer savePersonPosition(TaPersonPositon record);
 }

src/main/java/com/huiju/estateagents/service/ITdCityService.java

@@ -8,22 +8,23 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author jobob
  * @since 2019-08-07
  */
 public interface ITdCityService extends IService<TdCity> {
-    List<TdCity> selectCity(String leveltype,String status);
+    List<TdCity> selectCity(String leveltype, String status);
 
     // 微信端城市
     List<TdCity> selectWxCity(String leveltype, Integer orgId);
-	
-	/**
-	 * 根据经纬度获取城市详情信息
-	 * @param location
-	 * @return
-	 */
-	TdCity getLocationCity(String location, Integer orgId);
+
+    /**
+     * 根据经纬度获取城市详情信息
+     *
+     * @param location
+     * @return
+     */
+    TdCity getLocationCity(String location, Integer orgId, String personId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

@@ -419,9 +419,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 String floorName = row.getCell(3).getStringCellValue().trim();
 
                 String roomName = "";
-                try{
+                try {
                     roomName = row.getCell(4).getStringCellValue().trim();
-                }catch (Exception e){
+                } catch (Exception e) {
                     String roomNameString = String.valueOf(row.getCell(4).getNumericCellValue());
                     roomName = roomNameString.substring(0, roomNameString.indexOf("."));
                 }
@@ -429,7 +429,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 BigDecimal price;
                 try {
                     price = BigDecimal.valueOf(row.getCell(5).getNumericCellValue());
-                }catch (Exception e){
+                } catch (Exception e) {
                     price = new BigDecimal(row.getCell(5).getStringCellValue());
                 }
 
@@ -438,7 +438,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                     String heatString = String.valueOf(row.getCell(6).getNumericCellValue());
                     String split = heatString.substring(0, heatString.indexOf("."));
                     heat = Integer.valueOf(split);
-                }catch (Exception e){
+                } catch (Exception e) {
                     String heatString = row.getCell(6).getStringCellValue();
                     heat = Integer.valueOf(heatString);
                 }
@@ -548,6 +548,17 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         return ResponseBean.success(list);
     }
 
+    @Override
+    public ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList, Integer raiseHeat, Integer salesBatchId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        if (taHousingResourcesMapper.batchUpdateRaiseHeat(housingResourcesList, raiseHeat, salesBatchId, orgId) > 0) {
+            responseBean.addSuccess("success");
+        } else {
+            responseBean.addError("fail");
+        }
+        return responseBean;
+    }
+
     //更新房号
     private void updateRoom(TaHousingResources taHousingResources) {
         TaBuildingRoom taBuildingRoom = new TaBuildingRoom();

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -810,6 +810,11 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return ResponseBean.success(map);
     }
 
+    @Override
+    public Integer savePersonPosition(TaPersonPositon record) {
+        return taPersonMapper.savePersonPosition(record);
+    }
+
 
     public String codeGenerator (){
         double r = Math.random();

src/main/java/com/huiju/estateagents/service/impl/TaPreselectionRecordServiceImpl.java

@@ -219,7 +219,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     public ResponseBean selectPreSelectRecordList(PresecretRecordRequestBO recordRequestBO, Integer pageNum, Integer pageSize) {
         Page page = new Page(pageNum, pageSize);
         // 分页查询
-        List<TaPreselectionRecord> list = taPreselectionRecordMapper.selectPreSelectRecordList(page, recordRequestBO);
+        List<TaPreselectionRecordPO> list = taPreselectionRecordMapper.selectPreSelectRecordList(page, recordRequestBO);
         page.setRecords(list);
         return ResponseBean.success(page);
     }

src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java

@@ -4,19 +4,26 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonPositon;
 import com.huiju.estateagents.entity.TdCity;
 import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TdCityMapper;
 import com.huiju.estateagents.service.ITdCityService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author jobob
@@ -24,20 +31,26 @@ import java.util.List;
  */
 @Service
 public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> implements ITdCityService {
+
+    private Logger logger = LoggerFactory.getLogger(TdCityServiceImpl.class);
+
     @Autowired
     TdCityMapper tdCityMapper;
 
-    public List<TdCity> selectCity(String leveltype,String status){
+    @Autowired
+    private TaPersonServiceImpl taPersonService;
+
+    public List<TdCity> selectCity(String leveltype, String status) {
         return tdCityMapper.selectCity(leveltype, status);
     }
 
 
     @Override
     public List<TdCity> selectWxCity(String leveltype, Integer orgId) {
-        List<TdCity>  tdCityList= tdCityMapper.selectWxCity(orgId);
+        List<TdCity> tdCityList = tdCityMapper.selectWxCity(orgId);
         return tdCityList;
     }
-    
+
     /**
      * 根据经纬度获取城市详情信息
      *
@@ -45,38 +58,65 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
      * @return
      */
     @Override
-    public TdCity getLocationCity(String location, Integer orgId) {
+    public TdCity getLocationCity(String location, Integer orgId, String personId) {
         if (null == location) {
             return tdCityMapper.getOrgDefaultCity(orgId);
         }
 
         //获取高德地图的坐标
-        String amapString = CommConstant.AMAP_HTTP + "?location="+location+"&key=" + CommConstant.AMAP_KEY;
+        String amapString = CommConstant.AMAP_HTTP + "?location=" + location + "&key=" + CommConstant.AMAP_KEY;
         RestTemplate restTemplate = new RestTemplate();
         String forObject = restTemplate.getForObject(amapString, String.class);
         JSONObject jsonObject = JSONObject.parseObject(forObject);
         //返回城市信息
-        if (jsonObject.getString("status").equals("1")){
+        if (jsonObject.getString("status").equals("1")) {
             JSONObject addressComponent = jsonObject.getJSONObject("regeocode").getJSONObject("addressComponent");
             String citycode = addressComponent.getString("citycode");
             QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("citycode",citycode);
-            queryWrapper.eq("leveltype",2);
+            queryWrapper.eq("citycode", citycode);
+            queryWrapper.eq("leveltype", 2);
             List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
-            if (tdCities.size() > 0){
+            if (tdCities.size() > 0) {
                 List<TdCity> cityList = selectWxCity(null, orgId);
                 Integer cityId = tdCities.get(0).getId();
-                for (TdCity tdCity : cityList){
-                    if (tdCity.getId().equals(cityId)){
+                for (TdCity tdCity : cityList) {
+                    if (tdCity.getId().equals(cityId)) {
                         return tdCity;
                     }
                 }
             }
 //            return null;
+
+            // 保存用户位置信息
+            if (StringUtils.isNotBlank(personId)) {
+                ExecutorService threadPool = Executors.newCachedThreadPool();
+                threadPool.execute(() -> {
+                    TaPersonPositon record = new TaPersonPositon();
+                    try {
+                        String[] locationArr = location.split(",");
+                        String address = jsonObject.getJSONObject("regeocode").getString("formatted_address");
+                        record.setPersonId(personId);
+                        record.setLon(locationArr[0]);
+                        record.setLat(locationArr[1]);
+                        record.setCitycode(citycode);
+                        record.setCountry(addressComponent.getString("country"));
+                        record.setProvince(addressComponent.getString("province"));
+                        record.setCity(addressComponent.getString("city"));
+                        record.setDistrict(addressComponent.getString("district"));
+                        record.setAddress(address);
+                        record.setCreateTime(LocalDateTime.now());
+                        Integer positionResult = taPersonService.savePersonPosition(record);
+                        logger.info("保存用户位置信息返回：{}", positionResult);
+                    } catch (Exception e) {
+                        logger.error("保存用户位置信息 异常：", e);
+                    }
+                });
+            }
+
         }
 
         // 没有匹配到则返回默认城市
         return tdCityMapper.getOrgDefaultCity(orgId);
     }
-    
+
 }

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -27,10 +27,10 @@ import java.util.Map;
 @Service
 public class WxPayServiceImpl implements IWxPayService {
 
-    @Value("${pay-notify}")
+//    @Value("${pay-notify}")
     private String payNotify;
 
-    @Value("${pay-refund}")
+//    @Value("${pay-refund}")
     private String payRefund;
 
     @Autowired

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -4,92 +4,92 @@
 
     <select id="listHousingResources" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
-          *
+        *
         FROM
-          (
+        (
         SELECT
-            t.house_id,
-            (
-            CASE
-            WHEN ( SELECT num_char_extract ( t.term_name, 2 ) + 0 ) = 0 THEN
-            ( SELECT num_char_extract ( t.term_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.term_name, 2 ) + 0 )
-            END
-            ) termNamePre,
-            (
-            CASE
-            WHEN ( SELECT num_char_extract ( t.block_name, 2 ) + 0 ) = 0 THEN
-            ( SELECT num_char_extract ( t.block_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.block_name, 2 ) + 0 )
-            END
-            ) blockNamePre,
-            (
-            CASE
-            WHEN ( SELECT num_char_extract ( t.unit_name, 2 ) + 0 ) = 0 THEN
-            ( SELECT num_char_extract ( t.unit_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.unit_name, 2 ) + 0 )
-            END
-            ) unitNamePre,
-            t.building_id,
-            t.block_id,
-            t.block_name,
-            t.sales_batch_id,
-            t.unit_id,
-            t.unit_name,
-            t.floor_id,
-            t.floor_name,
-            t.room_id,
-            t.room_name,
-            t.price,
-            t.heat,
-            t.real_heat,
-            t.apartment_id,
-            t.`status`,
-            t.org_id,
-            t2.inside_area,
-            t2.building_area,
-            t2.apartment_name,
-            t3.term_id,
-            t.term_name,
-            t.raise_heat,
-            t.raise_real_heat,
-            t.house_locking_status
+        t.house_id,
+        (
+        CASE
+        WHEN ( SELECT num_char_extract ( t.term_name, 2 ) + 0 ) = 0 THEN
+        ( SELECT num_char_extract ( t.term_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.term_name, 2 ) + 0 )
+        END
+        ) termNamePre,
+        (
+        CASE
+        WHEN ( SELECT num_char_extract ( t.block_name, 2 ) + 0 ) = 0 THEN
+        ( SELECT num_char_extract ( t.block_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.block_name, 2 ) + 0 )
+        END
+        ) blockNamePre,
+        (
+        CASE
+        WHEN ( SELECT num_char_extract ( t.unit_name, 2 ) + 0 ) = 0 THEN
+        ( SELECT num_char_extract ( t.unit_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.unit_name, 2 ) + 0 )
+        END
+        ) unitNamePre,
+        t.building_id,
+        t.block_id,
+        t.block_name,
+        t.sales_batch_id,
+        t.unit_id,
+        t.unit_name,
+        t.floor_id,
+        t.floor_name,
+        t.room_id,
+        t.room_name,
+        t.price,
+        t.heat,
+        t.real_heat,
+        t.apartment_id,
+        t.`status`,
+        t.org_id,
+        t2.inside_area,
+        t2.building_area,
+        t2.apartment_name,
+        t3.term_id,
+        t.term_name,
+        t.raise_heat,
+        t.raise_real_heat,
+        t.house_locking_status
         FROM
-          ta_housing_resources t
+        ta_housing_resources t
         LEFT JOIN ta_building_apartment t2 ON t.apartment_id = t2.apartment_id
         LEFT JOIN ta_building_block t3 ON t.block_id = t3.block_id
         WHERE
-            t.sales_batch_id = #{salesBatchId}
-            AND t.org_id = #{orgId}
-            <choose>
-                <when test=" endPrice != null and startPrice == null">
-                    AND t.price &lt;= #{endPrice}
-                </when>
-                <when test=" startPrice != null and endPrice == null">
-                    AND t.price &gt;= #{startPrice}
-                </when>
-                <when test="startPrice != null and endPrice != null ">
-                    AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
-                </when>
-                <otherwise>
-                </otherwise>
-            </choose>
-            <if test="apartmentId != null and apartmentId != ''">
-                AND t.apartment_id = #{apartmentId}
-            </if>
-            <choose>
-                <when test="type == 1">
-                    AND t.`status` > 0
-                </when>
-                <otherwise>
-                    AND t.`status` > -1
-                </otherwise>
-            </choose>
+        t.sales_batch_id = #{salesBatchId}
+        AND t.org_id = #{orgId}
+        <choose>
+            <when test=" endPrice != null and startPrice == null">
+                AND t.price &lt;= #{endPrice}
+            </when>
+            <when test=" startPrice != null and endPrice == null">
+                AND t.price &gt;= #{startPrice}
+            </when>
+            <when test="startPrice != null and endPrice != null ">
+                AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
+            </when>
+            <otherwise>
+            </otherwise>
+        </choose>
+        <if test="apartmentId != null and apartmentId != ''">
+            AND t.apartment_id = #{apartmentId}
+        </if>
+        <choose>
+            <when test="type == 1">
+                AND t.`status` > 0
+            </when>
+            <otherwise>
+                AND t.`status` > -1
+            </otherwise>
+        </choose>
 
-          ) t5
+        ) t5
         ORDER BY
-            t5.termNamePre,
-            t5.blockNamePre,
-            t5.unitNamePre,
-            ( SELECT num_char_extract ( t5.floor_name, 2 ) + 0 ) DESC,
-            ( SELECT num_char_extract ( t5.room_name, 2 ) + 0)
+        t5.termNamePre,
+        t5.blockNamePre,
+        t5.unitNamePre,
+        ( SELECT num_char_extract ( t5.floor_name, 2 ) + 0 ) DESC,
+        ( SELECT num_char_extract ( t5.room_name, 2 ) + 0)
     </select>
 
     <select id="listBuildApartmentBySalesBatchId" resultType="com.huiju.estateagents.entity.TaBuildingApartment">
@@ -136,39 +136,39 @@
 
     <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
-            t.house_id,
-            t.building_id,
-            t.block_id,
-            t.block_name,
-            t.sales_batch_id,
-            t.unit_id,
-            t.unit_name,
-            t.floor_id,
-            t.floor_name,
-            t.room_id,
-            t.room_name,
-            t.price,
-            t.heat,
-            t.real_heat,
-            t.apartment_id,
-            t.`status`,
-            t.org_id,
-            t.term_id,
-            t.term_name,
-            t2.apartment_name,
-            t2.inside_area,
-            t2.building_area,
-            t3.preselection_start_time,
-            t3.preselection_end_time,
-            t3.`status` saleBatchStatus,
-            t4.building_name buildingName
+        t.house_id,
+        t.building_id,
+        t.block_id,
+        t.block_name,
+        t.sales_batch_id,
+        t.unit_id,
+        t.unit_name,
+        t.floor_id,
+        t.floor_name,
+        t.room_id,
+        t.room_name,
+        t.price,
+        t.heat,
+        t.real_heat,
+        t.apartment_id,
+        t.`status`,
+        t.org_id,
+        t.term_id,
+        t.term_name,
+        t2.apartment_name,
+        t2.inside_area,
+        t2.building_area,
+        t3.preselection_start_time,
+        t3.preselection_end_time,
+        t3.`status` saleBatchStatus,
+        t4.building_name buildingName
         FROM
-            ta_housing_resources t
-            LEFT JOIN ta_building_apartment t2 ON t.apartment_id = t2.apartment_id
-            LEFT JOIN ta_sales_batch t3 ON t.sales_batch_id = t3.sales_batch_id
-            LEFT JOIN ta_building t4 ON t.building_id = t4.building_id
+        ta_housing_resources t
+        LEFT JOIN ta_building_apartment t2 ON t.apartment_id = t2.apartment_id
+        LEFT JOIN ta_sales_batch t3 ON t.sales_batch_id = t3.sales_batch_id
+        LEFT JOIN ta_building t4 ON t.building_id = t4.building_id
         WHERE
-            t.house_id = #{houseId}
+        t.house_id = #{houseId}
         <if test="type != null and type == '1' ">
             AND t.`status` = 1
             AND t3.`status` = 1
@@ -177,11 +177,11 @@
 
     <select id="getHouseResourceList" resultType="com.huiju.estateagents.entity.TaHousingResources">
         SELECT
-            t.* ,
-            a.apartment_name,
-            u.user_name as update_name
+        t.* ,
+        a.apartment_name,
+        u.user_name as update_name
         FROM
-            ta_housing_resources t
+        ta_housing_resources t
         LEFT JOIN ta_building_apartment a ON t.apartment_id = a.apartment_id
         LEFT JOIN ta_user u on t.update_user = u.user_id
         WHERE t.`status` > -1
@@ -221,4 +221,16 @@
         </foreach>
     </select>
 
+    <update id="batchUpdateRaiseHeat">
+        UPDATE ta_housing_resources t
+        SET t.raise_heat = #{raiseHeat}
+        WHERE
+        t.org_id = #{orgId}
+        AND t.sales_batch_id = #{salesBatchId}
+        AND t.house_id IN
+        <foreach collection="housingResourcesList" item="record" open="(" close=")" separator=",">
+            #{record.houseId}
+        </foreach>
+    </update>
+
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -596,4 +596,78 @@ FROM
             </if>
                 GROUP BY t.person_id) d
     </select>
+
+    <insert id="savePersonPosition" parameterType="com.huiju.estateagents.entity.TaPersonPositon">
+        insert into ta_person_position
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="personId != null">
+                person_id,
+            </if>
+            <if test="lon != null">
+                lon,
+            </if>
+            <if test="lat != null">
+                lat,
+            </if>
+            <if test="citycode != null">
+                citycode,
+            </if>
+            <if test="country != null">
+                country,
+            </if>
+            <if test="province != null">
+                province,
+            </if>
+            <if test="city != null">
+                city,
+            </if>
+            <if test="district != null">
+                district,
+            </if>
+            <if test="address != null">
+                address,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="personId != null">
+                #{personId,jdbcType=INTEGER},
+            </if>
+            <if test="lon != null">
+                #{lon,jdbcType=VARCHAR},
+            </if>
+            <if test="lat != null">
+                #{lat,jdbcType=VARCHAR},
+            </if>
+            <if test="citycode != null">
+                #{citycode},
+            </if>
+            <if test="country != null">
+                #{country},
+            </if>
+            <if test="province != null">
+                #{province},
+            </if>
+            <if test="city != null">
+                #{city},
+            </if>
+            <if test="district != null">
+                #{district},
+            </if>
+            <if test="address != null">
+                #{address},
+            </if>
+            <if test="createTime != null">
+                #{createTime}
+            </if>
+        </trim>
+    </insert>
 </mapper>