Merge remote-tracking branch 'origin/master'

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -67,6 +67,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return dateTimeNow(YYYY);
     }
 
+    public static final String getYearMonth()
+    {
+        return dateTimeNow(YYYY_MM);
+    }
+
     public static final String dateTimeNow()
     {
         return dateTimeNow(YYYYMMDDHHMMSS);

ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwJdapMapper.java

@@ -61,4 +61,8 @@ public interface FgwJdapMapper
     public int deleteFgwJdapByIds(Long[] ids);
 
     int updateFgwJdapJdsh(@Param("ids") String[] ids, @Param("shyj")String shyj, @Param("shjg")String shjg);
+
+    List<FgwJdap> selectFgwJdapNum(Long yjts);
+
+    List<FgwJdap> selectFgwJdapCqxmNum();
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/fgw/FgwYjpzMapper.java

@@ -58,4 +58,6 @@ public interface FgwYjpzMapper
      * @return 结果
      */
     public int deleteFgwYjpzByIds(Long[] ids);
+
+    FgwYjpz selectFgwYjpzNew();
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwXmsbServiceImpl.java

@@ -12,13 +12,9 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.fgw.FgwDbd;
-import com.ruoyi.system.domain.fgw.FgwFj;
-import com.ruoyi.system.domain.fgw.FgwXmsb;
+import com.ruoyi.system.domain.fgw.*;
 import com.ruoyi.system.domain.projectV2.ZsyzSbbzb;
-import com.ruoyi.system.mapper.fgw.FgwDbdMapper;
-import com.ruoyi.system.mapper.fgw.FgwFjMapper;
-import com.ruoyi.system.mapper.fgw.FgwXmsbMapper;
+import com.ruoyi.system.mapper.fgw.*;
 import com.ruoyi.system.service.fgw.IFgwXmsbService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,6 +37,10 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
     private FgwFjMapper fgwFjMapper;
     @Autowired
     private FgwDbdMapper fgwDbdMapper;
+    @Autowired
+    private FgwJdapMapper fgwJdapMapper;
+    @Autowired
+    private FgwYjpzMapper fgwYjpzMapper;
 
     /**
      * 查询发改委_申报_主
@@ -180,10 +180,14 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
 
     @Override
     public List<FgwXmsb> xmyjList(FgwXmsb fgwXmsb) {
-        List<FgwDbd> fgwDbdList = fgwDbdMapper.selectFgwDbdYjxmNum();
+        //List<FgwDbd> fgwDbdList = fgwDbdMapper.selectFgwDbdYjxmNum();
+        //查询预警配置时间
+        FgwYjpz fgwYjpz = fgwYjpzMapper.selectFgwYjpzNew();
+        List<FgwJdap> fgwJdapList = fgwJdapMapper.selectFgwJdapNum(fgwYjpz.getYjts());
+
         List<FgwXmsb> fgwXmsbList = new ArrayList<>();
-        if (fgwDbdList.size() > 0) {
-            List<Long> xmidList = fgwDbdList.stream().map(FgwDbd::getXmId).collect(Collectors.toList());
+        if (fgwJdapList.size() > 0) {
+            List<Long> xmidList = fgwJdapList.stream().map(FgwJdap::getXmId).collect(Collectors.toList());
             fgwXmsb.setIdList(xmidList);
             fgwXmsbList = fgwXmsbMapper.selectFgwXmsbList(fgwXmsb);
         }
@@ -193,10 +197,12 @@ public class FgwXmsbServiceImpl implements IFgwXmsbService {
 
     @Override
     public List<FgwXmsb> cqxmList(FgwXmsb fgwXmsb) {
-        List<FgwDbd> fgwDbdListCq = fgwDbdMapper.selectFgwDbdCqxmNum();
+        //List<FgwDbd> fgwDbdListCq = fgwDbdMapper.selectFgwDbdCqxmNum();
+        List<FgwJdap> fgwJdapList = fgwJdapMapper.selectFgwJdapCqxmNum();
+
         List<FgwXmsb> fgwXmsbList = new ArrayList<>();
-        if (fgwDbdListCq.size() > 0) {
-            List<Long> xmidList = fgwDbdListCq.stream().map(FgwDbd::getXmId).collect(Collectors.toList());
+        if (fgwJdapList.size() > 0) {
+            List<Long> xmidList = fgwJdapList.stream().map(FgwJdap::getXmId).collect(Collectors.toList());
             fgwXmsb.setIdList(xmidList);
             fgwXmsbList = fgwXmsbMapper.selectFgwXmsbList(fgwXmsb);
         }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwYjpzServiceImpl.java

@@ -54,6 +54,7 @@ public class FgwYjpzServiceImpl implements IFgwYjpzService
     public int insertFgwYjpz(FgwYjpz fgwYjpz)
     {
         fgwYjpz.setCreateTime(DateUtils.getNowDate());
+        fgwYjpz.setUpdateTime(DateUtils.getNowDate());
         return fgwYjpzMapper.insertFgwYjpz(fgwYjpz);
     }
 

ruoyi-system/src/main/resources/mapper/system/fgw/FgwJdapMapper.xml

@@ -47,7 +47,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFgwJdapVo"/>
         where id = #{id}
     </select>
-        
+
+    <select id="selectFgwJdapNum" resultMap="FgwJdapResult">
+        SELECT
+            xm_id
+        FROM
+            fgw_jdap
+        WHERE
+            DATEDIFF(NOW(), jdsj) &gt;= - #{yjts}
+          AND DATEDIFF(NOW(), jdsj) &lt;=0
+          and shjg = '1'
+          and sfwc = '0'
+        GROUP BY
+            xm_id
+    </select>
+    <select id="selectFgwJdapCqxmNum" resultMap="FgwJdapResult">
+        SELECT
+            xm_id
+        FROM
+            fgw_jdap
+        WHERE
+            DATEDIFF(NOW(), jdsj) &gt;0
+          and shjg = '1'
+          and sfwc != '3'
+        GROUP BY
+            xm_id
+    </select>
+
     <insert id="insertFgwJdap" parameterType="FgwJdap" useGeneratedKeys="true" keyProperty="id">
         insert into fgw_jdap
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-system/src/main/resources/mapper/system/fgw/FgwYjpzMapper.xml

@@ -31,7 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFgwYjpzVo"/>
         where id = #{id}
     </select>
-        
+    <select id="selectFgwYjpzNew" resultMap="FgwYjpzResult">
+        <include refid="selectFgwYjpzVo"/>
+        order by updateTime desc limit 1
+    </select>
+
     <insert id="insertFgwYjpz" parameterType="FgwYjpz" useGeneratedKeys="true" keyProperty="id">
         insert into fgw_yjpz
         <trim prefix="(" suffix=")" suffixOverrides=",">