Browse Source

扫码后台0215

maoyunfeng 5 năm trước cách đây
mục cha
commit
744edb3a1a

+ 10 - 6
whepi-web/src/main/java/com/bofeng/controller/SweepCodeController.java

@@ -1,18 +1,22 @@
 package com.bofeng.controller;
 
 import com.bofeng.entity.LoginResult;
+import com.bofeng.entity.SysUptownHouse;
 import com.bofeng.service.SweepCodeService;
 import com.google.common.base.Strings;
 import com.yvan.Model;
 import com.yvan.mvc.Pd;
+import com.yvan.springmvc.HttpParameterParser;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 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.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -21,12 +25,12 @@ public class SweepCodeController {
     @Autowired
     private SweepCodeService sweepCodeService;
 
-    @ApiOperation("用户登录")
-    @PostMapping("/whepi/user/login.json")
-    public Model<LoginResult> userLogin(HttpServletResponse response,
-                                        HttpServletRequest request) {
-        sweepCodeService.selectCode();
+    @ApiOperation("出入查询")
+    @GetMapping("/whepi/sweepCode/selectCode")
+    public Model<List<SysUptownHouse>> selectCode(HttpParameterParser parser) {
+//        HttpServletResponse response,HttpServletRequest request
+        List<SysUptownHouse> sysUptownHouses = sweepCodeService.selectCode(parser.getMap());
 
-        return null;
+        return Model.newSuccess(sysUptownHouses);
     }
 }

+ 14 - 0
whepi-web/src/main/java/com/bofeng/dao/SweepCodeMapper.java

@@ -0,0 +1,14 @@
+package com.bofeng.dao;
+
+import com.bofeng.entity.SysUptownHouse;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface SweepCodeMapper {
+    List<SysUptownHouse> selectCode(Map<String, Object> queryParam);
+}

+ 13 - 0
whepi-web/src/main/java/com/bofeng/entity/SysUptownHouse.java

@@ -49,10 +49,23 @@ public class SysUptownHouse implements Serializable {
     @TableField("time_update")
     private DateTime timeUpdate;
 
+    @TableField(exist = false)
+    private String uptownName;
 
+    @TableField(exist = false)
+    private String doorName;
 
+    @TableField(exist = false)
+    private String intoDate;
 
+    @TableField(exist = false)
+    private String outDate;
 
+    @TableField(exist = false)
+    private String nickName;
+
+    @TableField(exist = false)
+    private String jcStatus;
 
 
 

+ 24 - 1
whepi-web/src/main/java/com/bofeng/service/SweepCodeService.java

@@ -1,13 +1,36 @@
 package com.bofeng.service;
 
 
+import com.bofeng.dao.SweepCodeMapper;
+import com.bofeng.entity.SysUptownHouse;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.Map;
+
 @Service
 @Transactional(readOnly = true)
 public class SweepCodeService {
-    public void selectCode() {
 
+    @Autowired
+    private SweepCodeMapper sweepCodeMapper;
+
+
+    public List<SysUptownHouse> selectCode(Map<String, Object> queryParam) {
+        List<SysUptownHouse> sysUptownHouses = sweepCodeMapper.selectCode(queryParam);
+        if(sysUptownHouses.size()>0){
+            for (int i = 0; i < sysUptownHouses.size(); i++) {
+                if(sysUptownHouses.get(i).getIntoDate()== "0000-01-01 00:00:00"){
+                    sysUptownHouses.get(i).setJcStatus("外出");
+                }
+                if(sysUptownHouses.get(i).getOutDate()== "0000-01-01 00:00:00"){
+                    sysUptownHouses.get(i).setJcStatus("进入");
+                }
+            }
+        }
+
+        return sysUptownHouses;
     }
 }

+ 1 - 1
whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: guojing
+  profiles.active: maoyunfeng
 
   application:
     name: bofeng-web

+ 24 - 0
whepi-web/src/main/resources/mapper/SweepCodeMapper.xml

@@ -0,0 +1,24 @@
+<?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.SweepCodeMapper">
+    <select id="selectCode" resultType="com.bofeng.entity.SysUptownHouse">
+       select
+        a.uptown_name,
+        d.ridgepole,
+        d.unit,
+        e.doorplate,
+        b.door_name,
+        c.into_date,
+        c.out_date,
+        g.nick_name
+        from sys_uptown a
+        inner join sys_uptown_door b on a.uptown_id = b.uptown_id
+        inner join out_scan c on c.door_id = b.door_id
+        inner join sys_uptown_unit d on d.uptown_id = a.uptown_id
+        inner join sys_uptown_house e on e.unit_id = d.unit_id
+        inner join sys_user_role j on j.property_id = e.house_id and j.role_id = 1
+        inner join sys_user_open g on g.user_id = j.user_id
+    </select>
+
+
+</mapper>