加入查询地区接口供小程序使用

Api/src/main/java/com/java110/api/listener/area/ListAreasListener.java

@@ -0,0 +1,85 @@
+package com.java110.api.listener.area;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiListener;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.smo.app.IAppInnerServiceSMO;
+import com.java110.core.smo.common.IAreaInnerServiceSMO;
+import com.java110.dto.app.AppDto;
+import com.java110.dto.area.AreaDto;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import com.java110.utils.constant.ServiceCodeAppConstant;
+import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.api.app.ApiAppDataVo;
+import com.java110.vo.api.app.ApiAppVo;
+import com.java110.vo.api.area.ApiAreaDataVo;
+import com.java110.vo.api.area.ApiAreaVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 查询小区侦听类
+ */
+@Java110Listener("listAreasListener")
+public class ListAreasListener extends AbstractServiceApiListener {
+
+    @Autowired
+    private IAreaInnerServiceSMO areaInnerServiceSMOImpl;
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.LIST_AREAS;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.GET;
+    }
+
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        AreaDto areaDto = BeanConvertUtil.covertBean(reqJson, AreaDto.class);
+
+        List<ApiAreaDataVo> areas = BeanConvertUtil.covertBeanList(areaInnerServiceSMOImpl.getArea(areaDto),ApiAreaDataVo.class);
+
+
+        ApiAreaVo apiAreaVo = new ApiAreaVo();
+
+        apiAreaVo.setTotal(1);
+        apiAreaVo.setRecords(1);
+        apiAreaVo.setAreas(areas);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiAreaVo), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+
+    }
+
+    public IAreaInnerServiceSMO getAreaInnerServiceSMOImpl() {
+        return areaInnerServiceSMOImpl;
+    }
+
+    public void setAreaInnerServiceSMOImpl(IAreaInnerServiceSMO areaInnerServiceSMOImpl) {
+        this.areaInnerServiceSMOImpl = areaInnerServiceSMOImpl;
+    }
+}

AppFrontService/src/main/java/com/java110/app/smo/wxLogin/impl/WxLoginSMOImpl.java

@@ -151,8 +151,8 @@ public class WxLoginSMOImpl extends AppAbstractComponentSMO implements IWxLoginS
         }
 
         JSONObject realUserInfo = userResult.getJSONArray("users").getJSONObject(0);
-        userInfo.put("password", "");
         userInfo.putAll(realUserInfo);
