刷卡，接口优化 2023-04-07

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/RemoteDutyService.java

@@ -1,9 +1,11 @@
 package com.zd.laboratory.api.feign;
 
 import com.zd.laboratory.api.feign.fallback.RemoteDutyFailback;
+import com.zd.laboratory.api.vo.XxpInspectionVo;
 import com.zd.laboratory.api.vo.XxpUserAuthVo;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.ResultData;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -200,4 +202,21 @@ public interface RemoteDutyService {
      */
     @GetMapping(value = "/subject/isAdminOrSafeUser/{labId}/{userId}")
     ResultData isAdminOrSafeUser(@PathVariable("labId") Long labId, @PathVariable("userId") Long userId);
-}
+
+    /**
+     * 添加巡查记录
+     * @param xxpInspectionVo
+     * @return
+     */
+    @PostMapping(value = "/XxpInspection/addInspection")
+    ResultData addInspection(@RequestBody XxpInspectionVo xxpInspectionVo);
+
+    /**
+     * 签退
+     * @param labId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/XxpInspection/updateInspection")
+    ResultData updateInspection(@RequestParam("labId") Long labId,@RequestParam("userId") Long userId);
+    }

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/fallback/RemoteDutyFailback.java

@@ -1,6 +1,7 @@
 package com.zd.laboratory.api.feign.fallback;
 
 import com.zd.laboratory.api.feign.RemoteDutyService;
+import com.zd.laboratory.api.vo.XxpInspectionVo;
 import com.zd.laboratory.api.vo.XxpUserAuthVo;
 import com.zd.model.domain.ResultData;
 import org.slf4j.Logger;
@@ -120,6 +121,16 @@ public class RemoteDutyFailback implements FallbackFactory<RemoteDutyService> {
             public ResultData isAdminOrSafeUser(Long labId, Long userId) {
                 return ResultData.fail("判断是否是实验室安全责任人实验室负责人：" + cause.getMessage());
             }
+
+            @Override
+            public ResultData addInspection(XxpInspectionVo xxpInspectionVo) {
+                return ResultData.fail("添加巡查记录失败：" + cause.getMessage());
+            }
+
+            @Override
+            public ResultData updateInspection(Long labId, Long userId) {
+                return ResultData.fail("修改巡查记录失败：" + cause.getMessage());
+            }
         };
     }
 }

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/vo/XxpInspectionVo.java

@@ -0,0 +1,152 @@
+package com.zd.laboratory.api.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zd.model.annotation.Excel;
+import com.zd.model.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import sun.util.resources.ga.LocaleNames_ga;
+
+import java.util.Date;
+
+/**
+ * 巡查表 对象 xxp_inspection
+ *
+ * @author xxf
+ * @date 2023-03-22
+ */
+@ApiModel("巡查信息")
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+public class XxpInspectionVo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 人员id
+     */
+    @ApiModelProperty(value = "人员id",required = true)
+    private Long userId;
+
+    /**
+     * 人员姓名
+     */
+    @ApiModelProperty(value = "人员姓名")
+    private String userName;
+
+    /**
+     * 实验室id
+     */
+    @Excel(name = "实验室id")
+    @ApiModelProperty(value = "实验室id")
+    private Long  subjectId;
+
+    /**
+     * 实验室名称
+     */
+    @Excel(name = "实验室名称")
+    @ApiModelProperty(value = "实验室名称")
+    private String subjectName;
+
+    /**
+     * 签到时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "签到时间 ")
+    private Date signIn;
+
+    /**
+     * 签退时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "签退时间 ")
+    private Date signOut;
+
+    /**
+     * 部门id
+     */
+    @ApiModelProperty(value = "部门id ")
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    @ApiModelProperty(value = "部门名称 ")
+    private String deptName;
+
+    /**
+     * 停留时间
+     */
+    @ApiModelProperty(value = "停留时间 ")
+    private String residenceTime;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /***
+     * 开始时间
+     */
+    private String beginTime;
+
+    /***
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 信息牌编号
+     */
+    private String num;
+
+    @Override
+    public Long getUserId() {
+        return userId;
+    }
+
+    @Override
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    @Override
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    @Override
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    @Override
+    public String getDeptName() {
+        return deptName;
+    }
+
+    @Override
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+}

zd-api/zd-system-api/src/main/java/com/zd/system/api/feign/RemoteUserService.java

@@ -4,6 +4,7 @@ import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.SecurityConstants;
 import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
 import com.zd.model.entity.LoginUser;
 import com.zd.model.entity.SysUser;
 import com.zd.system.api.feign.factory.RemoteUserFallback;
