功能优化

2024-04-18 09:32:37 +08:00
parent e5c8ebfb31
commit 6da9516d82
55 changed files with 1790 additions and 1177 deletions
@@ -1,17 +1,5 @@
 package com.ruoyi.web.controller.system;

-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -20,6 +8,12 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;

 /**
 * 菜单信息
@@ -139,4 +133,13 @@ public class SysMenuController extends BaseController
        }
        return toAjax(menuService.deleteMenuById(menuId));
    }
+    /**
+     * 根据用户查询菜单权限字符
+     */
+   @GetMapping("/getMenuPermsByUser")
+    public AjaxResult getMenuPermsByUser()
+    {
+
+        return menuService.getMenuPermsByUser();
+    }
 }
@@ -44,6 +44,17 @@ public class WeChatUserController extends BaseController {
        }
        return weChatUserService.sendCode(userVO);
    }
+    /**
+     * 获取邮箱验证码
+     * @param email
+     * @return
+     */
+    @Anonymous
+    @GetMapping("/sendEmailCode")
+    public AjaxResult sendEmailCode(  @RequestParam("email") String email)
+    {
+        return weChatUserService.sendEmailCode(email);
+    }
    @Anonymous
    @GetMapping("/roles")
    public AjaxResult roles()
@@ -10,7 +10,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.EsignDemoException;
 import com.ruoyi.common.utils.IdCardUtils;
-import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
 import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication;
 import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAttach;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.*;
