Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-doc/login.sql

@@ -193,6 +193,7 @@ DROP TABLE IF EXISTS out_scan;
 CREATE TABLE out_scan  (
   scan_id           bigint(20) NOT NULL DEFAULT 0 COMMENT '扫码ID',
   user_id           bigint(20) NOT NULL DEFAULT 0 COMMENT '人员会ID',
+  uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID,下拉选ID',
   door_id           bigint(20) NOT NULL DEFAULT 0 COMMENT '小区大门ID',
   into_date         datetime(0) NOT NULL DEFAULT '0000-01-01 00:00:00' COMMENT '进入时间',
   out_date          datetime(0) NOT NULL DEFAULT '0000-01-01 00:00:00' COMMENT '出去时间',

whepi-ui/templates/yeweihui/tgPublish.ftl

@@ -26,7 +26,7 @@
         <input id="tg_input_deliver_time" type="text" placeholder="请选择时间" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
         前
         <p class="weui-media-box__desc" style="margin-top: 1vh;">服务电话：</p>
-        <input id="tg_input_phone_number" class="weui-input" autofocus="" type="text" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
+        <input id="tg_input_phone_number" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
         <div class="weui-btn-area">
             <a id="tg_publish" class="weui-btn weui-btn_primary" style="width: 30%;">
                 发布
@@ -102,6 +102,33 @@
             return;
         }
 
+        if (/^[0-9]+$/.test(price) == false) {
+            $.alert("价格请输入整数");
+            return;
+        }
+        if (price.length > 4) {
+            $.alert("价格最大为9999");
+            return;
+        }
+
+        if (/^[0-9]+$/.test(minnum) == false) {
+            $.alert("最低起送请输入整数");
+            return;
+        }
+        if (minnum.length > 4) {
+            $.alert("最低起送最大为9999");
+            return;
+        }
+
+        if (/^[0-9]+$/.test(maxnum) == false) {
+            $.alert("最大订量请输入整数");
+            return;
+        }
+        if (maxnum.length > 4) {
+            $.alert("最大订量最大为9999");
+            return;
+        }
+
         if (parseInt(minnum) <= 0) {
             $.alert("最低起送量应大于0");
             return;
@@ -132,6 +159,11 @@
             return;
         }
 
