111

db/.back_文明创办/.back_文明创办/文明创办-backup-2023511112445.pdma.json → db/.back_文明创办/文明创办-backup-2023531102652.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-11 11:24:01",
+  "updatedTime": "2023-5-18 11:20:34",
   "dbConns": [],
   "profile": {
     "default": {
@@ -7186,6 +7186,23 @@
           "refDict": "",
           "uiHint": "",
           "id": "A836C724-F5D9-4A45-A413-209B55DDA976"
+        },
+        {
+          "defKey": "card_title",
+          "defName": "卡片名称",
+          "comment": "小程序端，新建定位时显示的名称",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "1CDF0BAA-5F46-498F-A791-FD71F33EB3D5"
         }
       ],
       "correlations": [],

db/upgrade.1.3.sql

@@ -0,0 +1,4 @@
+
+--2023-5-25
+ALTER TABLE `sys_org`
+ADD COLUMN sms_pson varchar(255) NULL COMMENT '短信接收者' AFTER create_date;

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-18 11:20:34",
+  "updatedTime": "2023-5-31 10:26:52",
   "dbConns": [],
   "profile": {
     "default": {

src/main/java/com/example/civilizedcity/CivilizedCityApplication.java

@@ -2,6 +2,7 @@ package com.example.civilizedcity;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 

src/main/java/com/example/civilizedcity/common/SMSUtils.java

@@ -60,49 +60,3 @@ public class SMSUtils implements InitializingBean {
 
 }
 
-//import com.alibaba.fastjson.JSONObject;
-//import com.aliyuncs.CommonRequest;
-//import com.aliyuncs.CommonResponse;
-//import com.aliyuncs.DefaultAcsClient;
-//import com.aliyuncs.IAcsClient;
-//import com.aliyuncs.exceptions.ClientException;
-//import com.aliyuncs.http.MethodType;
-//import com.aliyuncs.profile.DefaultProfile;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.Map;
-
-//@Service
-////@EnableScheduling //开启定时任务
-////@EnableAsync  //开启多线程
-//public class SMSUtils {
-//    //    @Override
-////    @Async
-////    @Scheduled(cron = "0 30 8 * * ?") //时隔多少秒
-//    public static void smsMessage(String phoneNumber, String TemplateCode, Map code) {  //AccessKey ID 账号 AccessKey secret密码
-//        DefaultProfile profile = DefaultProfile.getProfile("cn-nanjing", "LTAI4G16F251gw8zRaePUPQo", "你自己的密码");
-//        IAcsClient client = new DefaultAcsClient(profile);
-//        //阿里云原有的配置信息我们不需要改动
-//        CommonRequest request = new CommonRequest();
-//        request.setSysMethod(MethodType.POST);
-//        request.setSysDomain("dysmsapi.aliyuncs.com");
-//        request.setSysVersion("2017-05-25");
-//        request.setSysAction("SendSms");
-//        //自定义短信信息
-//        request.putQueryParameter("phoneNumber", phoneNumber); //发送给哪个手机号
-//        request.putQueryParameter("SignName", "清峰小栈");  //自己配置的短信签名
-//        request.putQueryParameter("TemplateCode", TemplateCode); //自己配置的模板 模版CODE
-//
-//        //构建一个短信验证码
-////        HashMap<String, Object> map = new HashMap<>();
-////        map.put("code", 8456);
-//        request.putQueryParameter("TemplateParam", JSONObject.toJSONString(code));   //转换成json字符串
-//        try {
-//            CommonResponse response = client.getCommonResponse(request); //发送至客户端
-//            System.out.println(response.getData());
-//        } catch (ClientException e) {
-//            e.printStackTrace();
-//        }
-//    }
-//
-//}

src/main/java/com/example/civilizedcity/entity/SysOrg.java

@@ -53,4 +53,9 @@ public class SysOrg implements Serializable,Cloneable{
     @ApiModelProperty(name = "创建时间",notes = "")
     private LocalDateTime createDate ;
 
+     /** 短信接收者 */
+     @ApiModelProperty(name = "短信接收者",notes = "")
+     private String smsPson ;
+
+
 }

src/main/java/com/example/civilizedcity/mapper/SysOrgMapper.java

@@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import com.example.civilizedcity.entity.SysOrg;
 
- /**
+import java.util.List;
+
+/**
  * 单位表;(sys_org)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
@@ -16,4 +18,6 @@ public interface SysOrgMapper  extends BaseMapper<SysOrg>{
      String sysOrgService(@Param("orgPId") String orgPId);
 
      long changeOrgCode(@Param("from") String from, @Param("to") String to);
+
+     List<SysOrg> getAllList();
  }

src/main/java/com/example/civilizedcity/mapper/TaIssueMapper.java

@@ -44,4 +44,8 @@ public interface TaIssueMapper  extends BaseMapper<TaIssue>{
 
     int removeByIssueId(@Param("issueId") String issueId);
 
+
+    long expectRubNum(@Param("orgId") String org_id);
+
+    long AssignedRubNum(@Param("orgId") String org_id);
 }

src/main/java/com/example/civilizedcity/service/TaIssueService.java

@@ -33,4 +33,7 @@ public interface TaIssueService extends IBaseService<TaIssue> {
     void reject(TaIssue taIssue, TaIssueProcess taIssueProcess, SysUser user) throws Exception;
 
     TaIssue copyIssue(TaIssue origin, SysUser sysUser);
+
+
+    void issueWarning();
 }

src/main/java/com/example/civilizedcity/service/impl/TaIssueServiceImpl.java

@@ -2,21 +2,19 @@ package com.example.civilizedcity.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.civilizedcity.common.Constants;
+import com.example.civilizedcity.common.SMSCaptcha;
 import com.example.civilizedcity.entity.*;
 import com.example.civilizedcity.event.MessagEvent;
 import com.example.civilizedcity.mapper.*;
+import com.example.civilizedcity.service.TaIssueService;
 import com.example.civilizedcity.vo.StatVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
-import com.example.civilizedcity.service.TaIssueService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 问题表;(ta_issue)表服务实现类
@@ -30,6 +28,12 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
     @Autowired
     TaOrgIssueMapper taOrgIssueMapper;
 
+    @Autowired
+    SysOrgMapper sysOrgMapper;
+
+    @Autowired
+    SMSCaptcha sMSCaptcha;
+
     @Autowired
     TaFeedbackMapper taFeedbackMapper;
 
@@ -289,6 +293,44 @@ public class TaIssueServiceImpl extends BaseServiceImpl<TaIssueMapper, TaIssue>
         return taIssue;
     }
 
+    @Override
+    public void issueWarning() {
+        // 1. 获取所有机构
+        List<SysOrg> orgList = sysOrgMapper.getAllList();
+
+
+        // 2. 遍历每个机构是否有未交办,逾期
+        for (SysOrg element : orgList) {
+
+            //已逾期
+            long eRubNum = baseMapper.expectRubNum(element.getOrgId());
+            //待交办
+            long aRubNum = baseMapper.AssignedRubNum(element.getOrgId());
+
+            if(eRubNum!=0){
+                String[] telSms = element.getSmsPson().split(",");
+                try {
+                    sMSCaptcha.send(telSms[0],"已逾期");
+                    sMSCaptcha.send(telSms[1],"已逾期");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            if(aRubNum!=0){
+                String[] telSms = element.getSmsPson().split(",");
+                try {
+                    sMSCaptcha.send(telSms[0],"待交办");
+                    sMSCaptcha.send(telSms[1],"待交办");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+//                让程序停顿一秒
+            try{Thread.sleep(1000);}catch(Exception e){}
+        }
+
+    }
+
     Integer getStatValueBy(Object v, Integer def) {
         if (null == v) return def;
         return Integer.valueOf(v.toString());

src/main/java/com/example/civilizedcity/task/everyDayMessage.java

@@ -0,0 +1,28 @@
+package com.example.civilizedcity.task;
+
+import com.example.civilizedcity.service.TaIssueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+@EnableScheduling//开启定时任务
+@EnableAsync  //开启多线程
+public class everyDayMessage {
+
+    @Autowired
+    TaIssueService taIssueService;
+
+//    @Async
+    @Scheduled(cron = "50 20 17 * * ?")
+    public void issueWarning() {
+        System.out.println("开始拉");
+        taIssueService.issueWarning();
+    }
+
+}
+
+
+

src/main/java/task/everyDayMessage.java

@@ -1,18 +0,0 @@
-package task;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-@EnableScheduling //开启定时任务
-@EnableAsync  //开启多线程
-public class everyDayMessage {
-
-    @Async
-    @Scheduled(cron = "0 30 8 * * ?") //时隔多少秒
-    public void remind() {
-
-
-
-
-    }
-}

src/main/resources/application.yml

@@ -17,7 +17,7 @@ spring:
 ###
 sms:
   captcha:
-    code: SMS 460785881
+    code: SMS_460785881
     sign: 荟居
 
 ###
@@ -35,8 +35,8 @@ yz:
       - "/ma/auth-phone"
   sms:
     ##任意命名
-    appid:
-    api:
+    appid: huoshan
+    api: http://sms.njyunzhi.com/sms
     ## 帮助文档
     help: http://sms.njyunzhi.com/help
 sa-token:

src/main/resources/mapper/SysOrgMapper.xml

@@ -21,4 +21,12 @@
             t.org_code DESC
             LIMIT 1
     </select>
+    <select id="getAllList" resultType="com.example.civilizedcity.entity.SysOrg">
+        SELECT
+        o.org_id,
+        o.NAME,
+        o.sms_pson
+        FROM
+        `sys_org` o
+    </select>
 </mapper>

src/main/resources/mapper/TaIssueMapper.xml

@@ -5,24 +5,24 @@
     <update id="updateApply">
         UPDATE ta_issue t
         SET t.apply_type = #{applyType},
-            t.apply_id = #{applyId}
+        t.apply_id = #{applyId}
         WHERE
-            t.issue_id = #{issueId}
+        t.issue_id = #{issueId}
     </update>
     <update id="updateValidateStatus">
         UPDATE ta_issue t
         SET t.validate_status = #{validateStatus}
         WHERE
-            t.issue_id = #{issueId}
+        t.issue_id = #{issueId}
     </update>
     <update id="updateProcess">
         UPDATE ta_issue t
         SET t.process_node = #{processNode},
-            t.process_status = #{processStatus},
-            t.update_user = #{userId},
-            t.update_date = now( )
+        t.process_status = #{processStatus},
+        t.update_user = #{userId},
+        t.update_date = now( )
         WHERE
-            t.issue_id = #{issueId}
+        t.issue_id = #{issueId}
     </update>
 
     <update id="removeByIssueId">
@@ -34,100 +34,128 @@
 
     <select id="getPageBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT
-            *
+        *
         FROM
-            ta_issue t
+        ta_issue t
         WHERE
-            EXISTS (
-                    SELECT
-                        *
-                    FROM
-                        ta_issue_process s ON s.issue_id = t.issue_id
-                    WHERE
-                    ( s.org_id = #{orgId} OR s.next_org = #{orgId} )
-                        AND s.`status` &gt; -1
-                )
-          AND t.`status` &gt; -1
+        EXISTS (
+        SELECT
+        *
+        FROM
+        ta_issue_process s ON s.issue_id = t.issue_id
+        WHERE
+        ( s.org_id = #{orgId} OR s.next_org = #{orgId} )
+        AND s.`status` &gt; -1
+        )
+        AND t.`status` &gt; -1
         ORDER BY
-            t.create_date DESC
+        t.create_date DESC
     </select>
     <select id="getAllBy" resultType="com.example.civilizedcity.entity.TaIssue">
         SELECT
-            *
+        *
         FROM
-            ta_issue t
+        ta_issue t
         WHERE
-            t.`status` &gt; -1
+        t.`status` &gt; -1
         ORDER BY
-            t.create_date DESC
+        t.create_date DESC
     </select>
     <select id="statMaIndex" resultType="java.util.Map">
         SELECT
-            count(*) as published_num,
-            sum(IF(t.process_node = '01', 1, 0)) as unassigned_num,
-            sum(IF(t.process_node LIKE '02%', 1, 0)) as assigned_num,
-            sum(IF(t.process_node = '03', 1, 0)) as end_num
+        count(*) as published_num,
+        sum(IF(t.process_node = '01', 1, 0)) as unassigned_num,
+        sum(IF(t.process_node LIKE '02%', 1, 0)) as assigned_num,
+        sum(IF(t.process_node = '03', 1, 0)) as end_num
         FROM
-            ta_issue t
+        ta_issue t
         WHERE 1 = 1
-          <if test="null != userId and userId != ''">
-              AND t.create_user = #{userId}
-          </if>
-          AND t.`status` > - 1
+        <if test="null != userId and userId != ''">
+            AND t.create_user = #{userId}
+        </if>
+        AND t.`status` > - 1
     </select>
     <select id="statIssueOrg" resultType="java.util.Map">
         SELECT
-            UUID_SHORT( ) AS id,
-            IFNULL( SUM( IF ( t.process_node = '03', 1, 0 ) ), 0 ) AS endNum,
-        IFNULL( SUM( IF ( TO_DAYS(t.expire_date) &gt;= TO_DAYS(NOW()) AND t.process_node  LIKE '02%', 1, 0 ) ), 0 )  AS assignedNum,
-        IFNULL( SUM( IF ( TO_DAYS(t.expire_date) &lt; TO_DAYS(NOW()) AND t.process_node  LIKE '02%', 1, 0 ) ), 0 ) AS expireNum
+        UUID_SHORT( ) AS id,
+        IFNULL( SUM( IF ( t.process_node = '03', 1, 0 ) ), 0 ) AS endNum,
+        IFNULL( SUM( IF ( TO_DAYS(t.expire_date) &gt;= TO_DAYS(NOW()) AND t.process_node LIKE '02%', 1, 0 ) ), 0 ) AS
+        assignedNum,
+        IFNULL( SUM( IF ( TO_DAYS(t.expire_date) &lt; TO_DAYS(NOW()) AND t.process_node LIKE '02%', 1, 0 ) ), 0 ) AS
+        expireNum
         FROM
-            ta_issue t
+        ta_issue t
         WHERE
-            t.org_id = #{orgId}
-            AND t.`status` &gt; -1
+        t.org_id = #{orgId}
+        AND t.`status` &gt; -1
     </select>
     <select id="statIssueType" resultType="com.example.civilizedcity.vo.StatVo">
         SELECT
-            *
+        *
         FROM
-            (
-                SELECT
-                    t.`name`,
-                    sum( IF ( s.issue_id IS NULL, 0, 1 ) ) AS `value`
-                FROM
-                    td_issue_type t
-                        LEFT JOIN ta_issue s ON s.type_id = t.type_id
-                        AND s.`status` &gt; - 1
-                GROUP BY
-                    t.type_id
-            ) a
+        (
+        SELECT
+        t.`name`,
+        sum( IF ( s.issue_id IS NULL, 0, 1 ) ) AS `value`
+        FROM
+        td_issue_type t
+        LEFT JOIN ta_issue s ON s.type_id = t.type_id
+        AND s.`status` &gt; - 1
+        GROUP BY
+        t.type_id
+        ) a
         ORDER BY
-            a.`value` DESC
+        a.`value` DESC
     </select>
     <select id="statIssueLoc" resultType="com.example.civilizedcity.vo.StatVo">
         SELECT
-            *
+        *
         FROM
-            (
-                SELECT
-                    t.`name`,
-                    ifnull( s.cnt, 0 ) AS `value`
-                FROM
-                    td_loc_type t
-                        LEFT JOIN (
-                        SELECT
-                            a.loc_id,
-                            count( 1 ) AS cnt
-                        FROM
-                            ta_issue a
-                        WHERE
-                            a.`status` > - 1
-                        GROUP BY
-                            a.loc_id
-                    ) s ON t.type_id = s.loc_id
-            ) m
+        (
+        SELECT
+        t.`name`,
+        ifnull( s.cnt, 0 ) AS `value`
+        FROM
+        td_loc_type t
+        LEFT JOIN (
+        SELECT
+        a.loc_id,
+        count( 1 ) AS cnt
+        FROM
+        ta_issue a
+        WHERE
+        a.`status` > - 1
+        GROUP BY
+        a.loc_id
+        ) s ON t.type_id = s.loc_id
+        ) m
         ORDER BY
-            m.`value` DESC
+        m.`value` DESC
+    </select>
+
+
+    <select id="expectRubNum" resultType="java.lang.Long">
+        SELECT
+        COUNT( 1 ) AS rubNum
+        FROM
+        `ta_issue` s
+        WHERE
+        s.`status` = 1
+        AND s.process_node != '03'
+        AND TO_DAYS( s.expire_date ) &lt;
+        TO_DAYS( NOW( ) )
+        AND s.org_id = #{orgId}
+    </select>
+
+
+    <select id="AssignedRubNum" resultType="java.lang.Long">
+        SELECT
+        COUNT(1) as rubNum
+        FROM
+        `ta_issue` s
+        WHERE
+        s.`status` = 1
+        AND s.process_node LIKE '01'
+        AND s.org_id = #{orgId}
     </select>
 </mapper>