门禁数据接入

huimv-receive/src/main/java/com/huimv/receive/config/InterceptorConfig.java

@@ -22,7 +22,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/secureApi/admin/my/*")
+                excludePathPatterns("/secureApi/admin/my/*","/secureApi/bill-access-door/getDoorData")
                 .excludePathPatterns("/secureApi/receive/feed","/secureApi/bill-personnel-admission/printAdmission"
                         ,"/secureApi/bill-personnel-admission/printAdmission"
                         ,"/secureApi/bill-pcr/printPcr"
@@ -53,15 +53,16 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/secureApi/bill-clean/allList"
                         ,"/secureApi/bill-clean/CleanSelect"
                         ,"/secureApi/bill-clean/delete"
+                        ,"/secureApi/bill-clean/listScreen"
 
 
                         ,"/secureApi/bill-isolate/isolateList"
                         ,"/secureApi/bill-isolate/isolateSelect"
                         ,"/secureApi/bill-isolate/delete"
 
-                        ,"secureApi/bill-luggage/listLuggage"
-                        ,"secureApi/bill-luggage/selectLuggage"
-                        ,"secureApi/bill-luggage/delete"
+                        ,"/secureApi/bill-luggage/listLuggage"
+                        ,"/secureApi/bill-luggage/selectLuggage"
+                        ,"/secureApi/bill-luggage/delete"
 
 
 

huimv-receive/src/main/java/com/huimv/receive/controller/BillAccessDoorController.java

@@ -1,21 +1,29 @@
 package com.huimv.receive.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.receive.common.utils.Result;
 import com.huimv.receive.common.utils.ResultCode;
+import com.huimv.receive.common.utils.UploadImage;
 import com.huimv.receive.entity.BillAccessDoor;
 import com.huimv.receive.entity.BillGate;
+import com.huimv.receive.entity.vo.DoorVo;
 import com.huimv.receive.service.IBillAccessDoorService;
 import com.huimv.receive.service.IBillGateService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Map;
 
 /**
@@ -35,18 +43,48 @@ public class BillAccessDoorController {
     private IBillAccessDoorService doorService;
     @Autowired
     private IBillGateService gateService;
+    @Autowired
+    private UploadImage uploadImage;
+
     @RequestMapping("/listById")
     public Result listById(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         String type = paramsMap.get("type");//1为人脸门禁 2为车辆闸机
         String id = paramsMap.get("id");
         if ("1".equals(type)) {
-            BillAccessDoor doorServiceOne = doorService.getOne(new QueryWrapper<BillAccessDoor>().eq("farm_id", farmId).eq("id", id));
+            BillAccessDoor doorServiceOne = doorService.getOne(new QueryWrapper<BillAccessDoor>()
+                    .eq("farm_id", farmId).eq("id", id));
             return new Result(ResultCode.SUCCESS, doorServiceOne);
         } else {
-            BillGate gate = gateService.getOne(new QueryWrapper<BillGate>().eq("farm_id", farmId).eq("id", id));
+            BillGate gate = gateService.getOne(new QueryWrapper<BillGate>().eq("farm_id", farmId)
+                    .eq("id", id));
             return new Result(ResultCode.SUCCESS, gate);
         }
 
     }
+
+    @RequestMapping("/getDoorData")
+    public Result getDoorData(@RequestParam("time") String time,
+                              @RequestParam("result") String result,
+                              @RequestParam("userId") String userId,
+                              @RequestParam("image") MultipartFile image) throws ParseException, IOException {
+        BillAccessDoor door = new BillAccessDoor();
+        door.setBillStatus(Integer.parseInt(result));
+        DateFormat def = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        door.setCheckDate(def.parse(time));
+        door.setUserId(userId);
+        if (ObjectUtil.isNotEmpty(image)) {
+            if (uploadImage.getImageCom(image).equals("上传失败")) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "图片上传失败", false);
+            }
+            door.setUrlImg(uploadImage.getImageCom(image));
+        }
+        //后面需要修改
+        door.setFarmId(25);
+        door.setLocationId(1);
+        door.setCheckLocation("人员初级洗消");
+        doorService.save(door);
+        return new Result(ResultCode.SUCCESS, time);
+    }
 }

huimv-receive/src/main/java/com/huimv/receive/controller/BillCleanController.java

@@ -205,4 +205,9 @@ public class BillCleanController {
         configurationService.updateById(configuration);
         return new Result(10000, "保存成功！", true);
     }
+
+    @RequestMapping("/listScreen")
+    public Result listScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return cleanService.listScreen(httpServletRequest, paramsMap);
+    }
 }

huimv-receive/src/main/java/com/huimv/receive/entity/BillAccessDoor.java

@@ -57,7 +57,7 @@ public class BillAccessDoor implements Serializable {
     /**
      * 用户id
      */
-    private Integer userId;
+    private String userId;
 
     /**
      * 用户名称

huimv-receive/src/main/java/com/huimv/receive/entity/vo/DoorVo.java

@@ -0,0 +1,8 @@
+package com.huimv.receive.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class DoorVo {
+    private String time,mac,result,method,userId,image, small;
+}

huimv-receive/src/main/java/com/huimv/receive/service/IBillCleanService.java

@@ -50,5 +50,7 @@ public interface IBillCleanService extends IService<BillClean> {
     //导出
     void printClean(HttpServletResponse httpServletRequest, Map<String, String> paramsMap) throws Exception;
 
+    //大屏
+    Result listScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillCleanServiceImpl.java

@@ -1246,4 +1246,21 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
         }
         Print.printClean(list);
     }
+
+    @Override
+    public Result listScreen(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String type = paramsMap.get("type");
+        if ("".equals(type) || null == type) {
+            type = "1";
+        }
+        QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
+        if (type.equals("1")) {
+            queryWrapper.eq("farm_id", farmId).eq("vistit_type", 0);
+        } else {
+            queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0);
+        }
+
+        return new Result(ResultCode.SUCCESS, billCleanMapper.selectList(queryWrapper));
+    }
 }

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -472,7 +472,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         }
         if ("1".equals(type)) {
             QueryWrapper<BillAccessDoor> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId);
+            queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
             if ("1".equals(status)) {
                 queryWrapper.eq("bill_status", 1);
             } else if ("2".equals(status)) {
@@ -482,7 +482,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             return new Result(ResultCode.SUCCESS, doorMapper.selectPage(page, queryWrapper));
         } else {
             QueryWrapper<BillGate> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId);
+            queryWrapper.eq("farm_id", farmId).orderByDesc("check_date");
             if ("1".equals(status)) {
                 queryWrapper.eq("bill_status", 1);
             } else if ("2".equals(status)) {