Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application-prod.yml

@@ -183,7 +183,7 @@ sms:
     #阿里云的accessKeySecret
     accessKeySecret: 5WdaPEOvC3u9LC7pwy2DQ9pgmJvgUr
     #短信签名
-    signature: 测试
+    signature: 中新云
   tencent:
     #请求地址默认为 sms.tencentcloudapi.com 如无特殊改变可不用设置
     requestUrl: sms.tencentcloudapi.com

ruoyi-admin/src/main/resources/application.yml

@@ -151,6 +151,7 @@ tenant:
     - sys_user_role
     - sys_client
     - xiaoyuan_reservat
+    - xiaoyuan_opinion
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/reservat/XiaoyuanReservatController.java

@@ -134,4 +134,16 @@ public class XiaoyuanReservatController extends BaseController {
     public AjaxResult indexStatistics(@RequestBody XiaoyuanReservatBo bo) {
         return  xiaoyuanReservatService.indexStatistics(bo);
     }
+
+
+    /**
+     * 修改校园sh
+     */
+    @SaCheckPermission("system:reservat:sh")
+    @RepeatSubmit()
+    @PostMapping("/sh")
+    public R<Void> sh(@Validated(EditGroup.class) @RequestBody XiaoyuanReservatBo bo) {
+        return toAjax(xiaoyuanReservatService.shByBo(bo));
+    }
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java

@@ -1,6 +1,7 @@
 package org.dromara.system.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.util.ObjectUtil;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.web.core.BaseController;
@@ -80,6 +81,21 @@ public class SysDictDataController extends BaseController {
         return R.ok(data);
     }
 
+    /**
+     * 根据字典类型查询字典数据信息
+     *
+     * @param dictType 字典类型
+     */
+    @SaIgnore
+    @GetMapping(value = "/type")
+    public R<List<SysDictDataVo>> dictTypeTenantId(String dictType,String tenantId) {
+        List<SysDictDataVo> data = dictTypeService.dictTypeTenantId(dictType,tenantId);
+        if (ObjectUtil.isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return R.ok(data);
+    }
+
     /**
      * 新增字典类型
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java

@@ -20,4 +20,12 @@ public interface SysDictDataMapper extends BaseMapperPlus<SysDictData, SysDictDa
                 .eq(SysDictData::getDictType, dictType)
                 .orderByAsc(SysDictData::getDictSort));
     }
+
+    default List<SysDictDataVo> dictTypeTenantId(String dictType, String tenantId){
+        return selectVoList(
+            new LambdaQueryWrapper<SysDictData>()
+                .eq(SysDictData::getDictType, dictType)
+                .eq(SysDictData::getTenantId, tenantId)
+                .orderByAsc(SysDictData::getDictSort));
+    };
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java

@@ -92,4 +92,6 @@ public interface ISysDictTypeService {
      * @return 结果
      */
     boolean checkDictTypeUnique(SysDictTypeBo dictType);
+
+    List<SysDictDataVo> dictTypeTenantId(String dictType, String tenantId);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java

@@ -208,6 +208,16 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
         return !exist;
     }
 
+    //@Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
+    @Override
+    public List<SysDictDataVo> dictTypeTenantId(String dictType, String tenantId) {
+        List<SysDictDataVo> dictDatas = dictDataMapper.dictTypeTenantId(dictType,tenantId);
+        if (CollUtil.isNotEmpty(dictDatas)) {
+            return dictDatas;
+        }
+        return null;
+    }
+
     /**
      * 根据字典类型和字典值获取字典标签
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/reservat/XiaoyuanReservatServiceImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
 import org.dromara.sms4j.comm.utils.SmsUtil;
 import org.dromara.sms4j.core.factory.SmsFactory;
 import org.dromara.sms4j.provider.enumerate.SupplierType;
@@ -192,11 +193,11 @@ public class XiaoyuanReservatServiceImpl implements IXiaoyuanReservatService {
                     jsonObject.put("date",date);
                     jsonObject.put("title","不可约");
                     String reservatConfigDate = xiaoyuanReservatConfigVo.getReservatConfigDate();
-                    if (String.valueOf(week).contains(reservatConfigDate)){
+                    if (reservatConfigDate.contains(String.valueOf(week))){
                         jsonObject.put("title","可预约");
                         //包含去查询改天是否被预约满
                         lqwr.eq(StringUtils.isNotBlank(bo.getTeacherPhone()), XiaoyuanReservat::getTeacherPhone, bo.getTeacherPhone());
-                        lqwr.eq(XiaoyuanReservat::getVisitDate, week);
+                        lqwr.eq(XiaoyuanReservat::getVisitDate, date);
                         List<XiaoyuanReservatVo> xiaoyuanReservatVos = baseMapper.selectVoList(lqwr);
                         if (xiaoyuanReservatVos != null && xiaoyuanReservatVos.size() > 0){
                             //判断是否大于次数
@@ -277,4 +278,20 @@ public class XiaoyuanReservatServiceImpl implements IXiaoyuanReservatService {
             return R.fail("核销失败");
         }
     }
+
+    @Override
+    public Boolean shByBo(XiaoyuanReservatBo bo) {
+        LinkedHashMap<String,String> map = new LinkedHashMap<>(1);
+        map.put("link",String.valueOf(bo.getReservatId()));
+        SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
+        String templateId = "SMS_463685073";
+        if("2".equals(bo.getVisitType())){
+            templateId = "SMS_463610067";
+        }
+        SmsResponse smsResponse = smsBlend.sendMessage(bo.getVisitPhone(),templateId,map);
+        System.out.println(bo.getVisitPhone()+"短信回执码"+smsResponse.getCode());
+        XiaoyuanReservat update = MapstructUtils.convert(bo, XiaoyuanReservat.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/reservat/IXiaoyuanReservatService.java

@@ -67,4 +67,6 @@ public interface IXiaoyuanReservatService {
      * @param reservatId
      */
     R<Void> cav(Long reservatId);
+
+    Boolean shByBo(XiaoyuanReservatBo bo);
 }