Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -495,4 +495,14 @@ public class CommConstant {
      * 户型图
      */
     public static final String BUILDING_IMG_APARMENT = "aparment";
+    
+    /**
+     * 高德地图url
+     */
+	public static final String AMAP_HTTP = "https://restapi.amap.com/v3/geocode/regeo";
+    
+    /**
+     * 高德地图key
+     */
+    public static final String AMAP_KEY = "14f05ce59c26364fd0674014dc0d8b1b";
 }

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

@@ -245,11 +245,17 @@ public class TaShareActivityController extends BaseController {
         try{
             Integer orgId = getOrgId(request);
             Integer sumPoints = taPersonService.sumPointsByOrgId(orgId);
+            sumPoints = sumPoints == null ? 0 : sumPoints;
             QueryWrapper<TaPerson> taPersonWrapper = new QueryWrapper<>();
             taPersonWrapper.eq("org_id", orgId);
             Integer personNum = taPersonService.count(taPersonWrapper);
             TaShareActivity taShareActivity = new TaShareActivity();
-            taShareActivity.setAverageScore(sumPoints/personNum);
+            if (personNum == 0){
+                taShareActivity.setAverageScore(0);
+            }else{
+                taShareActivity.setAverageScore(sumPoints/personNum);
+            }
+
             responseBean.addSuccess(taShareActivity);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -171,4 +171,22 @@ public class TdCityController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 根据经纬度查询城市ID
+     * 经度在前，纬度在后，经纬度间以“,”分割，经纬度小数点后不要超过 6 位
+     * @return
+     */
+    @RequestMapping(value="/wx/location/city",method= RequestMethod.GET)
+    public ResponseBean wxLocationCityDetail(@RequestParam(value = "location") String location,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TdCity tdCity = iTdCityService.getLocationCity(location);
+            responseBean.addSuccess(tdCity);
+        }catch (Exception e){
+            logger.error("tdCityList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java

@@ -42,7 +42,8 @@ public class CustomerStatisticTimeJob extends BaseController {
      *
      * 开启定时任务，每天23:50执行
      */
-    @Scheduled(cron = "00 50 23 * * ?")
+    //@Scheduled(cron = "00 50 23 * * ?")
+    @Scheduled(cron = "* 0/2 * * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();
     

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

@@ -19,4 +19,11 @@ public interface ITdCityService extends IService<TdCity> {
 
     // 微信端城市
     List<TdCity> selectWxCity(String leveltype,Integer orgId);
+	
+	/**
+	 * 根据经纬度获取城市详情信息
+	 * @param location
+	 * @return
+	 */
+	TdCity getLocationCity(String location);
 }

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

@@ -378,7 +378,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         taBuildingQuery.gt("status",-1);
         int orgNum= taBuildingMapper.selectCount(taBuildingQuery);
         if (orgNum >= taOrg.getBuildingNum()){
-            return ResponseBean.error("楼盘已超过最大限制", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("当前系统仅供维护"+taOrg.getBuildingNum()+"个项目，需要维护更多项目，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);

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

@@ -1,12 +1,16 @@
 package com.huiju.estateagents.service.impl;
 
+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.TdCity;
 import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TdCityMapper;
 import com.huiju.estateagents.service.ITdCityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
 
@@ -33,5 +37,31 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
         List<TdCity>  tdCityList= tdCityMapper.selectWxCity(orgId);
         return tdCityList;
     }
-
+    
+    /**
+     * 根据经纬度获取城市详情信息
+     *
+     * @param location
+     * @return
+     */
+    @Override
+    public TdCity getLocationCity(String location) {
+        //获取高德地图的坐标
+        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")){
+            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);
+            TdCity tdCity = tdCityMapper.selectOne(queryWrapper);
+            return tdCity;
+        }
+        return null;
+    }
+    
 }

src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml

@@ -58,5 +58,6 @@
         AND customer_type = #{customerType}
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
         AND date_format( create_date, '%Y-%m-%d' ) <= date_format( #{nowDate}, '%Y-%m-%d' )
+        order by `day`
     </select>
 </mapper>

src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml

@@ -54,5 +54,6 @@
         AND customer_type = #{customerType}
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
         AND date_format( create_date, '%Y-%m-%d' ) <= date_format( #{nowDate}, '%Y-%m-%d' )
+         order by `month`
     </select>
 </mapper>

src/test/java/com/huiju/estateagents/TdCityServiceImplTest.java

@@ -0,0 +1,30 @@
+package com.huiju.estateagents;
+
+import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.service.ITdCityService;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Transactional
+public class TdCityServiceImplTest {
+	
+	@Autowired
+	private ITdCityService iTdCityService;
+	
+	@Test
+	public void getLocationCity() {
+		TdCity locationCity = iTdCityService.getLocationCity("116.310003,39.991957");
+		//断言 对象不为null
+		Assert.assertNotNull(locationCity);
+		//断言获取的是北京市
+		Assert.assertEquals("北京市",locationCity.getName());
+	}
+}