sysArea的xml,mapper,service初始化

暂时只支持武汉市

whepi-ui/templates/wuye/qiuzhu.ftl

@@ -10,8 +10,6 @@
         </div>
         <div class="weui-tab__panel">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
-                <div id="notitle">
-                </div>
                 <div class="weui-cells__title"></div>
                 <div class="weui-cells">
                     <a class="weui-cell weui-cell_access" href="javascript:dateSelect();">
@@ -26,15 +24,61 @@
             <#--<div class="weui-flex__item">-->
             <#--<div class="placeholder">今日新增</div>-->
             <#--<div class="">1</div>-->
+            <#--<div class="">1</div>-->
+            <#--<div class="">1</div>-->
             <#--</div>-->
             <#--<div class="weui-flex__item">-->
             <#--<div class="placeholder">今日已处理</div>-->
             <#--<div class="">2</div>-->
+            <#--<div class="">2</div>-->
+            <#--<div class="">2</div>-->
             <#--</div>-->
             <#--<div class="weui-flex__item">-->
             <#--<div class="placeholder">今日未处理</div>-->
             <#--<div class="">3</div>-->
+            <#--<div class="">3</div>-->
+            <#--<div class="">3</div>-->
+            <#--</div>-->
+            <#--</div>-->
+                <div class="weui-search-bar" id="search_bar">
+                    <form class="weui-search-bar__form">
+                        <div class="weui-search-bar__box">
+                            <i class="weui-icon-search"></i>
+                            <input type="search" class="weui-search-bar__input" id="search_input" placeholder="搜索"/>
+                            <a href="javascript:" class="weui-icon-clear" id="search_clear"></a>
+                        </div>
+                        <label for="search_input" class="weui-search-bar__label" id="search_text">
+                            <i class="weui-icon-search"></i>
+                            <span>搜索</span>
+                        </label>
+                    </form>
+                    <a href="javascript:" class="weui-search-bar__cancel-btn" id="search_cancel">取消</a>
+                </div>
+                <div id="userHelpList"></div>
+            <#--<div class="weui-cells__title">带说明、跳转的列表项</div>-->
+            <#--<div class="weui-cells">-->
+            <#--<a class="weui-cell weui-cell_access" href="javascript:;">-->
+            <#--<div class="weui-cell__bd">-->
+            <#--<p>cell standard</p>-->
+            <#--</div>-->
+            <#--<div class="weui-cell__bd">-->
+            <#--<p>cell standard</p>-->
+            <#--</div>-->
+            <#--<div class="weui-cell__bd">-->
+            <#--<p>cell standard</p>-->
+            <#--</div>-->
+            <#--</a>-->
+            <#--<a class="weui-cell weui-cell_access" href="javascript:;">-->
+            <#--<div class="weui-cell__bd">-->
+            <#--<p>cell</p>-->
+            <#--</div>-->
+            <#--<div class="weui-cell__bd">-->
+            <#--<p>cell standard</p>-->
+            <#--</div>-->
+            <#--<div class="weui-cell__bd">-->
+            <#--<p>cell standard</p>-->
             <#--</div>-->
+            <#--</a>-->
             <#--</div>-->
             </div>
         </div>

whepi-ui/templates/wuye/qiuzhu.js

@@ -1,7 +1,8 @@
 function qiuzhu_init() {
   //统计求助及处理数据
   analyData();
-  //求组信息列表
+  //求助信息列表
+  getQZList();
 }
 
 function analyData() {
@@ -14,7 +15,7 @@ function analyData() {
       console.log(data);
       if (data.data != null && data.data != undefined) {
         hasData = true;
-        getHelpData(data.data);
+        makeAnalyUi(data.data);
       } else {
 
       }
@@ -24,7 +25,7 @@ function analyData() {
   });
 }
 
