ly 3 年之前
父节点
当前提交
6014a37ce8

+ 2 - 2
master/src/main/java/com/ruoyi/common/sendEmail/IMailServiceImpl.java

@@ -92,7 +92,7 @@ public class IMailServiceImpl implements IMailService {
             mailSender.send(message);
             //日志信息
             logger.info("邮件已经发送。");
-        } catch (MessagingException e) {
+        } catch (Exception e) {
             logger.error("发送邮件时发生异常!", e);
         }
     }
@@ -127,4 +127,4 @@ public class IMailServiceImpl implements IMailService {
 
 
     }
-}
+}

+ 15 - 0
master/src/main/java/com/ruoyi/framework/task/TSpecdevAllTask.java

@@ -2,6 +2,9 @@ package com.ruoyi.framework.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.sendEmail.IMailService;
+import com.ruoyi.common.thread.SpecDevYlgdThread;
+import com.ruoyi.common.thread.SpecDevYlrqThread;
+import com.ruoyi.common.thread.SpecOverLifeThead;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
@@ -105,6 +108,16 @@ public class TSpecdevAllTask extends BaseController {
         this.checkWarnFlagForDzsb(firstlevel, secondlevel, thirdlevel, sdf);
         this.checkWarnFlagForYlgd(firstlevel, secondlevel, thirdlevel, sdf);
         this.checkWarnFlagForYlrq(firstlevel, secondlevel, thirdlevel, sdf);
+        SpecDevYlgdThread specDevYlgdThread = new SpecDevYlgdThread(specdevYlgdService);
+        Thread t = new Thread(specDevYlgdThread);
+        t.start();
+        SpecOverLifeThead specOverLifeThead = new SpecOverLifeThead(specdevYlrqService);
+        Thread t3 = new Thread(specOverLifeThead);
+        t3.start();
+
+        SpecDevYlrqThread specDevYlgrThread = new SpecDevYlrqThread(specdevYlrqService);
+        Thread t2 = new Thread(specDevYlgrThread);
+        t2.start();
     }
 
     private void checkWarnFlagForGl(Long firstlevel, Long secondlevel, Long thirdlevel, SimpleDateFormat sdf) {
@@ -122,7 +135,9 @@ public class TSpecdevAllTask extends BaseController {
         }
         for (TAlarmPrincipal o : userList) {
             //根据装置权限获取数据
+
             List<SysPlant> plantList = sysPlantService.selectSysPlantByDeptId(o.getDeptId());
+            logger.info("部门id"+o.getDeptId() + "--部门:" + plantList.toString());
             List<String> plants = new ArrayList<>();
             for (SysPlant s : plantList
             ) {

+ 0 - 3
master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -59,9 +59,6 @@ public class TSpecdevYlgdController extends BaseController {
     public TableDataInfo list(TSpecdevYlgd tSpecdevYlgd) {
         startPage();
         List<TSpecdevYlgd> list = tSpecdevYlgdService.selectTSpecdevYlgdList(tSpecdevYlgd);
-        SpecDevYlgdThread specDevYlgdThread = new SpecDevYlgdThread(tSpecdevYlgdService);
-        Thread t = new Thread(specDevYlgdThread);
-        t.start();
         return getDataTable(list);
     }
 

+ 1 - 1
master/src/main/resources/mybatis/system/SysPlantMapper.xml

@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             SYS_PLANT sp
                 LEFT JOIN SYS_DEPT sd on sp.DEPT_CODE = sd.DEPT_NAME
-        where sd.DEPT_ID = #{deptId}
+        where sd.DEPT_ID = #{deptId} or FIND_IN_SET(#{deptId}, sd.ancestors) > 0
     </select>
 
 

+ 1 - 1
ui/src/views/sems/specYlgd/bf.vue

@@ -145,7 +145,7 @@
       <el-table-column :label="$t('安装单位')" align="center" prop="installer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('安装年月')" align="center" prop="installDate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.installDate, '{y}-{m') }}</span>
+          <span>{{ parseTime(scope.row.installDate, '{y}-{m}') }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('投用年月')" align="center" prop="submitdate" width="100">

+ 1 - 1
ui/src/views/sems/specYlgd/index.vue

@@ -199,7 +199,7 @@
       <el-table-column :label="$t('安装单位')" align="center" prop="installer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('安装年月')" align="center" prop="installDate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.installDate, '{y}-{m') }}</span>
+          <span>{{ parseTime(scope.row.installDate, '{y}-{m}') }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('投用年月')" align="center" prop="submitdate" width="100">

+ 1 - 1
ui/src/views/sems/specYlgd/ty.vue

@@ -189,7 +189,7 @@
       <el-table-column :label="$t('安装单位')" align="center" prop="installer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('安装年月')" align="center" prop="installDate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.installDate, '{y}-{m') }}</span>
+          <span>{{ parseTime(scope.row.installDate, '{y}-{m}') }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('投用年月')" align="center" prop="submitdate" width="100">

+ 1 - 1
ui/src/views/sems/specYlgd/zx.vue

@@ -144,7 +144,7 @@
       <el-table-column :label="$t('安装单位')" align="center" prop="installer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('安装年月')" align="center" prop="installDate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.installDate, '{y}-{m') }}</span>
+          <span>{{ parseTime(scope.row.installDate, '{y}-{m}') }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('投用年月')" align="center" prop="submitdate" width="100">