+        userInfo.put("password", "");
 
         try {
             Map userMap = new HashMap();

CommonService/src/main/java/com/java110/common/dao/IAreaServiceDao.java

@@ -0,0 +1,17 @@
+package com.java110.common.dao;
+
+import com.java110.utils.exception.DAOException;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IAreaServiceDao {
+
+    /**
+     * 查询区域信息
+     * @param info bId 信息
+     * @return 应用信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getAreas(Map info) throws DAOException;
+}

CommonService/src/main/java/com/java110/common/dao/impl/AreaServiceDaoImpl.java

@@ -0,0 +1,42 @@
+package com.java110.common.dao.impl;
+
+import com.java110.common.dao.IAreaServiceDao;
+import com.java110.common.dao.IFileServiceDao;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.utils.exception.DAOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 应用服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("areaServiceDaoImpl")
+//@Transactional
+public class AreaServiceDaoImpl extends BaseServiceDao implements IAreaServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(AreaServiceDaoImpl.class);
+
+    /**
+     * 查询文件信息
+     * @param info bId 信息
+     * @return 应用信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getAreas(Map info) throws DAOException {
+
+        logger.debug("查询应用信息 入参 info : {}",info);
+
+        List<Map> businessAppInfos = sqlSessionTemplate.selectList("areaServiceDaoImpl.getAreas",info);
+
+        return businessAppInfos;
+    }
+
+
+
+}

CommonService/src/main/java/com/java110/common/smo/impl/AreaInnerServiceSMOImpl.java

@@ -0,0 +1,30 @@
+package com.java110.common.smo.impl;
+
+import com.java110.common.dao.IAreaServiceDao;
+import com.java110.common.dao.IFileServiceDao;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.core.smo.common.IAreaInnerServiceSMO;
+import com.java110.core.smo.file.IFileInnerServiceSMO;
+import com.java110.dto.area.AreaDto;
+import com.java110.dto.file.FileDto;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class AreaInnerServiceSMOImpl extends BaseServiceSMO implements IAreaInnerServiceSMO {
+
+    @Autowired
+    private IAreaServiceDao areaServiceDaoImpl;
+
+    @Override
+    public List<AreaDto> getArea(@RequestBody AreaDto areaDto) {
+
+        List<AreaDto> areas = BeanConvertUtil.covertBeanList(areaServiceDaoImpl.getAreas(BeanConvertUtil.beanCovertMap(areaDto)), AreaDto.class);
+
+        return areas;
+    }
+}

java110-bean/src/main/java/com/java110/dto/area/AreaDto.java

@@ -0,0 +1,100 @@
+package com.java110.dto.area;
+
+import com.java110.dto.PageDto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName AreaDto
+ * @Description 应用数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class AreaDto extends PageDto implements Serializable {
+
+    private int id;
+    private String areaCode;
+    private String areaName;
+    private String areaLevel;
+    private String parentAreaCode;
+    private String parentAreaName;
+    private String lon;
+    private String lat;
+    private String statusCd = "0";
+
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public String getAreaLevel() {
+        return areaLevel;
+    }
+
+    public void setAreaLevel(String areaLevel) {
+        this.areaLevel = areaLevel;
+    }
+
+    public String getParentAreaCode() {
+        return parentAreaCode;
+    }
+
+    public void setParentAreaCode(String parentAreaCode) {
+        this.parentAreaCode = parentAreaCode;
+    }
+
+    public String getParentAreaName() {
+        return parentAreaName;
+    }
+
+    public void setParentAreaName(String parentAreaName) {
+        this.parentAreaName = parentAreaName;
+    }
+
+    public String getLon() {
+        return lon;
+    }
+
+    public void setLon(String lon) {
+        this.lon = lon;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/vo/api/area/ApiAreaDataVo.java

@@ -0,0 +1,83 @@
+package com.java110.vo.api.area;
+
+import java.io.Serializable;
+
+public class ApiAreaDataVo implements Serializable {
+
+    private int id;
+    private String areaCode;
+    private String areaName;
+    private String areaLevel;
+    private String parentAreaCode;
+    private String parentAreaName;
+    private String lon;
+    private String lat;
+
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public String getAreaLevel() {
+        return areaLevel;
+    }
+
+    public void setAreaLevel(String areaLevel) {
+        this.areaLevel = areaLevel;
+    }
+
+    public String getParentAreaCode() {
+        return parentAreaCode;
+    }
+
+    public void setParentAreaCode(String parentAreaCode) {
+        this.parentAreaCode = parentAreaCode;
+    }
+
+    public String getParentAreaName() {
+        return parentAreaName;
+    }
+
+    public void setParentAreaName(String parentAreaName) {
+        this.parentAreaName = parentAreaName;
+    }
+
+    public String getLon() {
+        return lon;
+    }
+
+    public void setLon(String lon) {
+        this.lon = lon;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+
+
+}

java110-bean/src/main/java/com/java110/vo/api/area/ApiAreaVo.java

@@ -0,0 +1,18 @@
+package com.java110.vo.api.area;
+
+import com.java110.vo.MorePageVo;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ApiAreaVo extends MorePageVo implements Serializable {
+    List<ApiAreaDataVo> areas;
+
+    public List<ApiAreaDataVo> getAreas() {
+        return areas;
+    }
+
+    public void setAreas(List<ApiAreaDataVo> areas) {
+        this.areas = areas;
+    }
+}

java110-core/src/main/java/com/java110/core/smo/common/IAreaInnerServiceSMO.java

@@ -0,0 +1,28 @@
+package com.java110.core.smo.common;
+
+import com.java110.core.feign.FeignConfiguration;
+import com.java110.dto.area.AreaDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 查询地区信息
+ */
+@FeignClient(name = "common-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/areaApi")
+public interface IAreaInnerServiceSMO {
+
+    /**
+     * <p>查询地区</p>
+     *
+     * @return AreaDto 对象数据
+     */
+    @RequestMapping(value = "/getArea", method = RequestMethod.POST)
+    public List<AreaDto> getArea(@RequestBody AreaDto areaDto);
+
+
+}

java110-db/db/CommonService/create_city_area.sql

@@ -0,0 +1,12 @@
+create table city_area(
+  id int not null comment '主键ID',
+  area_code varchar(6) not null comment '城市编码',
+  area_name varchar(64) not null comment '城市名称',
+  area_level varchar(3) not null comment '101 省级 202 市州 303 区县',
+  parent_area_code varchar(6) not null comment '父级城市编码',
+  parent_area_name varchar(6) not null comment '父级城市编码',
+  lon varchar(12) not null comment '经度',
+  lat varchar(12) not null comment '维度',
+  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  status_cd varchar(1) not null default '0' comment '数据状态 0 有效 1失效'
+);

java110-db/src/main/resources/mapper/common/AreaServiceDaoImplMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="areaServiceDaoImpl">
+
+    <!--查询地区数据-->
+    <select id="getAreas" resultType="Map" parameterType="Map">
+        select
+            t.id ,
+            t.area_code areaCode,
+            t.area_name areaName,
+            t.area_level areaLevel,
+            t.parent_area_code parentAreaCode,
+            t.parent_area_name parentAreaName,
+            t.lon,
+            t.lat,
+            t.create_time createTime
+        from city_area t
+        where 1=1
+        <if test="areaCode != null and areaCode !=''">
+            and t.area_code = #{areaCode}
+        </if>
+        <if test="areaName != null and areaName != ''">
+            and t.area_name like concat('%',#{areaName},'%')
+        </if>
+        <if test="areaLevel != null and areaLevel !=''">
+            and t.area_level = #{areaLevel}
+        </if>
+        <if test="parentAreaCode != null and parentAreaCode !=''">
+            and t.parent_area_code = #{parentAreaCode}
+        </if>
+        <if test="parentAreaName != null and parentAreaName !=''">
+            and t.parent_area_name like concat('%',#{parentAreaName},'%')
+        </if>
+    </select>
+
+
+</mapper>

java110-utils/src/main/java/com/java110/utils/constant/ServiceCodeConstant.java

@@ -548,4 +548,9 @@ public class ServiceCodeConstant {
      */
     public static final String SERVICE_CODE_DICT_TYPE="dict.queryDict";
 
+    /**
+     * 查询 地区
+     */
+    public static final String LIST_AREAS = "app.listAreas";
+
 }