Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java

@@ -78,6 +78,10 @@ public class AccCardServiceImpl implements IAccCardService {
             if (cardCountByUserId > 0) {
                 throw new ServiceException("此用户已有卡, 不能再次发放");
             }
+            int cardCountByCardSerialNum= accCardMapper.selectAccCardCountByCardSerialNum(accountCard.getSerialNum());
+            if (cardCountByCardSerialNum > 0) {
+                throw new ServiceException("卡号已存在, 卡号不能重复");
+            }
             int count = accCardMapper.insertAccCard(accountCard);
             saveAccCardChangeRecord(accountCard);
             return count;

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/annotation/PreventRepeatSubmit.java

@@ -15,7 +15,7 @@ public @interface PreventRepeatSubmit
     /**
      * 间隔时间(s)，小于此时间视为重复提交
      */
-    public int interval() default 5;
+    public int interval() default 7;
 
     /**
      * 提示消息

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java

@@ -299,7 +299,7 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
         if (RecipeTypeEnum.DAILY.key().equals(cookRecipeDTO.getRecipeType()) && Objects.nonNull(recipeDateList.get(0))) {  //每日循环
             List<CookRecipeDetailDTO> recipeDetailList = recipeDateList.get(0).getDetailList();
             LocalDate now = LocalDate.now();
-            for (int i = 0; i < GlobalConstants.WEEK_DAYS; ++i) {
+            for (int i = 0; i < 3; ++i) { //每日循环菜谱,只生成3天的量，后面的依赖每天的定时任务
                 CookRecipeDateDTO cookRecipeDateDTO = new CookRecipeDateDTO();
                 cookRecipeDateDTO.setDetailList(recipeDetailList);
                 cookRecipeDateDTO.setApplyDate(now.plusDays(i));

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java

@@ -175,5 +175,5 @@ public class HealthPersonInfo extends BaseEntity {
     private String doctorAdvices;
     private String placeIds;
     private String deptIds;
-
+    private String encryptedSearchValue;
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java

@@ -50,6 +50,8 @@ public class HealthPersonInfoServiceImpl implements IHealthPersonInfoService {
      */
     @Override
     public List<HealthPersonInfo> selectHealthPersonInfoList(HealthPersonInfo healthPersonInfo) {
+        String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(healthPersonInfo.getArticleTitle());
+        healthPersonInfo.setEncryptedSearchValue(encryptedSearchValue);
         List<HealthPersonInfo> list=healthPersonInfoMapper.selectHealthPersonInfoList(healthPersonInfo);
         if(CollUtil.isNotEmpty(list)) {
             for(HealthPersonInfo vo : list) {

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/mapper/KitchenStaffFaceMapper.java

@@ -3,6 +3,8 @@ package com.bonus.canteen.core.kitchen.mapper;
 import com.bonus.canteen.core.kitchen.domain.KitchenStaffFace;
 import com.bonus.canteen.core.kitchen.domain.KitchenStaffInfo;
 
+import java.util.List;
+
 /**
  * 人员生物识别特征Mapper接口
  *
@@ -17,4 +19,6 @@ public interface KitchenStaffFaceMapper {
     int deleteStaffFaces(Long[] staffIds);
 
     int updateStaffFaceState(KitchenStaffInfo kitchenStaffInfo);
+
+    KitchenStaffFace selectStaffFaceByStaffId(Long staffId);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenStaffInfoServiceImpl.java

@@ -195,6 +195,10 @@ public class KitchenStaffInfoServiceImpl implements IKitchenStaffInfoService {
         if(!StaffFaceStateEnum.isValidFaceState(kitchenStaffInfo.getFaceState())) {
             throw new ServiceException("无效的人脸状态");
         }
+        KitchenStaffFace kitchenStaffFace = kitchenStaffFaceMapper.selectStaffFaceByStaffId(kitchenStaffInfo.getStaffId());
+        if(Objects.isNull(kitchenStaffFace)) {
+            throw new ServiceException("该员工没有人脸信息");
+        }
         return kitchenStaffFaceMapper.updateStaffFaceState(kitchenStaffInfo);
     }
 

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAccCardCountByCardSerialNum" parameterType="String" resultType="Integer">
         select count(1)
         from account_card
-        where serial_num = #{serialNum}
+        where serial_num = #{serialNum} and card_status in (1,4,5)
     </select>
 
     <select id="selectAccCardById" parameterType="Long" resultMap="AccCardResult">

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml

@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join health_person_body_record d on a.user_id = d.user_id and d.if_latest = 1
         where 1 = 1
         <if test="articleTitle != null and articleTitle != ''">
-            and(a.nick_name like concat('%', #{articleTitle}, '%') or a.phonenumber like concat('%', #{articleTitle}, '%') or b.doctor_num like concat('%', #{articleTitle}, '%'))
+            and(a.nick_name like concat('%', #{articleTitle}, '%') or a.phonenumber like concat('%', #{encryptedSearchValue}, '%') or b.doctor_num like concat('%', #{articleTitle}, '%'))
         </if>
         <if test="chronicIds != null and chronicIds != ''">
             and c.chronic_id in (${chronicIds})

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenStaffFaceMapper.xml

@@ -3,6 +3,12 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.kitchen.mapper.KitchenStaffFaceMapper">
+    <select id="selectStaffFaceByStaffId" resultType="com.bonus.canteen.core.kitchen.domain.KitchenStaffFace">
+        select staff_id,photo_url,features,create_by,error_msg,create_time,update_by,update_time
+        from kitchen_staff_face
+        where staff_id = #{staffId}
+    </select>
+
     <insert id="insertStaffFace" parameterType="com.bonus.canteen.core.kitchen.domain.KitchenStaffFace">
         insert into kitchen_staff_face(staff_id,photo_url,features,create_by,error_msg,create_time,update_by,update_time)
         values(#{staffId},#{photoUrl},#{features},#{createBy},#{errorMsg},#{createTime},#{updateBy},#{updateTime})