+        if (phone_number.length > 11) {
+            $.alert("请输入正确的联系方式");
+            return;
+        }
+
         console.log(
             "发布",
             title + "---" +

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

@@ -0,0 +1,11 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.OutScanConf;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OutScanConfMapper extends BaseMapper<OutScanConf> {
+}

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

@@ -0,0 +1,11 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.OutScan;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OutScanMapper extends BaseMapper<OutScan> {
+}

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

@@ -0,0 +1,17 @@
+package com.bofeng.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.bofeng.entity.UptownDoor;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface UptownDoorMapper extends BaseMapper<UptownDoor> {
+
+    @Select("select ud.door_id,u.uptown_id,u.uptown_name,ud.door_name from sys_uptown_door ud inner join " +
+            "sys_uptown u on u.uptown_id = ud.uptown_id where ud.door_id = #{doorId} and ud.status = 1")
+    UptownDoor getUptownDoorById(@Param("doorId") Long doorId);
+}

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

@@ -29,4 +29,8 @@ public interface UptownUnitMapper extends BaseMapper<UptownUnit> {
 
     List<UptownUnit> queryYiChangList(@Param("uptownId") Long uptownId, @Param("reportDate") String reportDate);
 
+    @Select("SELECT u.uptown_id,uu.ridgepole,uu.unit,uh.doorplate FROM sys_user_role ur INNER JOIN sys_uptown_house uh " +
+            "ON uh.house_id = ur.property_id INNER JOIN sys_uptown_unit uu ON uh.unit_id = uu.unit_id INNER JOIN " +
+            "sys_uptown u ON u.uptown_id = uu.uptown_id WHERE ur.user_id = #{userId} AND ur.role_id = 1")
+    UptownUnit getUptownUnitByUser(@Param("userId") Long userId);
 }

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

@@ -0,0 +1,54 @@
+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 org.joda.time.DateTime;
+
+/**
+ * 用户外出扫码信息
+ */
+@Getter
+@Setter
+@TableName("out_scan")
+public class OutScan {
+
+    @ApiModelProperty("扫码ID")
+    @TableId("scan_id")
+    private Long scanId;
+
+    @ApiModelProperty("用户ID")
+    @TableField("user_id")
+    private Long userId;
+
+    @ApiModelProperty("小区ID")
+    @TableField("uptown_id")
+    private Long uptownId;
+
+    @ApiModelProperty("小区大门ID")
+    @TableField("door_id")
+    private Long doorId;
+
+    @ApiModelProperty("进入时间")
+    @TableField("into_date")
+    private DateTime intoDate;
+
+    @ApiModelProperty("出去时间")
+    @TableField("out_date")
+    private DateTime outDate;
+
+    @TableField("user_create")
+    private Long userCreate;
+
+    @TableField(exist = false)
+    private DateTime timeCreate;
+
+    @TableField("user_update")
+    private Long userUpdate;
+
+    @TableField(exist = false)
+    private DateTime timeUpdate;
+}

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

@@ -0,0 +1,36 @@
+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 org.joda.time.DateTime;
+
+/**
+ * 用户外出扫码配置
+ */
+@Getter
+@Setter
+@TableName("out_scan_conf")
+public class OutScanConf {
+
+    @ApiModelProperty("扫码配置ID")
+    @TableId("sc_id")
+    private Long scId;
+
+    @ApiModelProperty("小区ID")
+    @TableField("uptown_id")
+    private Long uptownId;
+
+    @ApiModelProperty("进出间隔时间")
+    @TableField("go_out_fre")
+    private Long goOutFre;
+
+    @TableField(exist = false)
+    private DateTime timeCreate;
+
+    @TableField(exist = false)
+    private DateTime timeUpdate;
+}

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

@@ -0,0 +1,46 @@
+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 org.joda.time.DateTime;
+
+/**
+ * 小区大门表
+ */
+@Getter
+@Setter
+@TableName("sys_uptown_door")
+public class UptownDoor {
+
+    @ApiModelProperty("小区大门ID")
+    @TableId("door_id")
+    private Long doorId;
+
+    @ApiModelProperty("小区ID")
+    @TableField("uptown_id")
+    private Long uptownId;
+
+    @ApiModelProperty("小区大门名称")
+    @TableField("door_name")
+    private String doorName;
+
+    @ApiModelProperty("状态:1正常,0草稿,-1删除")
+    @TableField("status")
+    private Integer status;
+
+    @TableField(exist = false)
+    private DateTime timeCreate;
+
+    @TableField(exist = false)
+    private DateTime timeUpdate;
+
+    /**
+     * 小区名称
+     */
+    @TableField(exist = false)
+    private String uptownName;
+}

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

@@ -1,9 +1,64 @@
 package com.bofeng.wx.controller;
 
+import com.bofeng.dao.*;
+import com.bofeng.entity.*;
+import com.bofeng.service.HomeService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.yvan.platform.JsonWapper;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+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;
 
 @Api("进出扫码")
 @RestController
 public class ScanController {
+
+    @Autowired
+    private HomeService homeService;
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+    @Autowired
+    private UserOpenMapper userOpenMapper;
+    @Autowired
+    private UptownHomeMapper uptownHomeMapper;
+    @Autowired
+    private UptownUnitMapper uptownUnitMapper;
+    @Autowired
+    private UptownDoorMapper uptownDoorMapper;
+
+    @ApiOperation("进出扫码页面")
+    @GetMapping("/user/scan.html")
+    public ModelAndView home(ModelMap model, @RequestParam(value = "doorId", required = false, defaultValue = "0") Long doorId) {
+//        UserOpen userOpen = homeService.getUserOpen();
+//        List<UserRole> list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+        List<UserRole> list = userRoleMapper.getUserRoleByUserId(1L);
+        UserOpen userOpen = userOpenMapper.selectByUserId(1L);
+        model.put("user", userOpen);
+        model.put("user_id", "\"" + userOpen.getUserId() + "\"");
+        if (list.size() == 0) {
+            return new ModelAndView("/user/home.ftl", model);
+        } else {
+            UptownDoor uptownDoor = uptownDoorMapper.getUptownDoorById(doorId);
+            List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
+            UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userOpen.getUserId());
+            if (!unit.getUptownId().equals(uptownDoor.getUptownId())) {
+                model.put("type", "-1");
+                return new ModelAndView("/user/scan.ftl", model);
+            }
+            model.put("door", uptownDoor.getUptownName() + uptownDoor.getDoorName());
+            model.put("doorplate", unit.getRidgepole() + "栋" + unit.getUnit() + "单元" +unit.getDoorplate());
+            model.put("name", uptownHomes.get(0).getLinkman());
+            return new ModelAndView("/user/scan.ftl", model);
+        }
+    }
 }