11/21

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java

@@ -59,6 +59,10 @@ public class RiskMessagesLogVo implements Vo {
                 //{thing3=瀚川商贸仓库, thing4=图片对比异常, time5=2023-11-06 05:04:08}
                 vo.setTime(map.get("time5"));
                 vo.setShName(map.get("thing3"));
+            }else if(type.equals("每日数据上报")){
+                //{time1=2023-08-15 09:57, thing3=赵丽晓, thing2=监管数据总览(喜相随生产加工动产质押项…}
+                vo.setTime(map.get("time1"));
+                vo.setShName(map.get("thing2"));
             }
         }
         this.templateMessageVo=vo;

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

@@ -350,10 +350,13 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
     public ResultBean<List<ProjectDailyVos>> getProjectDailys(ProjectDailyQuery query) {
         ResultBean rb=new ResultBean().fail();
         ProjectDailyQuery params = query;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
         if (params != null) {
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) {
                 qw.eq("orderDate", params.getOrderDate());
+            }else{
+                qw.eq("orderDate",sdf.format(DateUtil.yesterday()));
             }
 
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) {
@@ -367,10 +370,12 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
         ResultBean rb=new ResultBean().fail();
         ProjectDailyQuery params = query;
         QueryWrapper<ProjectDaily> qw = new QueryWrapper<>();
-
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (params != null) {
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getOrderDate())) {
                 qw.eq("orderDate", params.getOrderDate());
+            }else{
+                qw.eq("orderDate",sdf.format(DateUtil.yesterday()));
             }
 
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(params.getProjectSid())) {

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java

@@ -11,6 +11,8 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/7/27 9:56
@@ -27,4 +29,6 @@ public interface RiskMessagesLogMapper extends BaseMapper<RiskMessagesLog> {
     RiskMessagesLogVo getMessage();
     @Select("select count(*) from risk_messages_log i left join risk_message_user m on m.messageSid=i.sid where m.state='0' and m.openId =#{openId}")
     Integer getMessageCount(@Param("openId") String openId);
+
+    List<RiskMessagesLogVo> messageNotice(@Param(Constants.WRAPPER) Wrapper<RiskMessagesLog> qw);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml

@@ -67,4 +67,47 @@
         report_sales_day_store
         <where> ${ew.sqlSegment} </where>
     </select>
+    <select id="messageNotice" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo">
+        SELECT
+        log.messageTime,
+        log.content,
+        CASE
+        log.state
+        WHEN '1' THEN '设备离线'
+        WHEN '2' THEN '设备离线解除'
+        WHEN '3' THEN '系统异常'
+        WHEN '4' THEN '系统异常解除'
+        END AS type
+        FROM
+        risk_messages_log log
+        LEFT JOIN risk_message_user message ON log.sid =message.messageSid
+        <where> ${ew.sqlSegment} </where>
+        UNION
+        SELECT
+        log.messageTime,
+        log.content,
+        CASE
+        log.state
+        WHEN '1' THEN '每日数据上报'
+        END AS type
+        FROM
+        message_push_log log
+        LEFT JOIN message_openid message ON log.sid = message.messageSid
+        <where> ${ew.sqlSegment} </where>
+        UNION
+        SELECT
+        log.messageTime,
+        log.content,
+        CASE
+        log.state
+        WHEN '1' THEN '图片对比异常'
+        END AS type
+        FROM
+        img_messages_log log
+        LEFT JOIN img_message_user message ON log.sid = message.messageSid
+        <where> ${ew.sqlSegment} </where>
+        ORDER BY
+            messageTime DESC
+            LIMIT 4
+    </select>
 </mapper>

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java

@@ -41,5 +41,8 @@ public class RiskMessagesLogRest {
     public ResultBean getMessageBySid(@PathVariable("sid") String sid,@PathVariable("wxCode") String wxCode ){
         return RiskMessagesLogService.getMessageBySid(sid,wxCode);
     }
-
+    @GetMapping("/messageNotice/{userSid}")
+    public ResultBean messageNotice(@PathVariable("userSid") String userSid){
+        return RiskMessagesLogService.messageNotice(userSid);
+    }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java

@@ -140,4 +140,12 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
         PagerVo<RiskMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+    public ResultBean messageNotice(String userSid){
+        ResultBean rb=new ResultBean();
+        SysUser sysUser=systemMapper.getAppletOpenidByUsersid(userSid);
+        QueryWrapper<RiskMessagesLog> qw = new QueryWrapper<>();
+        qw.eq("message.openId",sysUser.getOpenId());
+//        qw.orderByDesc("messageTime");
+        return rb.success().setData(baseMapper.messageNotice(qw));
+    }
 }