Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/RfidTagServiceImpl.java

@@ -1,5 +1,7 @@
 package com.zd.bottle.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.domain.RfidTag;
 import com.zd.bottle.mapper.RfidTagMapper;
@@ -12,6 +14,8 @@ import com.zd.system.api.model.LoginUser;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.DecimalFormat;
+import java.util.Map;
 
 /**
  * <p>
@@ -50,6 +54,8 @@ public class RfidTagServiceImpl extends ServiceImpl<RfidTagMapper, RfidTag> impl
         return shortBuffer.toString();
 
     }
+
+
     @Override
     public RfidTag add(RfidTag rfidTag) {
         String username=null;
@@ -63,6 +69,13 @@ public class RfidTagServiceImpl extends ServiceImpl<RfidTagMapper, RfidTag> impl
             deptId=sysUser.getDeptId();
         }
         rfidTag.setAuthCode(generateShortUuid());
+        QueryWrapper<RfidTag> wrapper = Wrappers.query();
+        wrapper.select("  IFNULL( max(auth_code),0) as authCode");
+        Map<String, Object> map = getMap(wrapper);
+        int authCode = Integer.parseInt((String) map.get("authCode"));
+        authCode+=1;
+        DecimalFormat gf=new DecimalFormat("00000");
+        rfidTag.setAuthCode(gf.format(authCode));
         rfidTag.setCommonValue(username,userId,deptId);
         boolean save = save(rfidTag);
         if (save){
@@ -73,8 +86,8 @@ public class RfidTagServiceImpl extends ServiceImpl<RfidTagMapper, RfidTag> impl
 
     /***
      * 根据识别码查询
-     * @param authCode
-     * @return
+     * @param authCode 识别码
+     * @return RfidTag
      */
     @Override
     public RfidTag getRfidByTagCode(String authCode) {
@@ -83,8 +96,8 @@ public class RfidTagServiceImpl extends ServiceImpl<RfidTagMapper, RfidTag> impl
 
     /***
      * 修改标签
-     * @param rfidTag
-     * @return
+     * @param rfidTag 识别码
+     * @return int
      */
     @Override
     public int updateQpRfidTag(RfidTag rfidTag) {

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

@@ -381,18 +381,25 @@ public class LabSecurityApplyController extends BaseController
         //获取当前登录用户信息
         SysUser tokensysUser = tokenService.getLoginUser().getSysUser();
 
+        if(!"22".equals(tokensysUser.getUserType())){
+            throw new ServiceException("非学生，不允许申请准入。");
+        }
+
         //根据id查询用户信息
         R<SysUser> rDate =remoteUserService.getUserInfoByUserId(tokensysUser.getUserId(), SecurityConstants.INNER);
         SysUser  sysUser = rDate.getData();
 
-        LabSecurityApplyVO labapplyVo=new LabSecurityApplyVO();
-        labapplyVo.setBeginTime(beginTime);
-        labapplyVo.setEndTime(endTime);
-        labapplyVo.setSubjectId(subjectId);
-        labapplyVo.setUserId(sysUser.getUserId());
-        List<LabSecurityApplyVO> listapplyuser = labSecurityApplyService.selectLabSecurityApplyListByTime(labapplyVo);
-        if(listapplyuser.size()>0){
-            throw new ServiceException("该时间段已存在准入申请，请修改申请时间后在提交申请！");
+        //PC端根据条件校验，小程序端不做校验（操作流程不同）
+        if(StringUtils.isNotBlank(remark)) {
+            LabSecurityApplyVO labapplyVo = new LabSecurityApplyVO();
+            labapplyVo.setBeginTime(beginTime);
+            labapplyVo.setEndTime(endTime);
+            labapplyVo.setSubjectId(subjectId);
+            labapplyVo.setUserId(sysUser.getUserId());
+            List<LabSecurityApplyVO> listapplyuser = labSecurityApplyService.selectLabSecurityApplyListByTime(labapplyVo);
+            if (listapplyuser.size() > 0) {
+                throw new ServiceException("该时间段已存在准入申请，请修改申请时间后在提交申请。");
+            }
         }
 
         //申请时校验是否存在