Merge branch 'V0.1.0' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.1.0

project_data/sql/0.1.0/soc/soc.sql

@@ -226,6 +226,7 @@ create table sms_send_record
     id                 bigint       not null comment '主键'
         primary key,
     type               varchar(32)  not null comment '提醒类型,见字典',
+    type_text          varchar(64)  null comment '提醒类型名称',
     time               datetime     not null comment '发送时间',
     tran_type          int          not null comment '交易类型',
     org_id             bigint       not null comment '接收机构id',
@@ -235,7 +236,8 @@ create table sms_send_record
     user_phone         varchar(125) not null comment '接收人联系方式',
     content_data       varchar(225) not null comment '短信内容',
     result             varchar(225) null comment '发送结果',
-    result_description varchar(125) null comment '发送结果描述'
+    result_description varchar(125) null comment '发送结果描述',
+    resp_detail        varchar(225) null comment '短信发送返回详情'
 )
     comment '短信发送记录';
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/sms/domain/SmsSendRecord.java

@@ -31,6 +31,14 @@ public class SmsSendRecord implements Serializable {
     @TableId("id")
     private Long id;
 
+    @ApiModelProperty(value = "提醒类型")
+    @TableField("type")
+    private String type;
+
+    @ApiModelProperty(value = "提醒类型名称")
+    @TableField("type_text")
+    private String typeText;
+
     @ApiModelProperty(value = "发送时间")
     @TableField("time")
     private LocalDateTime time;
@@ -71,5 +79,7 @@ public class SmsSendRecord implements Serializable {
     @TableField("result_description")
     private String resultDescription;
 
-
+    @ApiModelProperty(value = "返回结果详情")
+    @TableField("resp_detail")
+    private String respDetail;
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/iot/SmsNotifyType.java

@@ -0,0 +1,65 @@
+package com.xunmei.common.core.enums.iot;
+
+import cn.hutool.core.util.ObjectUtil;
+import io.netty.util.internal.StringUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Optional;
+
+@Getter
+@AllArgsConstructor
+public enum SmsNotifyType {
+
+    EXPIRY_REMINDER("10100", "临期提醒"),
+
+    OVERDUE_REMINDER("10200", "逾期提醒"),
+
+    WATER_DRAINAGE_ALARM("4184", "水浸告警"),
+
+    HUMIDITY_TEMPERATURE_ALARM("4183", "温湿度告警"),
+
+    SMOKE_ALARM("4182", "烟感告警"),
+
+    Infrared_Alarm("4181", "红外告警"),
+
+    GAS_ALARM("41885", "燃气告警"),
+
+    ALARM_OF_THEFT("41881", "盗情告警"),
+
+    DOOR_MAGNET_ALARM("4188", "门磁告警"),
+
+    ;
+
+    private final String code;
+
+
+    private final String desc;
+
+    private static final Map<String, SmsNotifyType> enumMap = new LinkedHashMap<>();
+
+    static {
+        for (SmsNotifyType enumNode : SmsNotifyType.values()) {
+            enumMap.put(enumNode.code, enumNode);
+        }
+    }
+    //根据key找value
+    public static String getDesc(String code) {
+        SmsNotifyType e = enumMap.get(code);
+        return e != null ? e.getDesc() : "";
+    }
+    //根据value找key
+    public static String getCode(String desc) {
+        Optional<SmsNotifyType> optional = Arrays.stream(SmsNotifyType.values()).filter(r -> ObjectUtil.equal(r.getDesc(), desc)).findAny();
+        return optional.isPresent() ? optional.get().getCode() : StringUtil.EMPTY_STRING;
+    }
+
+    public static SmsNotifyType getSensorTypeEnum(String code) {
+        return enumMap.get(code);
+    }
+
+
+}

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -82,20 +82,20 @@
         WHERE t.end_date >= #{date}
           and t.end_date <= #{end}
           and t.org_path like concat(#{orgPath}, '%')
-          and (p.plan_cycle < 4 or t.plan_id is null)
+          <!-- and (p.plan_cycle &lt; 4 or t.plan_id is null) -->
     </select>
 
     <select id="selectOverViewDrillTaskInfo" resultType="com.xunmei.core.board.dto.app.AppOverviewTaskInfoDto">
         SELECT sum(if(t.end_date >= #{date}, 1, 0))                            as total,
-               sum(if(t.end_date >= #{date}, (if(t.`status` = 4, 1, 0)), 0))   as completed,
+               sum(if(t.end_date >= #{date}, (if(t.`status` = 3 or t.`status` = 2, 1, 0)), 0))   as completed,
                sum(if(t.end_date &lt; #{date}, 1, 0))                          as prevTotal,
-               sum(if(t.end_date &lt; #{date}, (if(t.`status` = 4, 1, 0)), 0)) as prevcompleted
+               sum(if(t.end_date &lt; #{date}, (if(t.`status` = 3 or t.`status` = 2, 1, 0)), 0)) as prevcompleted
         FROM core_drill_task t
                  left join core_drill_plan p on t.plan_id = p.id
-        WHERE t.end_date >= #{prevdate}
+        WHERE t.end_date >= #{date}
           and t.end_date &lt;= #{end}
           and t.org_path like concat(#{orgPath}, '%')
-          and (p.plan_cycle &lt; 5 or t.plan_id is null)
+          <!-- and (p.plan_cycle &lt; 5 or t.plan_id is null) -->
     </select>
 
     <select id="selectOverViewMonitorTaskInfo" resultType="com.xunmei.core.board.dto.app.AppOverviewTaskInfoDto">
@@ -110,7 +110,7 @@
           and t.org_path like concat(#{orgPath}, '%')
     </select>
     <select id="selectOverViewQuestionInfo" resultType="com.xunmei.core.board.dto.app.AppOverviewTaskInfoDto">
-        SELECT sum(if(confirm_status >= 2, 1, 0)) as total,
+        SELECT sum(if(confirm_status >= 2 and reform_status is not null, 1, 0)) as total,
                sum(if(reform_status = 11, 1, 0))  as completed
         FROM core_question
         WHERE submit_time >= #{date}
@@ -191,18 +191,10 @@
                sum(r.exception_count)            AS exceptionCount
         FROM core_safety_task r
                  left JOIN core_safecheck_plan p ON r.plan_id = p.id
-        WHERE ((
-                           #{startDate}   <![CDATA[<=]]> r.plan_start_time
-                       and #{endDate} >= r.plan_start_time
-                   )
-            or (
-                           #{startDate}    <![CDATA[<=]]> r.plan_end_time
-                       and #{endDate} >= r.plan_end_time
-                   )
-            or (
-                           #{startDate} >= r.plan_start_time
-                       and #{endDate}  <![CDATA[<=]]> r.plan_end_time
-                   ))
+        WHERE (
+                   #{startDate}    <![CDATA[<=]]> r.plan_end_time
+                   and #{endDate} >= r.plan_end_time
+               )
           AND r.org_path LIKE CONCAT(#{orgPath}, '%')
         GROUP BY p.check_type
     </select>
@@ -220,18 +212,10 @@
         SELECT count(0)          AS total,
                sum(r.STATUS = 3) AS completed
         FROM core_drill_task r
-        WHERE ((
-                           #{startDate}   <![CDATA[<=]]> r.start_date
-                       and #{endDate} >= r.start_date
-                   )
-            or (
-                           #{startDate}    <![CDATA[<=]]> r.end_date
-                       and #{endDate} >= r.end_date
-                   )
-            or (
-                           #{startDate} >= r.start_date
-                       and #{endDate}  <![CDATA[<=]]> r.end_date
-                   ))
+        WHERE (
+                   #{startDate}    <![CDATA[<=]]> r.end_date
+                   and #{endDate} >= r.end_date
+               )
           AND r.org_path LIKE CONCAT(#{orgPath}, '%')
     </select>
     <select id="selectSyntheticQuestion" resultType="com.xunmei.core.board.dto.app.AppSyntheticQuestionDto">
@@ -278,18 +262,10 @@
                            (q.confirm_status >= 2 AND q.reform_status IS NOT NULL AND q.src_type = 2, 1, 0))             AS safetyCheckConfirmedCount,
                sum(if(q.reform_status = 10 and q.reform_deadline &lt;= #{today}, 1, 0)) as overdueCount
         FROM core_question q
-        WHERE ((
-                           #{startDate}   <![CDATA[<=]]> q.submit_time
-                       and #{endDate} >= q.submit_time
-                   )
-            or (
-                           #{startDate}    <![CDATA[<=]]> q.reform_deadline
-                       and #{endDate} >= q.reform_deadline
-                   )
-            or (
-                           #{startDate} >= q.submit_time
-                       and #{endDate}  <![CDATA[<=]]> q.reform_deadline
-                   ))
+        WHERE (
+                   #{startDate}    <![CDATA[<=]]> q.reform_deadline
+                   and #{endDate} >= q.reform_deadline
+               )
           AND q.org_path LIKE CONCAT(#{orgPath}, '%')
     </select>
     <select id="selectOverDueQuestionCount" resultType="java.lang.Integer">

soc-modules/soc-modules-core/src/main/resources/mapper/board/CockpitMapper.xml

@@ -42,18 +42,10 @@
         FROM core_safety_task t
                  left JOIN core_safecheck_plan p on t.plan_id = p.id
         where t.org_path like concat(#{orgPath}, '%')
-          and ((
-                           #{startDate}   <![CDATA[<=]]> t.plan_start_time
-                       and #{endDate} >= t.plan_start_time
-                   )
-            or (
-                           #{startDate}    <![CDATA[<=]]> t.plan_end_time
-                       and #{endDate} >= t.plan_end_time
-                   )
-            or (
-                           #{startDate} >= t.plan_start_time
-                       and #{endDate}  <![CDATA[<=]]> t.plan_end_time
-                   ))
+          and (
+                   #{startDate}    <![CDATA[<=]]> t.plan_end_time
+                   and #{endDate} >= t.plan_end_time
+               )
         GROUP BY p.check_type
     </select>
 
@@ -67,18 +59,10 @@
         core_monitoring_retrieval_task r
         <!--                INNER  join ( SELECT id,path FROM sys_org WHERE path LIKE CONCAT(( SELECT path FROM sys_org WHERE id =#{orgId}), '%' ) AND deleted = 0 ) o on r.org_Id=o.id-->
         WHERE
-        ((
-        #{startDate}   <![CDATA[<=]]> r.plan_start_time
-        and #{endDate} >= r.plan_start_time
-        )
-        or (
+        (
         #{startDate}    <![CDATA[<=]]> r.plan_end_time
         and #{endDate} >= r.plan_end_time
         )
-        or (
-        #{startDate} >= r.plan_start_time
-        and #{endDate}  <![CDATA[<=]]> r.plan_end_time
-        ))
         and org_path like concat(#{orgPath},'%')
         GROUP BY
         org_id,org_path
@@ -208,18 +192,10 @@
                            (q.reform_status = 13, 1, 0))                                 AS overDueReformedCount,
                sum(if(q.confirm_status != 3 and q.reform_status!=11 and q.reform_status!=13 and q.reform_deadline &lt;= #{today}, 1, 0)) as overdueCount
         FROM core_question q
-        WHERE ((
-                           #{startDate}   <![CDATA[<=]]> q.submit_time
-                       and #{endDate} >= q.submit_time
-                   )
-            or (
-                           #{startDate}    <![CDATA[<=]]> q.reform_deadline
-                       and #{endDate} >= q.reform_deadline
-                   )
-            or (
-                           #{startDate} >= q.submit_time
-                       and #{endDate}  <![CDATA[<=]]> q.reform_deadline
-                   ))
+        WHERE (
+                   #{startDate}   <![CDATA[<=]]> q.submit_time
+                   and #{endDate} >= q.submit_time
+               )
           AND q.org_path LIKE CONCAT(#{orgPath}, '%')
     </select>
     <select id="selectOverDueQuestionCount" resultType="Map">

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmDataServiceImpl.java

@@ -16,6 +16,7 @@ import com.xunmei.common.core.domain.mediator.domain.IotAlarmRuleExpress;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmRuleSource;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmSystemField;
 import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord;
+import com.xunmei.common.core.enums.iot.SmsNotifyType;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.mediator.api.enums.AlarmDataTypeEnum;
@@ -142,7 +143,8 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
                     //需要发送短信
                     LocalDateTime time = alarm.getTime();
                     String timeStr = time.format(formatter);
-                    remoteSmsService.sendSmsIot(iotSensor.getOrgId(),alarm.getSourceTypeDes(), alarm.getContent(), timeStr);
+                    String alarmType = SmsNotifyType.getDesc(iotSensor.getDeviceType());
+                    remoteSmsService.sendSmsIot(iotSensor.getOrgId(),alarmType, alarm.getContent(), timeStr);
                 }
             }
             if (ObjectUtil.notEqual(iotSensor.getState(), 1)) {

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotSensorServiceImpl.java

@@ -10,15 +10,15 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.DictConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
 import com.xunmei.common.core.domain.iot.domain.IotSensor;
 import com.xunmei.common.core.domain.iot.domain.IotSensorLog;
-import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.mediator.api.mapper.IotSensorMapper;
-import com.xunmei.mediator.api.service.*;
+import com.xunmei.mediator.api.service.IotAlarmDataService;
+import com.xunmei.mediator.api.service.IotSensorLogService;
+import com.xunmei.mediator.api.service.IotSensorService;
+import com.xunmei.mediator.api.service.NorthErrorService;
 import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.util.RedisCheckRepeatDataUtil;
 import com.xunmei.system.api.RemoteOrgService;
@@ -35,15 +35,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import javax.annotation.Resource;
-import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/SmsService.java

@@ -216,6 +216,9 @@ public class SmsService implements ISmsService {
     }
 
     private AjaxResult getResult(CompositeData repData) {
+        if (repData==null){
+            return AjaxResult.error("【发送短信】发送短信失败，短信发送返回结果为空");
+        }
         boolean result = false;
         try {
             String retStatus = repData.getStruct("SYS_HEAD")

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/impl/SmsSendRecordServiceImpl.java

@@ -11,6 +11,8 @@ import com.xunmei.common.core.domain.reminder.dto.ReminderScheduleMsgDto;
 import com.xunmei.common.core.domain.sms.domain.SmsSendRecord;
 import com.xunmei.common.core.domain.sms.dto.SmsSendRecordPageDto;
 import com.xunmei.common.core.domain.sms.vo.SmsSendRecordPageVo;
+import com.xunmei.common.core.enums.iot.SmsNotifyType;
+import com.xunmei.common.core.utils.JacksonUtils;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.sms.mapper.SmsSendRecordMapper;
@@ -87,8 +89,11 @@ public class SmsSendRecordServiceImpl extends ServiceImpl<SmsSendRecordMapper, S
         record.setUserName(sysUser.getName());
         record.setUserPhone(smsInfoVo.getMobile());
         record.setContentData(smsInfoVo.getBak3());
+        record.setType(SmsNotifyType.getCode(smsInfoVo.getRetMsg()));
+        record.setTypeText(smsInfoVo.getRetMsg());
         record.setResult(result.get(AjaxResult.CODE_TAG).equals(String.valueOf(HttpStatus.SUCCESS)) ? "0" : "1");
         record.setResultDescription(result.get(AjaxResult.MSG_TAG).toString());
+        record.setRespDetail(JacksonUtils.toJSONString(result));
         return record;
     }
 
@@ -104,8 +109,11 @@ public class SmsSendRecordServiceImpl extends ServiceImpl<SmsSendRecordMapper, S
         record.setUserName(msgDto.getRecipientName());
         record.setUserPhone(smsInfoVo.getMobile());
         record.setContentData(smsInfoVo.getBak3());
+        record.setType(SmsNotifyType.getCode(smsInfoVo.getRetMsg()));
+        record.setTypeText(smsInfoVo.getRetMsg());
         record.setResult(result.get(AjaxResult.CODE_TAG).equals(String.valueOf(HttpStatus.SUCCESS)) ? "0" : "1");
         record.setResultDescription(result.get(AjaxResult.MSG_TAG).toString());
+        record.setRespDetail(JacksonUtils.toJSONString(result));
         return record;
     }
 }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -264,7 +264,7 @@
     </delete>
 
     <select id="selectUserByRoleNameAndOrgId" resultType="com.xunmei.system.api.domain.SysUser">
-        select u.id, u.username,u.phone
+        select u.id, u.username,u.phone,u.name
         from sys_user u
                  inner join sys_org o on u.org_id = o.id and u.deleted=0
                  inner join sys_user_role ur on u.id = ur.user_id