@@ -195,4 +196,8 @@ public interface RemoteUserService {
      */
     @RequestMapping("/user/getUserByPhone/{phone}")
     R<SysUser> getUserByPhone(@PathVariable("phone") String phone);
+
+
+    @GetMapping("/user/getUserMapInfoByUserId")
+    ResultData getUserMapInfoByUserId(@RequestParam("userId") Long userId);
 }

zd-api/zd-system-api/src/main/java/com/zd/system/api/feign/factory/RemoteUserFallback.java

@@ -2,6 +2,7 @@ package com.zd.system.api.feign.factory;
 
 import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
 import com.zd.model.entity.LoginUser;
 import com.zd.model.entity.SysUser;
 import com.zd.system.api.feign.RemoteUserService;
@@ -189,7 +190,10 @@ public class RemoteUserFallback implements FallbackFactory<RemoteUserService> {
                 return R.fail("根据电话查询用户信息失败:" + throwable.getMessage());
             }
 
-
+            @Override
+            public ResultData getUserMapInfoByUserId(Long userId) {
+                return ResultData.fail("查询用户信息失败:" + throwable.getMessage());
+            }
         };
     }
 }

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -9,6 +9,7 @@ import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.api.feign.RemoteDutyService;
+import com.zd.laboratory.api.vo.XxpInspectionVo;
 import com.zd.laboratory.api.vo.XxpUserAuthVo;
 import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.R;
@@ -506,4 +507,30 @@ public class LabBoardApi {
     public R<byte[]> faceFeature(@RequestParam("file") MultipartFile file){
         return remoteFaceService.upload(file);
     }
+
+
+    /**
+     * 人脸识别获取特征值
+     * @param xxpInspectionVo
+     * @return
+     */
+    @ApiOperation(value = "巡查签到")
+    @PostMapping(value = "/XxpInspection/addInspection/signIn")
+    public ResultData addInspection(@RequestBody XxpInspectionVo xxpInspectionVo){
+        ResultData resultData= remoteDutyService.addInspection(xxpInspectionVo);
+        return resultData;
+    }
+
+
+    /**
+     * 人脸识别获取特征值
+     * @param labId
+     * @return
+     */
+    @ApiOperation(value = "巡查签退")
+    @PostMapping(value = "/XxpInspection/addInspection/signOut")
+    public ResultData updateInspection(@RequestParam("labId") Long labId,@RequestParam("userId") Long userId){
+        return ResultData.success(remoteDutyService.updateInspection(labId,userId));
+    }
+
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpInspectionController.java

@@ -8,17 +8,19 @@ import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.FileConfigUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.laboratory.domain.LabWhitelist;
-import com.zd.laboratory.domain.XxpClassify;
+import com.zd.laboratory.api.vo.XxpInspectionVo;
+import com.zd.laboratory.domain.XxpCardInfo;
 import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.XxpInspection;
 import com.zd.laboratory.domain.vo.XxpInspectionVO;
-import com.zd.laboratory.service.IXxpClassifyService;
+import com.zd.laboratory.service.IXxpCardInfoService;
 import com.zd.laboratory.service.IXxpInspectionService;
+import com.zd.model.constant.HttpStatus;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.page.TableDataInfo;
+import com.zd.system.api.feign.RemoteUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,11 +46,18 @@ public class LabXxpInspectionController extends BaseController
     private IXxpInspectionService xxpInspectionService;
 
     @Autowired
+    private IXxpCardInfoService iXxpCardInfoService;
+
+    @Autowired
     private TokenService tokenService;
 
     @Autowired
     private FileConfigUtils fileConfigUtils;
 
+    @Autowired
+    private RemoteUserService remoteUserService;
+
+
     /**
      * 查询巡查列表
      */
@@ -234,4 +243,54 @@ public class LabXxpInspectionController extends BaseController
                 });
         return ResultData.success(list);
     }
