From 5fd28c60c83a623bd0c1ac14a11de463c61c2c27 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 25 Jun 2025 09:55:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=8F=9C=E8=B0=B1=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/common/annotation/PreventRepeatSubmit.java | 2 +- .../canteen/core/cook/service/impl/CookRecipeServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/annotation/PreventRepeatSubmit.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/annotation/PreventRepeatSubmit.java index 7173298..5f87a11 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/annotation/PreventRepeatSubmit.java +++ b/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; /** * 提示消息 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java index 8e3d1b1..50833f7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java +++ b/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 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)); From 7afa5bacb96ae58e0efc1c2a12a148629dd4c232 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 25 Jun 2025 10:10:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8D=A1=E5=8F=B7=E4=B8=8D=E5=BA=94?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8F=91=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/account/service/impl/AccCardServiceImpl.java | 4 ++++ .../src/main/resources/mapper/account/AccCardMapper.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java index 077f660..8392638 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java +++ b/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; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml index c65bcd1..9678d05 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml +++ b/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 staff_id,photo_url,features,create_by,error_msg,create_time,update_by,update_time + from kitchen_staff_face + where staff_id = #{staffId} + + 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}) From a25c74a19b913276b612890f0b04bbfce8921ef6 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 25 Jun 2025 11:14:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8F=96=E6=B6=88Long=E5=9E=8B=E8=BF=94?= =?UTF-8?q?=E5=9B=9EString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/canteen/core/config/json/JacksonConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/config/json/JacksonConfiguration.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/config/json/JacksonConfiguration.java index 4ecbcf0..9d1fb30 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/config/json/JacksonConfiguration.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/config/json/JacksonConfiguration.java @@ -37,8 +37,8 @@ public class JacksonConfiguration { @Bean Jackson2ObjectMapperBuilderCustomizer objectMapperBuilderCustomizer() { return (builder) -> { - builder.serializerByType(Long.TYPE, LONG_STD_SERIALIZER); - builder.serializerByType(Long.class, LONG_STD_SERIALIZER); +// builder.serializerByType(Long.TYPE, LONG_STD_SERIALIZER); +// builder.serializerByType(Long.class, LONG_STD_SERIALIZER); builder.locale(Locale.CHINA); builder.timeZone(TimeZone.getTimeZone(ZoneId.systemDefault())); builder.simpleDateFormat("yyyy-MM-dd HH:mm:ss"); From 26732eaa129d3f573882fbc13e65477e7e171415 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 25 Jun 2025 11:32:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?Revert=20"=E5=8F=96=E6=B6=88Long=E5=9E=8B?= =?UTF-8?q?=E8=BF=94=E5=9B=9EString"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a25c74a19b913276b612890f0b04bbfce8921ef6. --- .../bonus/canteen/core/config/json/JacksonConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/config/json/JacksonConfiguration.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/config/json/JacksonConfiguration.java index 9d1fb30..4ecbcf0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/config/json/JacksonConfiguration.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/config/json/JacksonConfiguration.java @@ -37,8 +37,8 @@ public class JacksonConfiguration { @Bean Jackson2ObjectMapperBuilderCustomizer objectMapperBuilderCustomizer() { return (builder) -> { -// builder.serializerByType(Long.TYPE, LONG_STD_SERIALIZER); -// builder.serializerByType(Long.class, LONG_STD_SERIALIZER); + builder.serializerByType(Long.TYPE, LONG_STD_SERIALIZER); + builder.serializerByType(Long.class, LONG_STD_SERIALIZER); builder.locale(Locale.CHINA); builder.timeZone(TimeZone.getTimeZone(ZoneId.systemDefault())); builder.simpleDateFormat("yyyy-MM-dd HH:mm:ss"); From 7552b16382c9ebd793acc05477edabf422fe79dc Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Wed, 25 Jun 2025 13:43:51 +0800 Subject: [PATCH 6/6] =?UTF-8?q?jsk=20=20=E6=89=8B=E6=9C=BA=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/canteen/core/health/domain/HealthPersonInfo.java | 2 +- .../core/health/service/impl/HealthPersonInfoServiceImpl.java | 2 ++ .../src/main/resources/mapper/health/HealthPersonInfoMapper.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java index e908afe..eca2906 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java +++ b/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; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java index e427e01..85152b3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/service/impl/HealthPersonInfoServiceImpl.java +++ b/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 selectHealthPersonInfoList(HealthPersonInfo healthPersonInfo) { + String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(healthPersonInfo.getArticleTitle()); + healthPersonInfo.setEncryptedSearchValue(encryptedSearchValue); List list=healthPersonInfoMapper.selectHealthPersonInfoList(healthPersonInfo); if(CollUtil.isNotEmpty(list)) { for(HealthPersonInfo vo : list) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml index 9007687..d45ed53 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml +++ b/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 - 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}, '%')) and c.chronic_id in (${chronicIds})