2020/3/10

src/main/java/com/yc/education/controller/WxLoginController.java

@@ -133,6 +133,18 @@ public class WxLoginController extends BaseController {
                         rows = wxLoginService.update(wxlogin);
                         UserInfo user = userInfoService.getUserInfoByUid(token);
                         user.setModifiedDate(new Date( ));
+
+                        String url = MapUtils.getRegeoUrl(user.getLongitude( ) + "," + user.getLatitude( ));
+                        String jsonStr = MapUtils.sendGet(url);
+                        String province1 = MapUtils.getProvince(jsonStr);    //市区
+                        String city1 = MapUtils.getCity(jsonStr);    //市区
+                        String district1 = MapUtils.getDistrict(jsonStr);
+                        String street1 = MapUtils.getAddressNameByGeocoder(jsonStr);//详细 地址
+                        user.setProvince(province1);
+                        user.setCity(city1);
+                        user.setDistrict(district1);
+                        user.setStreet(street1);
+
                         userInfoService.updateNotNull(user);
                         //登录日志
                         iLoginLogService.saveLoginLog(user.getId( ));
@@ -153,6 +165,18 @@ public class WxLoginController extends BaseController {
                         userInfo.setStatus(CommonCons.USER_INFO_STATUS_ZERO);
                         userInfo.setCreateDate(new Date( ));
                         userInfo.setModifiedDate(new Date( ));
+
+                        String url = MapUtils.getRegeoUrl(userInfo.getLongitude( ) + "," + userInfo.getLatitude( ));
+                        String jsonStr = MapUtils.sendGet(url);
+                        String province1 = MapUtils.getProvince(jsonStr);    //市区
+                        String city1 = MapUtils.getCity(jsonStr);    //市区
+                        String district1 = MapUtils.getDistrict(jsonStr);
+                        String street1 = MapUtils.getAddressNameByGeocoder(jsonStr);//详细 地址
+                        userInfo.setProvince(province1);
+                        userInfo.setCity(city1);
+                        userInfo.setDistrict(district1);
+                        userInfo.setStreet(street1);
+
                         userInfoService.insertUseGeneratedKeys(userInfo);
                         rows = wxLoginService.insert(wxlogin);
                         //系统消息提示

src/main/java/com/yc/education/controller/admin/ActivityNewsController.java

@@ -202,7 +202,7 @@ public class ActivityNewsController {
 
         if (imgStr.length > 3) {   //图片个数大于3，返回操作失败
 
-            return ViewUtil.returnview(0, "activityNewsList.html", "活动资讯列表");
+            return ViewUtil.returnview(0, "activityNewsList.html", "图片超过三张");
         }
 
         int row = iActivityNewsService.updateNotNull(activityNews);//修改

src/main/java/com/yc/education/controller/admin/BannerTableController.java

@@ -0,0 +1,23 @@
+package com.yc.education.controller.admin;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * @ClassName BannerTableController
+ * @Description TODO
+ * @Author QuZhangJing
+ * @Date 2020/3/9 15:48
+ * @Version 1.0
+ */
+@Controller
+@RequestMapping("admin")
+public class BannerTableController {
+
+    @RequestMapping("bannerTable.html")
+    public ModelAndView bannerTable(){
+        return new ModelAndView();
+    }
+
+}

src/main/java/com/yc/education/controller/admin/UserInfoAdminController.java

@@ -1,5 +1,6 @@
 package com.yc.education.controller.admin;
 
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yc.education.model.Authentication;
 import com.yc.education.model.Provider;
@@ -8,6 +9,7 @@ import com.yc.education.service.IAuthenticationService;
 import com.yc.education.service.IProviderService;
 import com.yc.education.service.IUdaService;
 import com.yc.education.service.IUserInfoService;
+import com.yc.education.util.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -141,12 +143,28 @@ public class   UserInfoAdminController {
             district = null;
         }
 
-        Integer offset = (pageNum-1) * pageSize;
 
-        List<UserInfo> listOwnerCarInfo  = iUserInfoService.listOwnerCarInfo(province,city,nickName,phone,offset,pageSize);
-
-        int total = iUserInfoService.listOwnerCarInfo(province, city, nickName, phone, null, null).size( );
-        PageInfo< UserInfo > pager = new PageInfo<>( );
+        List<UserInfo> listOwnerCarInfo  = iUserInfoService.listOwnerCarInfo(province,city,district,nickName,phone,pageNum,pageSize);
+
+        /*for (UserInfo userinfo:listOwnerCarInfo){
+            String url = MapUtils.getRegeoUrl(userinfo.getLongitude( ) + "," + userinfo.getLatitude( ));
+            String jsonStr = MapUtils.sendGet(url);
+            String province1 = MapUtils.getProvince(jsonStr);    //市区
+            String city1 = MapUtils.getCity(jsonStr);    //市区
+            if ("[]".equals(city1)){
+                city1=province1;
+            }
+            String district1 = MapUtils.getDistrict(jsonStr);
+            String street1 = MapUtils.getAddressNameByGeocoder(jsonStr);//详细 地址
+            userinfo.setProvince(province1);
+            userinfo.setCity(city1);
+            userinfo.setDistrict(district1);
+            userinfo.setStreet(street1);
+            iUserInfoService.updateNotNull(userinfo);
+        }*/
+
+        /*int total = iUserInfoService.listOwnerCarInfo(province, city,district, nickName, phone, null, null).size( );*/
+       /* PageInfo< UserInfo > pager = new PageInfo<>( );
         pager.setList(listOwnerCarInfo);
         pager.setTotal(total);
         int jy = (total-1)/pageSize+1 >= 8 ? 8:(total-1)/pageSize+1;
@@ -164,8 +182,8 @@ public class   UserInfoAdminController {
         int nextPage = zym - pageNum > 0 ? pageNum +1 : pageNum;
         int prePage = pageNum!= 1 ? pageNum - 1 : 1;
         pager.setPrePage(prePage);
-        pager.setNextPage(nextPage);
-        mav.addObject("pageInfo",pager);
+        pager.setNextPage(nextPage);*/
+        mav.addObject("pageInfo", new PageInfo<UserInfo>(listOwnerCarInfo));
         mav.addObject("province",province);
         mav.addObject("city",city);
         mav.addObject("district",district);

src/main/java/com/yc/education/mapper/UserInfoMapper.java

@@ -53,7 +53,7 @@ public interface UserInfoMapper extends MyMapper<UserInfo> {
      * @param nickName
      * @return
      */
-    List<UserInfo> listOwnerCarInfo(@Param("province") String province ,@Param("city") String city,@Param("nickName") String nickName,@Param("phone") String phone,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
+    List<UserInfo> listOwnerCarInfo(@Param("province") String province ,@Param("city") String city,@Param("district")String district,@Param("nickName") String nickName,@Param("phone") String phone,@Param("offset") Integer offset,@Param("pageSize") Integer pageSize);
     List<UserInfo> listOwnerCarInfo();
 
     /**

src/main/java/com/yc/education/model/UserInfo.java

@@ -106,12 +106,10 @@ public class UserInfo implements Serializable {
     /**
      * 省
      */
-    @Transient
     private String province;      //后台车主信息展示省市区三列，2019/10/28  wzq
     /**
      * 市
      */
-    @Transient
     private String city;
 
     /**
@@ -121,9 +119,15 @@ public class UserInfo implements Serializable {
     /**
      * 区
      */
-    @Transient
+
     private String district;
 
+    /**
+     * 街道
+     */
+    private String street;
+
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -294,6 +298,15 @@ public class UserInfo implements Serializable {
         this.district = district;
     }
 
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
     public String getNewCity( ) {
         return newCity;
     }
@@ -302,6 +315,8 @@ public class UserInfo implements Serializable {
         this.newCity = newCity;
     }
 
+
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();

src/main/java/com/yc/education/service/IUserInfoService.java

@@ -69,7 +69,7 @@ public interface IUserInfoService  extends IService<UserInfo>  {      //继承
      * @param pageSize
      * @return
      */
-    List<UserInfo> listOwnerCarInfo(String province ,String city,String nickName, String phone,Integer offset, Integer pageSize);
+    List<UserInfo> listOwnerCarInfo(String province ,String city,String district,String nickName, String phone,Integer offset, Integer pageSize);
 
     List<UserInfo> listOwnerCarInfo();
 

src/main/java/com/yc/education/service/impl/UserInfoServiceImpl.java

@@ -137,8 +137,9 @@ public class UserInfoServiceImpl extends BaseService<UserInfo> implements IUserI
      * @return
      */
     @Override
-    public List<UserInfo> listOwnerCarInfo(String province ,String city,String nickName, String phone, Integer offset, Integer pageSize) {
-        return userInfoMapper.listOwnerCarInfo(province,city,nickName,phone,offset,pageSize);
+    public List<UserInfo> listOwnerCarInfo(String province ,String city,String district,String nickName, String phone, Integer offset, Integer pageSize) {
+        PageHelper.startPage(offset,pageSize);
+        return userInfoMapper.listOwnerCarInfo(province,city,district,nickName,phone,offset,pageSize);
     }
 
     @Override

src/main/resources/config.properties

@@ -1,6 +1,6 @@
 # \u6570\u636E\u5E93\u914D\u7F6E
 jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://116.62.214.30/nvrnetwork_test113?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://116.62.214.30/nvrnetwork?useUnicode=true&characterEncoding=utf-8
 #jdbc.url = jdbc:mysql://192.168.1.122:3306/vcchain
 jdbc.user=root
 #jdbc.password = root

src/main/resources/mapper/UserInfoMapper.xml

@@ -26,6 +26,8 @@
 
         <result column="province" property="province" jdbcType="VARCHAR"/>
         <result column="city" property="city" jdbcType="VARCHAR"/>
+        <result column="dictrict" property="district" jdbcType="VARCHAR"/>
+        <result column="street" property="street" jdbcType="VARCHAR"/>
         <result column="new_city" property="newCity" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -122,9 +124,9 @@
     </select>
     <!--查询车主信息并分页-->
     <select id="listOwnerCarInfo" resultMap="BaseResultMap">
-        select a.*,b.province,b.city from user_info a,uda b
+        select a.* from user_info a
         <where>
-            a.role = 0 and a.id = b.user_id
+            a.role = 0
             <if test="nickName != null and nickName != ''">
                 and a.nick_Name like concat('%',#{nickName},'%')
             </if>
@@ -132,15 +134,18 @@
                 and phone = #{phone}
             </if>
             <if test="province != null and province != ''">
-                and b.province = #{province}
+                and a.province = #{province}
             </if>
             <if test="city != null and city != ''">
-                and b.city = #{city}
+                and a.city = #{city}
+            </if>
+            <if test="district != null and district != ''">
+                and a.district = #{district}
             </if>
             order by a.create_date desc
-            <if test="offset != null">
+           <!-- <if test="offset != null">
                 limit #{offset} ,#{pageSize}
-            </if>
+            </if>-->
         </where>
     </select>
     <!--查询服务商信息-->

src/main/webapp/WEB-INF/jsp/admin/activityNewsList.jsp

@@ -80,7 +80,7 @@
                 <th width="80" ><input  id="checked_all"   type="checkbox"  >全选</th>
                 <th width="80">资讯类型</th>
                 <th width="80">资讯标签</th>
-                <th width="80">资讯名称</th>
+                <th width="180">资讯名称</th>
                 <th width="70">浏览量</th>
                 <th width="100">是否置顶</th>
                 <th width="100">广告设置</th>
@@ -103,9 +103,9 @@
                             ${activity.tagName}
                     </td>
 
-                    <td class="text-l">
+                    <td class="text-l"title="${activity.title}">
                         <div style="overflow: hidden;-o-text-overflow: ellipsis;
-                        text-overflow: ellipsis;white-space: nowrap;display: block"><%--将超出字体用....代替--%>
+                        text-overflow: ellipsis;white-space: nowrap;display: block" ><%--将超出字体用....代替--%>
                                 ${activity.title}
                         </div>
                     </td>

src/main/webapp/WEB-INF/jsp/admin/activityNewsUpdate.jsp

@@ -43,6 +43,7 @@
     <script type="text/javascript" src="${pageContext.request.contextPath}/static/admin/js/messages_zh.min.js"></script>
     <script type="text/javascript"
             src="${pageContext.request.contextPath}/static/admin/icheck/jquery.icheck.min.js"></script>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/static/js/ajaxfileupload.js"></script>
     <%--<script src="${pageContext.request.contextPath}/static/admin/manage/js/WdatePicker.js"></script>--%>
 
     <!-- 百度文本编辑器   引用文件 -->

src/main/webapp/WEB-INF/jsp/admin/index.jsp

@@ -269,7 +269,6 @@
                     <%-- <li><a data-href="privilegeList.html" data-title="权限设置" href="javascript:void(0)">权限设置</a></li>--%>
                     <%--<li><a data-href="adminRoleTemplateList.html" data-title="角色权限" href="javascript:void(0)">角色权限</a></li>--%>
                     <%--<li><a data-href="1.html" data-title="管理员信息" href="javascript:void(0)">管理员信息</a></li>--%>
-                    <li><a data-href="wzqTest.html" data-title="吴志强" href="javascript:void(0)">吴志强</a></li>
                 </ul>
             </dd>
         </dl>
@@ -281,6 +280,7 @@
             <dd>
                 <ul>
                     <li><a data-href="bannerList.html" data-title="广告位" href="javascript:void(0)">广告位</a></li>
+                    <li><a data-href="bannerTable.html" data-title="广告表" href="javascript:void(0)">广告表</a></li>
                     <li><a data-href="bannerNumber.html" data-title="系统设置" href="javascript:void(0)">系统设置</a></li>
                     <li><a data-href="listCouponSet.html" data-title="优惠券管理" href="javascript:void(0)">优惠券管理</a></li>
                 </ul>

src/main/webapp/WEB-INF/jsp/admin/ownerCarList.jsp

@@ -100,6 +100,7 @@
                 <th width="100">省</th>
                 <th width="100">市</th>
                 <th width="100">区</th>
+                <th width="100">街道</th>
                 <th width="100">注册日期</th>
                 <th width="100">最后登录日期</th>
                <%-- <th width="100">修改日期</th>--%>
@@ -136,7 +137,7 @@
                     <td class="text-l">${userInfo.province}</td>
                     <td class="text-l">${userInfo.city}</td>
                     <td class="text-l">${userInfo.district}</td>
-
+                    <td class="text-1">${userInfo.street}</td>
                    <%-- <td class="text-l">
                         <c:choose>
                         <c:when test="${userInfo.email == null}">
@@ -177,26 +178,26 @@
                         <option value="50"<c:if test="${pageInfo.pageSize == '50'}">selected="selected"</c:if>>50</option>
                         <option value="100"<c:if test="${pageInfo.pageSize == '100'}">selected="selected"</c:if>>100</option>
                     </select>
-                    <li><a href="ownerCarList.html?nickName=${nickName}&pageNum=1&pageSize=${pageInfo.pageSize}">首页</a></li>
+                    <li><a href="ownerCarList.html?province=${province}&city=${city}&district=${district}&nickName=${nickName}&phone=${phone}&pageNum=1&pageSize=${pageInfo.pageSize}">首页</a></li>
                     <li class="prev"><a
-                            href="ownerCarList.html?nickName=${nickName}&pageNum=${pageInfo.prePage}&pageSize=${pageInfo.pageSize}">上一页</a>
+                            href="ownerCarList.html?province=${province}&city=${city}&district=${district}&nickName=${nickName}&phone=${phone}&pageNum=${pageInfo.prePage}&pageSize=${pageInfo.pageSize}">上一页</a>
                     </li>
                     <c:forEach items="${pageInfo.navigatepageNums}" var="nav">
                         <c:if test="${nav == pageInfo.pageNum}">
-                            <li><a href="ownerCarList.html?nickName=${nickName}&pageNum=${nav}&pageSize=${pageInfo.pageSize}"
+                            <li><a href="ownerCarList.html?province=${province}&city=${city}&district=${district}&nickName=${nickName}&phone=${phone}&pageNum=${nav}&pageSize=${pageInfo.pageSize}"
                                      <c:if test="${pageNum == pageInfo.pageNum}"> class="active" </c:if>>${nav}</a></li>
                         </c:if>
                         <c:if test="${nav != pageInfo.pageNum}">
                             <li>
-                                <a href="ownerCarList.html?nickName=${nickName}&pageNum=${nav}&pageSize=${pageInfo.pageSize}">${nav}</a>
+                                <a href="ownerCarList.html?province=${province}&city=${city}&district=${district}&nickName=${nickName}&phone=${phone}&pageNum=${nav}&pageSize=${pageInfo.pageSize}">${nav}</a>
                             </li>
                         </c:if>
                     </c:forEach>
                     <li class="next"><a
-                            href="ownerCarList.html?nickName=${nickName}&pageNum=${pageInfo.nextPage}&pageSize=${pageInfo.pageSize}">下一页</a>
+                            href="ownerCarList.html?province=${province}&city=${city}&district=${district}&nickName=${nickName}&phone=${phone}&pageNum=${pageInfo.nextPage}&pageSize=${pageInfo.pageSize}">下一页</a>
                     </li>
                     <li>
-                        <a href="ownerCarList.html?nickName=${nickName}&pageNum=${pageInfo.pages }&pageSize=${pageInfo.pageSize}">末页</a>
+                        <a href="ownerCarList.html?province=${province}&city=${city}&district=${district}&nickName=${nickName}&phone=${phone}&pageNum=${pageInfo.pages }&pageSize=${pageInfo.pageSize}">末页</a>
                     </li>
                 </ul>
             </div>