-function getHelpData(data) {
+function makeAnalyUi(data) {
   $('#userHelpAnaly').append($('<div class="weui-flex"> \n' +
     '                   <div class="weui-flex__item">\n' +
     '                       <div class="placeholder">已解决总数</div>\n' +
@@ -41,6 +42,39 @@ function getHelpData(data) {
     '               </div>'));
 }
 
+function getQZList() {
+  $('#userHelpAnaly').empty();//清除节点
+  $.ajax({
+    url: '/wuye/userHelpAnaly1',
+    data: {queryDate: '2020-02-05', userId: 0},
+    type: 'GET',
+    success: function (data) {
+      console.log(data);
+      if (data.data != null && data.data != undefined) {
+        hasData = true;
+        makeListUi(data);
+      } else {
+
+      }
+    },
+    error: function () {
+    }
+  });
+}
+
+function makeListUi(data) {
+  $('#userHelpList').empty();
+  $('#userHelpList').append($('<div class="weui-cells">'));
+  data.data.forEach(function (v) {
+    $('#userHelpList').append($('<a class="weui-cell weui-cell_access" href="javascript:;">'));
+    $('#userHelpList').append($('<div class="weui-cell__bd"><p>' + v.totalDo + '</p></div>'));
+    $('#userHelpList').append($('<div class="weui-cell__bd"><p>' + v.totalDoing + '</p></div>'));
+    $('#userHelpList').append($('<div class="weui-cell__bd"><p>' + v.totalDonot + '</p></div>'));
+    $('#userHelpList').append($('</a>'));
+  });
+  $('#userHelpList').append($('</div>'));
+}
+
 //我的求助的页面展示
 function dateSelect() {
   weui.datePicker({

whepi-web/src/main/java/com/bofeng/controller/AdminAreaController.java

@@ -0,0 +1,60 @@
+package com.bofeng.controller;
+
+import com.bofeng.Consts;
+import com.bofeng.entity.Place;
+import com.bofeng.service.PlaceService;
+import com.google.common.base.Strings;
+import com.yvan.Model;
+import com.yvan.ModelOps;
+import com.yvan.mvc.Pd;
+import lombok.val;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.List;
+
+@RestController
+@RequiresPermissions(Consts.USER_TYPE_ADMIN)
+public class AdminAreaController {
+
+    @Autowired
+    private PlaceService placeService;
+
+    @GetMapping("/admin/place.html")
+    public ModelAndView placeView() {
+        return new ModelAndView("/admin/place.ftl");
+    }
+
+    @GetMapping("/admin/sysArea")
+    public Model<List<Place>> getArea() {
+        return Model.newSuccess(placeService.selectAll());
+    }
+
+    @PostMapping("/admin/place_addnew.json")
+    public ModelOps placeAddNew(@RequestBody Place place) {
+        val msg = placeService.insert(place);
+        if (Strings.isNullOrEmpty(msg)) {
+            return ModelOps.newSuccess();
+        }
+        return ModelOps.newFail(msg);
+    }
+
+    @PostMapping("/admin/place_edit")
+    public ModelOps placeEdit(@RequestBody Place place) {
+        val msg = placeService.updateById(place);
+        if (Strings.isNullOrEmpty(msg)) {
+            return ModelOps.newSuccess();
+        }
+        return ModelOps.newFail(msg);
+    }
+
+    @PostMapping("/admin/place_delete.json")
+    public ModelOps placeDelete(@Pd(name = "placeId", desc = "") Long placeId) {
+        return ModelOps.newSuccess(placeService.deleteById(placeId));
+    }
+}

whepi-web/src/main/java/com/bofeng/dao/SysAreaMapper.java

@@ -0,0 +1,23 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.SysArea;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface SysAreaMapper extends BaseMapper<SysArea> {
+
+    //暂时只显示湖北省
+    List<SysArea> selectProvince();
+
+    //暂时只显示湖北省下的城市
+    List<SysArea> selectCityByProvince();
+
+    //暂时只显示武汉市下的区
+    List<SysArea> selectAreaByCity();
+
+}

whepi-web/src/main/java/com/bofeng/entity/SysArea.java

@@ -0,0 +1,37 @@
+package com.bofeng.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@TableName("SYS_AREA")
+public class SysArea {
+
+    @ApiModelProperty("地区ID")
+    @TableId("AREA_ID")
+    private Long areaId;
+
+    @ApiModelProperty("省")
+    @TableField("PROVINCE")
+    private String province;
+
+    @ApiModelProperty("市")
+    @TableField("CITY")
+    private String city;
+
+    @ApiModelProperty("区")
+    @TableField("AREA")
+    private String area;
+
+    @ApiModelProperty("状态:1正常,0草稿,-1删除")
+    @TableField("STATUS")
+    private int status;
+
+}

whepi-web/src/main/java/com/bofeng/entity/SysAreaCom.java

@@ -0,0 +1,37 @@
+package com.bofeng.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@TableName("SYS_AREA")
+public class SysAreaCom {
+
+    @ApiModelProperty("地区ID")
+    @TableId("AREA_ID")
+    private Long areaId;
+
+    @ApiModelProperty("省")
+    @TableField("PROVINCE")
+    private String province;
+
+    @ApiModelProperty("市")
+    @TableField("CITY")
+    private String city;
+
+    @ApiModelProperty("区")
+    @TableField("AREA")
+    private String area;
+
+    @ApiModelProperty("状态:1正常,0草稿,-1删除")
+    @TableField("STATUS")
+    private int status;
+
+}

whepi-web/src/main/java/com/bofeng/entity/SysAreaStreet.java

@@ -0,0 +1,29 @@
+package com.bofeng.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+@TableName("SYS_AREA_STREET")
+public class SysAreaStreet {
+
+    @ApiModelProperty("街道ID")
+    @TableId("STREET_ID")
+    private Long streetId;
+
+    @ApiModelProperty("地区ID")
+    @TableField("AREA_ID")
+    private Long areaId;
+
+    @ApiModelProperty("状态:1正常,0草稿,-1删除")
+    @TableField("STATUS")
+    private int status;
+
+}

whepi-web/src/main/java/com/bofeng/service/SysAreaService.java

@@ -0,0 +1,42 @@
+package com.bofeng.service;
+
+import com.bofeng.dao.SysAreaMapper;
+import com.bofeng.entity.SysArea;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional(readOnly = true)
+public class SysAreaService {
+
+    @Autowired
+    private SysAreaMapper sysAreaMapper;
+
+    public String selectProvince() {
+        List<SysArea> lst = sysAreaMapper.selectProvince();
+        if (lst != null && lst.size() > 0) {
+            return lst.get(0).getProvince();
+        }
+        return "无省份数据";
+    }
+
+    public List<SysArea> selectCityByProvince() {
+        List<SysArea> lst = sysAreaMapper.selectCityByProvince();
+        if (lst != null && lst.size() > 0) {
+            return lst;
+        }
+        return null;
+    }
+
+    public List<SysArea> selectAreaByCity() {
+        List<SysArea> lst = sysAreaMapper.selectAreaByCity();
+        if (lst != null && lst.size() > 0) {
+            return lst;
+        }
+        return null;
+    }
+
+}

whepi-web/src/main/java/com/bofeng/wx/controller/WuYeController.java

@@ -1,6 +1,5 @@
 package com.bofeng.wx.controller;
 
-import com.bofeng.entity.QzTask;
 import com.bofeng.entity.UserHelpAnaly;
 import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskService;
@@ -8,7 +7,6 @@ import com.bofeng.service.WuYeService;
 import com.google.common.collect.Maps;
 import com.yvan.Model;
 import com.yvan.mvc.Pd;
-import com.yvan.platform.YvanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -37,9 +36,9 @@ public class WuYeController {
         queryParam.put("userId", "12345677");
         queryParam.put("statistics", "M");
 
-        List<QzTask> taskList = qzTaskService.selectAll(userId);
+//        List<QzTask> taskList = qzTaskService.selectAll(userId);
 //        List<sysUptownUnit> rbList = rbService.selectAll();
-        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+//        model.put("taskList", YvanUtil.toJsonPretty(taskList));
 //        model.put("rbList", YvanUtil.toJsonPretty(rbList));
 
         return new ModelAndView("/wuye/home.ftl", model);
@@ -71,4 +70,11 @@ public class WuYeController {
         return Model.newSuccess(wuYeService.queryUserHelpAnaly(userId, queryDate));
     }
 
+    @GetMapping("/wuye/userHelpAnaly1")
+    public Model<List<UserHelpAnaly>> taskQuery1(@Pd(name = "queryDate") String queryDate, @Pd(name = "userId") Long userId) {
+        List<UserHelpAnaly> lst = new ArrayList<>();
+        lst.add(wuYeService.queryUserHelpAnaly(userId, queryDate));
+        return Model.newSuccess(lst);
+    }
+
 }

whepi-web/src/main/resources/mapper/SysArea.xml

@@ -0,0 +1,16 @@
+<?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="com.bofeng.dao.SysAreaMapper">
+    <select id="selectProvince" resultType="com.bofeng.entity.SysArea">
+        select province from sys_area where province='湖北省' group by province
+    </select>
+
+    <select id="selectCityByProvince" resultType="com.bofeng.entity.SysArea">
+        SELECT * from sys_area where province='湖北省' and (area='市辖区' or city='省直辖县级行政区划' or area='恩施市')
+    </select>
+
+    <select id="selectAreaByCity" resultType="com.bofeng.entity.SysArea">
+        select * from sys_area where city='武汉市'
+    </select>
+
+</mapper>