@@ -73,11 +72,10 @@ public class MsCaseApplicationController extends BaseController {
    /**
     * 新增案件
     */
-    // todo 重复提交校验
    @PostMapping("/insert")
    public AjaxResult insert(@RequestBody MsCaseApplicationVO caseApplication )
    {
-        if( caseApplication.getAffiliate()==null|| caseApplication.getOrganizeFlag()==null){
+        if( caseApplication.getAffiliate()==null){
            error("参数校验失败");
        }
        AjaxResult ajaxResult = AjaxResult.success();
@@ -390,17 +388,7 @@ public class MsCaseApplicationController extends BaseController {

        return  success(videoService.reserveConferenceList(caseId));
    }
-    /**
-     * 查询短信发送记录
-     * @param smsSendRecord
-     * @return
-     */
-    @PostMapping("/smsRecord")
-    public TableDataInfo getSmsSendRecord(@RequestBody SmsSendRecord smsSendRecord){
-        startPage();
-        List<SmsSendRecord> list = caseApplicationService.getSmsSendRecord(smsSendRecord);
-        return getDataTable(list);
-    }
+
    /**
     * 保存onlyOffice在线编辑的文件
     * @param
@@ -125,6 +125,8 @@ public class MsVideoConferenceController extends BaseController {
                .useId(SecurityUtils.getUserId())
                .useAccount(SecurityUtils.getUsername())
                .build();
+        // 先删除之前的附件
+        msCaseAttachMapper.deleteCaseAttachByCasedIdAndType(caseId,annexType);
        msCaseAttachMapper.save(caseAttach);
        return caseAttach.getAnnexId();
    }
@@ -1,35 +1,74 @@
 package com.ruoyi.web.controller.wisdomarbitrate.sendrecord;

+import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.entity.sms.MsSmsSendRecordParam;
+import com.ruoyi.system.domain.entity.sms.MsSmsTemplateParam;
+import com.ruoyi.system.mapper.sms.MsSmsSendHistoryRecordParamMapper;
+import com.ruoyi.system.mapper.sms.MsSmsSendRecordParamMapper;
 import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
 import com.ruoyi.wisdomarbitrate.domain.vo.shortmessage.ReSendMessageVO;
 import com.ruoyi.wisdomarbitrate.mapper.sendrecord.SmsRecordMapper;
 import com.ruoyi.wisdomarbitrate.service.shortmessage.ShortMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;

+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;

@RestController
@RequestMapping("/shortMessage")
-public class ShortMessageController {
+public class ShortMessageController extends BaseController {
    @Autowired
    private SmsRecordMapper smsRecordMapper;
    @Autowired
    private ShortMessageService shortMessageService;
+    @Autowired
+    MsSmsSendRecordParamMapper recordParamMapper;
+    @Autowired
+    MsSmsSendHistoryRecordParamMapper historyRecordParamMapper;
+    /**
+     * 查询短信发送记录
+     * @param smsSendRecord
+     * @return
+     */
+    @GetMapping("/recordList")
+    public TableDataInfo smsSendRecordList( SmsSendRecord smsSendRecord){
+        startPage();
+        List<SmsSendRecord> list = shortMessageService.smsSendRecordList(smsSendRecord);
+        return getDataTable(list);
+    }

    @Anonymous
    @PostMapping("/updateSendContent")
    public AjaxResult update(@RequestBody SmsSendRecord smsSendRecord) {
-        if (smsSendRecord != null && smsSendRecord.getId() != null) {
-            SmsSendRecord oldSendRecord = smsRecordMapper.selectById(smsSendRecord.getId());
-            smsSendRecord.setUpdateTime(new Date());
-            smsRecordMapper.updateSendContent(smsSendRecord);
-            shortMessageService.insertShortMessageHistoryRecord(oldSendRecord);
-            return AjaxResult.success();
+        if(smsSendRecord == null|| smsSendRecord.getId() == null || CollectionUtil.isEmpty(smsSendRecord.getTemplateParams())){
+            return AjaxResult.error("参数校验失败");
        }
-        return AjaxResult.error("更新失败");
+             // 查询当前版本记录
+        SmsSendRecord oldSendRecord = smsRecordMapper.selectById(smsSendRecord.getId());
+        smsSendRecord.setUpdateTime(new Date());
+            //  更新短信内容，先删除短信记录参数表
+            Example recordParamExam = new Example(MsSmsSendRecordParam.class);
+            recordParamExam.createCriteria().andEqualTo("smsRecordId", smsSendRecord.getId());
+            recordParamMapper.deleteByExample(recordParamExam);
+            // 新增短信记录参数表
+        List<MsSmsSendRecordParam> recordParams = new ArrayList<>();
+        for (MsSmsTemplateParam templateParam : smsSendRecord.getTemplateParams()) {
+            MsSmsSendRecordParam recordParam = new MsSmsSendRecordParam();
+            recordParam.setSmsRecordId(smsSendRecord.getId());
+            recordParam.setParamValue(templateParam.getParamValue());
+            recordParams.add(recordParam);
+        }
+            recordParamMapper.batchInsert(recordParams);
+            shortMessageService.insertShortMessageHistoryRecord(oldSendRecord,recordParams);
+            return AjaxResult.success();
+
    }

    /**
@@ -0,0 +1,55 @@
+package com.ruoyi.web.controller.wisdomarbitrate.sms;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.entity.sms.MsSmsTemplate;
+import com.ruoyi.wisdomarbitrate.service.sms.SMSTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 短信模板控制器
+ */
+@RestController
+@RequestMapping("/smsTemplate")
+public class SMSTemplateController extends BaseController {
+    @Autowired
+    private SMSTemplateService templateService;
+
+    /**
+     * 查询
+     * @param
+     * @return
+     */
+    @GetMapping("/page")
+    public TableDataInfo page( ){
+        startPage();
+        List<MsSmsTemplate> list = templateService.page();
+        return getDataTable(list);
+    }
+    /**
+     * 新增或者修改
+     * @param
+     * @return
+     */
+    @PostMapping("/insert")
+    public AjaxResult insert(@RequestBody MsSmsTemplate template){
+        return templateService.insert(template);
+    }
+    /**
+     * 删除
+     * @param
+     * @return
+     */
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody MsSmsTemplate template){
+        if(template.getId()==null){
+            return AjaxResult.warn("id不能为空");
+        }
+        return templateService.delete(template.getId());
+    }
+
+}