Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/projectV2/ZsyzShqxPzController.java

@@ -85,7 +85,7 @@ public class ZsyzShqxPzController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:pz:edit')")
     @Log(title = "招商引资_审核期限_配置", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody ZsyzShqxPz zsyzShqxPz)
     {
         return toAjax(zsyzShqxPzService.updateZsyzShqxPz(zsyzShqxPz));
@@ -96,7 +96,7 @@ public class ZsyzShqxPzController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:pz:remove')")
     @Log(title = "招商引资_审核期限_配置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @GetMapping(value = "/delete/{id}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(zsyzShqxPzService.deleteZsyzShqxPzByIds(ids));

ruoyi-system/src/main/java/com/ruoyi/system/service/Task.java → ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/Task.java

@@ -1,14 +1,21 @@
-package com.ruoyi.system.service;
+package com.ruoyi.framework.web.service;
 
 
 import com.ruoyi.common.constant.CommonConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.system.domain.SysHoliday;
 import com.ruoyi.system.domain.projectV2.*;
+import com.ruoyi.system.domain.projectV2.common.SendSmsConfig;
 import com.ruoyi.system.mapper.SysHolidayMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.projectV2.*;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.projectV2.common.ISendSmsConfigService;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -19,6 +26,8 @@ import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.ruoyi.common.constant.CommonConstants.ONE;
+
 @Component
 public class Task {
 
@@ -49,6 +58,12 @@ public class Task {
     @Autowired
     private ZsyzJzqkTsMapper zsyzJzqkTsMapper;
 
+    @Autowired
+    private ISendSmsConfigService sendSmsConfigService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
 
 
 
@@ -359,6 +374,21 @@ public class Task {
 
         for (ZsyzDbd dbd : zsyzDbds) {
             zsyzDbdMapper.insertZsyzDbd(dbd);
+            List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
+            //发送短信
+            List<SysUser> sysUsers = sysUserService.selectUserByDeptId(dbd.getDeptId());
+            if (sysUsers != null) {
+                for (SysUser sysUser : sysUsers) {
+                    if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
+                        SendSmsConfig sendSmsConfig = new SendSmsConfig();
+                        sendSmsConfig.setPhone(sysUser.getPhonenumber());
+                        sendSmsConfigs.add(sendSmsConfig);
+                    }
+                }
+                if (sendSmsConfigs.size() > 0) {
+                    AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs, "SMS_272470945"));
+                }
+            }
         }
         System.out.println("定时任务结束");
 
@@ -820,6 +850,23 @@ public class Task {
                 zsyzJzqkTs.setCreateTime(DateUtils.getNowDate());
                 zsyzJzqkTs.setUpdateTime(DateUtils.getNowDate());
                 zsyzJzqkTsMapper.insertZsyzJzqkTs(zsyzJzqkTs);
+
+                //发送短信
+                List<SendSmsConfig> sendSmsConfigs = new ArrayList<>();
+                List<SysUser> sysUsers = sysUserService.selectUserByDeptId(sbbzb.getCjdId());
+                if (sysUsers != null) {
+                    for (SysUser sysUser : sysUsers) {
+                        if (StringUtils.isNotEmpty(sysUser.getPhonenumber())) {
+                            SendSmsConfig sendSmsConfig = new SendSmsConfig();
+                            sendSmsConfig.setPhone(sysUser.getPhonenumber());
+                            sendSmsConfigs.add(sendSmsConfig);
+                        }
+                    }
+                    if (sendSmsConfigs.size() > 0) {
+                        AsyncManager.me().execute(AsyncFactory.sendSms(sendSmsConfigs, "SMS_272615944"));
+                    }
+                }
+
             }
         }
     }