1

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -3,12 +3,14 @@ package com.ruoyi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
 
 /**
  * 启动程序
  * 
  * @author ruoyi
  */
+@EnableAsync
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 public class RuoYiApplication
 {

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

@@ -24,7 +24,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.101.10:3306/qianshan_nucleic_contrast?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.101.10:3306/OA_kaoqin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: Boman123
             # 从库数据源

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

@@ -32,7 +32,7 @@ spring:
             slave:
                 # 从数据源开关/默认关闭
                 enabled: true
-                url: jdbc:mysql://172.27.189.57:3386/qss_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://60.171.171.235:3386/qss_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: qss_db
                 password: S6u269%6
             # 初始连接数

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java

@@ -36,7 +36,9 @@ public class MimeTypeUtils
             // 视频格式
             "mp4", "avi", "rmvb",
             // pdf
-            "pdf" };
+            "pdf" ,
+            //app
+            "wgt","apk"};
 
     public static String getExtension(String prefix)
     {

ruoyi-system/src/main/java/com/ruoyi/system/mapper/AkmDataMapper.java

@@ -63,4 +63,6 @@ public interface AkmDataMapper
     List<AkmData> selectAkmDataListByIdList(@Param("startTime") String startTime, @Param("endTime")String endTime, @Param("idCardList")List<String> idCardList);
 
     List<AkmData> selectAkmData65ListByIdList(@Param("startTime") String startTime, @Param("endTime")String endTime);
+
+    AkmData selectAkmDataName(String idCard);
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserInfoMapper.java

@@ -73,4 +73,6 @@ public interface UserInfoMapper
     List<String> selectUserInfoByEndTime(@Param("endTime")String endTime,@Param("deptId")Long deptId);
 
     List<OdsQssHsjcxx> thirdNucleicAcid65(@Param("startTime")String startTime, @Param("endTime")String endTime);
+
+    List<OdsQssHsjcxx> thirdNucleicAcidDs(@Param("startTime") String startTime, @Param("endTime")String endTime, @Param("idCardList")List<String> idCardList);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/OdsQssHsjcxxService.java

@@ -8,4 +8,9 @@ public interface OdsQssHsjcxxService {
     List<OdsQssHsjcxx> thirdNucleicAcid(String startTime, String endTime, List<String> idCardList);
 
     List<OdsQssHsjcxx> thirdNucleicAcid65(String startTime, String endTime);
+
+
+    List<OdsQssHsjcxx> thirdNucleicAcidDs(String startTime, String endTime, List<String> idCardList);
+
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/Task.java

@@ -14,6 +14,7 @@ import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysInterfaceForeignMapper;
 import com.ruoyi.system.utils.ExcelUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -41,8 +42,9 @@ public class Task {
     /***
      * 邮件发送（定时比对数据后发送邮件）
      */
+    @Async
     @Scheduled(cron = "0 10,40 * * * ? ")
-    //@Scheduled(cron = "0 0/1 * * * ? ")
+    //@Scheduled(cron = "0 0/2 * * * ? ")
     public void thirdNucleicAcid() {
         try {
 
@@ -66,8 +68,8 @@ public class Task {
             String time = DateUtils.formatString(data);
             //往前推半个小时
 
-            //String startTime = "2022-11-17 08:30:00";
-            //String endTime = "2022-11-17 09:00:00";
+            //String startTime = "2022-12-12 10:00:00";
+            //String endTime = "2022-12-12 10:30:00";
             String startTime = DateUtils.plusSeconds(time, -70);
             String endTime = DateUtils.plusSeconds(time, -40);
             //SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -90,6 +92,7 @@ public class Task {
             List<OdsQssHsjcxx> OdsQssHsjcxxList65 = qdsQssHsjcxxService.thirdNucleicAcid65(startTime, endTime);
             OdsQssHsjcxxList.addAll(OdsQssHsjcxxList65);
             //查询安康码采集地点信息
+            System.out.println("执行查询安康码采集地点信息sql");
             List<AkmData> akmDataList = akmDataMapper.selectAkmDataListByIdList(startTime, endTime, idCardList);
 
             //查询65开头的安康码扫码数据
@@ -217,8 +220,7 @@ public class Task {
                         "3555393474@qq.com",
                         "731020@qq.com","1176443192@qq.com");
                 /*ArrayList<String> tos2 = CollUtil.newArrayList(
-                        "1223814488@qq.com",
-                        "15156696045@139.com");*/
+                        "1434745622@qq.com");*/
                 MailUtil.send(tos2, "会员积分实时变动通知", sb.toString(), true);
             }
             /*if(b1){
@@ -249,6 +251,7 @@ public class Task {
     /**
      * 定时重置查询次数
      */
+    @Async
     @Scheduled(cron = "0 1 0 * * ? ")
     public void reset() {
         List<SysInterfaceForeign> interfaceForeignList = sysInterfaceForeignMapper.selectSysInterfaceForeignList(new SysInterfaceForeign());

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AkmDataServiceImpl.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
@@ -109,8 +111,15 @@ public class AkmDataServiceImpl implements IAkmDataService
     public AjaxResult insertAkmData(AkmData akmData)
     {
         try {
+
             if(akmData.getAkmDataList()!=null && akmData.getAkmDataList().size()>0){
                 for (AkmData data : akmData.getAkmDataList()) {
+                    if(StringUtils.isEmpty(data.getName())){
+                        AkmData akm = akmDataMapper.selectAkmDataName(data.getIdCard());
+                        if(akm!=null && StringUtils.isEmpty(akm.getName())){
+                            data.setName(akm.getName());
+                        }
+                    }
                     akmDataMapper.insertAkmData(data);
                 }
             }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OdsQssHsjcxxServiceImpl.java

@@ -39,6 +39,24 @@ public class OdsQssHsjcxxServiceImpl  implements OdsQssHsjcxxService {
         return accountingDataVos;
     }
 
+    /**
+     * 从第三方库获取核酸数据(定时)
+     */
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    @DataSource(value = DataSourceType.SLAVE)
+    @Override
+    public List<OdsQssHsjcxx> thirdNucleicAcidDs(String startTime,String endTime, List<String> idCardList) {
+        System.out.println("batchInsert 查询数据开始(定时任务)========");
+        long start1 = System.currentTimeMillis();
+        List<OdsQssHsjcxx> accountingDataVos = userInfoMapper.thirdNucleicAcidDs(startTime,endTime,idCardList);
+        if(accountingDataVos!=null){
+            //taskService.insertAccountingData(accountingDataVos);
+        }
+        long end1 = System.currentTimeMillis();
+        System.out.println("---------------查询数据耗时(定时任务)" + (end1 - start1) + "---------------");
+        return accountingDataVos;
+    }
+
     /**
      * 从第三方库获取核酸数据（身份证65开头）
      */

ruoyi-system/src/main/resources/mapper/system/AkmDataMapper.xml

@@ -78,6 +78,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and SUBSTRING(id_card, 1,2) = '65'
     </select>
 
+    <select id="selectAkmDataName" resultMap ="AkmDataResult">
+        select name,id_card from akm_data where id_card = #{idCard} and name is not null and name !='' limit 1
+    </select>
+
     <insert id="insertAkmData" parameterType="AkmData" useGeneratedKeys="true" keyProperty="id">
         insert into akm_data
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml

@@ -287,9 +287,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.cjsj;
     </select>
 
+    <select id="thirdNucleicAcidDs" resultType="com.ruoyi.system.domain.OdsQssHsjcxx">
+        select sfzhm,xm,sjhm,cjsj,jcdd
+        from ( select sfzhm,xm,sjhm,cjsj,,jcdd
+        from ods_qss_hsjcxx_all
+        where cjsj > #{startTime}  and #{endTime}>=cjsj
+        and sjly != '东软系统'
+        and sfzhm in
+        <foreach item="idCard" collection="idCardList" open="(" separator="," close=")">
+            #{idCard}
+        </foreach>
+
+        UNION
+
+        SELECT s.id_card_no as sfzhm,
+        s.user_name as xm,
+        s.user_phone as sjhm,
+        s.collect_datetime as cjsj,
+        s.collect_site_name as jcdd,
+        FROM `tb_whole_testing_sample_921`  s
+        where s.create_datetime > #{startTime}  and #{endTime}>=s.create_datetime
+        and s.id_card_no in
+        <foreach item="idCard" collection="idCardList" open="(" separator="," close=")">
+            #{idCard}
+        </foreach>
+        ) a
+        order by a.cjsj;
+    </select>
+
+
     <select id="thirdNucleicAcid65" resultType="com.ruoyi.system.domain.OdsQssHsjcxx">
-        select sfzhm,xm,sjhm,cjsj,jgcjss,jcdd,jcjg
-        from ( select sfzhm,xm,sjhm,cjsj,jgcjss,jcdd,jcjg
+        select sfzhm,xm,sjhm,cjsj,jcdd
+        from ( select sfzhm,xm,sjhm,cjsj,jcdd
         from ods_qss_hsjcxx_all
         where cjsj > #{startTime}  and #{endTime}>=cjsj
         and sjly != '东软系统'
@@ -301,11 +330,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.user_name as xm,
         s.user_phone as sjhm,
         s.collect_datetime as cjsj,
-        testing_datetime as jgcjsj,
-        s.collect_site_name as jcdd,
-        sign_name as jcjg
+        s.collect_site_name as jcdd
         FROM `tb_whole_testing_sample_921`  s
-        LEFT JOIN tb_whole_testing_result_921 r on s.id = r.id
         where s.collect_datetime > #{startTime}  and #{endTime}>=s.collect_datetime
         and SUBSTRING(s.id_card_no, 1,2) = '65')a
         order by a.cjsj;
@@ -323,5 +349,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-
 </mapper>