+
+
+    /**
+     * 新增巡查
+     */
+    @ApiOperation(value = "巡查签到")
+    @PostMapping("/addInspection")
+    public ResultData addInspection(@RequestBody XxpInspectionVo xxpInspectionVo) {
+        XxpCardInfo xxpCardInfo=iXxpCardInfoService.selectXxpInfoByCard(xxpInspectionVo.getNum());
+        if(null==xxpCardInfo){
+            return ResultData.fail("电子信息牌查询错误");
+        }
+        int num=xxpInspectionService.selectNoSignOut(xxpCardInfo.getSubjectId(),xxpInspectionVo.getUserId());
+        if(num>0){
+            return ResultData.fail("已签到，请勿重复签到，请签出后再签到！");
+        }
+        ResultData resultData=remoteUserService.getUserMapInfoByUserId(xxpInspectionVo.getUserId());
+        if(null==resultData ||resultData.getCode()!= HttpStatus.SUCCESS){
+            return ResultData.fail("获取用户信息失败");
+        }
+        Object userObj=resultData.getData();
+        if(null==userObj){
+            return ResultData.fail("获取用户信息失败");
+        }
+        Map<String,Object> map= (Map<String, Object>) userObj;
+        XxpInspection xxpInspection=new XxpInspection();
+        xxpInspection.setSubjectId(xxpCardInfo.getSubjectId());
+        xxpInspection.setSubjectName(xxpCardInfo.getSubjectName());
+        xxpInspection.setUserImg(String.valueOf(map.get("avatar")));
+        xxpInspection.setUserName(String.valueOf(map.get("userName")));
+        xxpInspection.setCreateBy(String.valueOf(map.get("userName")));
+        xxpInspection.setUserId(Long.parseLong(String.valueOf(map.get("userId"))));
+        xxpInspection.setDeptId(Long.parseLong(String.valueOf(map.get("deptId"))));
+        xxpInspection.setDeptName(String.valueOf(map.get("deptName")));
+        Date date=new Date();
+        xxpInspection.setCreateTime(date);
+        xxpInspection.setSignIn(date);
+        return ResultData.result(xxpInspectionService.insertXxpInspection(xxpInspection));
+    }
+
+
+    /**
+     * 修改巡查
+     */
+    @ApiOperation(value = "巡查签出")
+    @PostMapping("/updateInspection")
+    public ResultData updateInspection(@RequestParam("labId") Long labId,@RequestParam("userId") Long userId) {
+        return ResultData.result(xxpInspectionService.updateXxpInspectionSignOut(labId,userId));
+    }
+
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/XxpInspection.java

@@ -59,7 +59,7 @@ public class XxpInspection extends BaseEntity {
      */
     @Excel(name = "实验室id")
     @ApiModelProperty(value = "实验室id")
-    private Integer subjectId;
+    private Long subjectId;
 
     /**
      * 实验室名称

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/XxpInspectionMapper.java

@@ -112,4 +112,22 @@ public interface XxpInspectionMapper
      */
     public List<XxpDuty> selectListAbnormal(XxpDuty xxpDuty);
 
+    /**
+     * 查询当天是否有签到为签出的记录
+     * @param labId
+     * @param userId
+     * @param date
+     * @return
+     */
+    Integer selectNoSignOut(@Param("labId") Long labId,@Param("userId") Long userId,@Param("date") String date);
+
+    /**
+     * 更新未签退的未签到
+     * @param labId
+     * @param userId
+     * @param date
+     * @return
+     */
+    Integer updateXxpInspectionSignOut(@Param("labId") Long labId,@Param("userId") Long userId,@Param("date") String date);
+
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/service/OneMachineService.java

@@ -337,29 +337,30 @@ public class OneMachineService implements ValidationSignInPerInfo {
             logger.info("&&&&&&&&&&&&&&&&&&&&&&" + code + "," + signEnum);
             if (StringUtils.isEmpty(code)) {
                 //            throw new CaptchaException("签到验证码错误，请重新刷卡重试！");
-                ResultData.fail(600, "签到验证码错误，请重新刷卡重试！");
+                return ResultData.fail(600, "签到验证码错误，请重新刷卡重试！");
             }
             String verifyKey = BaseConstants.SINGIN_CAPTCHA_CODE_KEY + code;
             SingInUser user = redisService.getCacheObject(verifyKey);
             if (user == null || user.getUserId() == null) {
-                ResultData.fail(600, "签到&签出人脸已超时，请重新刷卡重试！");
+                return ResultData.fail(600, "签到&签出人脸已超时，请重新刷卡重试！");
             }
 //            boolean expire = redisService.expire(verifyKey, 120);
 //            if (!expire) return ResultData.fail(600, "签到&签出验证码已超时，请重新刷卡重试！");
             if (user != null) {
                 String s = StrUtil.subAfter(code, "_", true);
                 if (signEnum.equals(SignEnum.SIGN_IN)) {
-
                     logger.info("1111111签到调用人脸服务");
                     //调用人脸验证
-                    R r = faceCompare(user.getUserId(), face);
-                    //验证失败刷新验证码时间
-                    logger.info("r.getCode():"+r.getCode());
-                    if (r.getCode() != 200) {
-                        return ResultData.fail(r.getMsg());
+                    R r;
+                    if(null!=face){
+                        r = faceCompare(user.getUserId(), face);
+                        //验证失败刷新验证码时间
+                        logger.info("r.getCode():"+r.getCode());
+                        if (r.getCode() != 200) {
+                            return ResultData.fail(r.getMsg());
+                        }
+                        logger.info("2222222人脸服务调用完成！");
                     }
-                    logger.info("2222222人脸服务调用完成！");
-
                     //插入进入实验室记录
                     LabSubjectAccessRecordVo subjectAccessRecord = new LabSubjectAccessRecordVo();
                     subjectAccessRecord.setDeptId(user.getDeptId());
@@ -392,7 +393,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                         Map map = new HashMap();
                         map.put("userId", user.getUserId());
                         map.put("status", "0");
-                       r = remoteExamService.addLoginfo(map);
+                        r = remoteExamService.addLoginfo(map);
                         if (r.getCode() != 200) {
                             logger.info("打卡签到奖励分记录保存失败！");
                             // throw new ServiceException("打卡签出奖励分记录保存失败！");

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/IXxpInspectionService.java

@@ -3,6 +3,7 @@ package com.zd.laboratory.service;
 import com.zd.laboratory.domain.XxpDuty;
 import com.zd.laboratory.domain.XxpInspection;
 import com.zd.laboratory.domain.vo.XxpInspectionVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -111,4 +112,23 @@ public interface IXxpInspectionService
      * @return
      */
     public List<XxpDuty> selectListAbnormal(XxpDuty xxpDuty);
+
+
+    /***
+     * 签到记录
+     * @param labId
+     * @param userId
+     * @return
+     */
+    public Integer selectNoSignOut(Long labId,Long userId);
+
+
+    /**
+     * 更新未签退的未签到
+     * @param labId
+     * @param userId
+     * @return
+     */
+    Integer updateXxpInspectionSignOut(Long labId,Long userId);
+
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/XxpInspectionServiceImpl.java

@@ -2,6 +2,7 @@ package com.zd.laboratory.service.impl;
 
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.security.TokenService;
+import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.domain.XxpClassify;
 import com.zd.laboratory.domain.XxpDuty;
@@ -15,6 +16,7 @@ import com.zd.model.entity.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -172,4 +174,16 @@ public class XxpInspectionServiceImpl implements IXxpInspectionService
         }
         return xxpInspectionMapper.selectListAbnormal(xxpDuty);
     }
+
+    @Override
+    public Integer selectNoSignOut(Long labId, Long userId) {
+        String data= DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date());
+        return xxpInspectionMapper.selectNoSignOut(labId,userId,data);
+    }
+
+    @Override
+    public Integer updateXxpInspectionSignOut(Long labId, Long userId) {
+        String data= DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date());
+        return xxpInspectionMapper.updateXxpInspectionSignOut(labId,userId,data);
+    }
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpInspectionMapper.xml

@@ -148,6 +148,12 @@
         where id = #{id}
     </update>
 
+
+    <update id="updateXxpInspectionSignOut">
+        UPDATE xxp_inspection SET sign_out=#{date}
+        WHERE subject_id = #{labId} AND user_id=#{userId} AND DATE_FORMAT(sign_in,'%Y-%m-%d')=#{date} AND sign_out IS NULL
+    </update>
+
     <delete id="deleteXxpInspectionById">
         delete
         from xxp_inspection
@@ -243,4 +249,7 @@
              ) t
         where noSignedInCount = 0
     </select>
+    <select id="selectNoSignOut" resultType="java.lang.Integer">
+        SELECT  COUNT(*)  FROM  xxp_inspection WHERE subject_id=#{labId} AND user_id=#{userId} AND DATE_FORMAT(sign_in,'%Y-%m-%d')=#{date} AND sign_out IS NULL
+    </select>
 </mapper>

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserController.java

@@ -857,8 +857,8 @@ public class SysUserController extends BaseController {
      * @return
      */
     @ApiOperation("根据用户id查询用户基本信息")
-    @RequestMapping("/getUserInfoByUserId")
-    public ResultData getUserInfoByUserId(Long userId) {
+    @RequestMapping("/getUserMapInfoByUserId")
+    public ResultData getUserMapInfoByUserId(Long userId) {
         return ResultData.success(userService.selectUserByUserId(userId));
     }
 }

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -1061,7 +1061,7 @@
         ${params.dataScope}
     </select>
     <select id="selectUserByUserId" resultType="java.util.Map">
-         SELECT user_type userType,nick_name userName,user_id userId FROM  `sys_user` WHERE del_flag=0 AND user_id=#{userId}
+         SELECT user_type userType,nick_name userName,user_id userId,avatar,dept_id deptId,(SELECT dept_name FROM sys_dept sd WHERE sd.dept_id=su.dept_id)  deptName FROM  `sys_user` su WHERE del_flag=0 AND user_id=#{userId}
     </select>
 
 </mapper>