1.增加消息表

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/MsgLogDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 消息流水表
+ *
+ * @author system_generator
+ * @date 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MsgLogDto", description="消息流水表")
+public class MsgLogDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "关联编号")
+    private String relationCode;
+
+    @ApiModelProperty(value = "消息类型（超期预警、许可超期、风险预警）")
+    private String msgType;
+
+    @ApiModelProperty(value = "消息内容")
+    private String body;
+
+    @ApiModelProperty(value = "接收者账号")
+    private String targetCode;
+
+    @ApiModelProperty(value = "接收者名称")
+    private String targetName;
+
+    @ApiModelProperty(value = "发送日期")
+    private Date sendTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/MsgLog.java

+package com.yeejoin.amos.boot.module.tzs.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 消息流水表
+ *
+ * @author system_generator
+ * @date 2022-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_msg_log")
+public class MsgLog extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 关联编号
+     */
+	@TableField("relation_code")
+    private String relationCode;
+
+    /**
+     * 消息类型（超期预警、许可超期、风险预警）
+     */
+	@TableField("msg_type")
+    private String msgType;
+
+    /**
+     * 消息内容
+     */
+	@TableField("body")
+    private String body;
+
+    /**
+     * 接收者账号
+     */
+	@TableField("target_code")
+    private String targetCode;
+
+    /**
+     * 接收者名称
+     */
+	@TableField("target_name")
+    private String targetName;
+
+    /**
+     * 发送日期
+     */
+	@TableField("send_time")
+    private Date sendTime;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/MsgLogMapper.java

+package com.yeejoin.amos.boot.module.tzs.api.mapper;
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.MsgLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 消息流水表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-04-20
+ */
+public interface MsgLogMapper extends BaseMapper<MsgLog> {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/IMsgLogService.java

+package com.yeejoin.amos.boot.module.tzs.api.service;
+
+
+/**
+ * 消息流水表接口类
+ *
+ * @author system_generator
+ * @date 2022-04-20
+ */
+public interface IMsgLogService {
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/CylinderInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.List;
 
@@ -16,10 +17,10 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="CylinderInfoDto", description="气瓶基本信息")
-public class CylinderInfoDto  extends BaseDto {
+@ApiModel(value = "CylinderInfoDto", description = "气瓶基本信息")
+public class CylinderInfoDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "气瓶基本信息ID")
@@ -103,7 +104,10 @@ public class CylinderInfoDto  extends BaseDto {
     @ApiModelProperty(value = "查询单位appid")
     private List<String> appIds;
 
-   @ApiModelProperty(value = "检验状态 0 已超期 1 正常 2 即将超期")
+    @ApiModelProperty(value = "检验状态 0 已超期 1 正常 2 即将超期")
     private int inspectionStatas;
 
+    @ApiModelProperty(value = "预警等级")
+    private String earlyWarningLevel;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java

@@ -159,4 +159,9 @@ public class CylinderInfo  {
      */
     @TableField("integrity")
     private Double integrity;
+
+    /**
+     * 预警等级
+     */
+    private String earlyWarningLevel;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/mapper/CylinderInfoMapper.java

@@ -56,4 +56,6 @@ public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
      * @return
      */
     Integer getMonthBeforeLastInfoTotalUnit(@Param("appId")String appId);
+
+    Integer countOverDateNumber(@Param("threshold") int threshold);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/CylinderInfoMapper.xml

@@ -53,6 +53,13 @@
     <select id="getMonthBeforeLastInfoTotalUnit" resultType="java.lang.Integer">
         select IFNULL(count(sequence_nbr), 0) from tz_cylinder_info where PERIOD_DIFF( date_format( now( ) , '%Y%m' ) , date_format( sync_date, '%Y%m' ) ) =2 AND app_id = #{appId}
     </select>
+    <select id="countOverDateNumber" resultType="java.lang.Integer">
+        SELECT
+            count(1)
+        FROM `tz_cylinder_info` ci
+        where
+        DATEDIFF(ci.next_inspection_date,now()) <![CDATA[<=]]> #{threshold}
+    </select>
 
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/MsgLogMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.MsgLogMapper">
+
+</mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/MsgLogController.java

+package com.yeejoin.amos.boot.module.tzs.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.biz.service.impl.MsgLogServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tzs.api.dto.MsgLogDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 消息流水表
+ *
+ * @author system_generator
+ * @date 2022-04-20
+ */
+@RestController
+@Api(tags = "消息流水表Api")
+@RequestMapping(value = "/msg-log")
+public class MsgLogController extends BaseController {
+
+    @Autowired
+    MsgLogServiceImpl msgLogServiceImpl;
+
+    /**
+     * 新增消息流水表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增消息流水表", notes = "新增消息流水表")
+	public ResponseModel<MsgLogDto> save(@RequestBody MsgLogDto model) {
+	    model = msgLogServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新消息流水表", notes = "根据sequenceNbr更新消息流水表")
+	public ResponseModel<MsgLogDto> updateBySequenceNbrMsgLog(@RequestBody MsgLogDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(msgLogServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除消息流水表", notes = "根据sequenceNbr删除消息流水表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(msgLogServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个消息流水表",  notes = "根据sequenceNbr查询单个消息流水表")
+	public ResponseModel<MsgLogDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(msgLogServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "消息流水表分页查询",  notes = "消息流水表分页查询")
+	public ResponseModel<Page<MsgLogDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<MsgLogDto> page = new Page<MsgLogDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(msgLogServiceImpl.queryForMsgLogPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "消息流水表列表全部数据查询",   notes = "消息流水表列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<MsgLogDto>> selectForList() {
+	    return ResponseHelper.buildResponse(msgLogServiceImpl.queryForMsgLogList());
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/MsgLogServiceImpl.java

+package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.tzs.api.entity.MsgLog;
+import com.yeejoin.amos.boot.module.tzs.api.mapper.MsgLogMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.IMsgLogService;
+import com.yeejoin.amos.boot.module.tzs.api.dto.MsgLogDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 消息流水表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-04-20
+ */
+@Service
+public class MsgLogServiceImpl extends BaseService<MsgLogDto,MsgLog,MsgLogMapper> implements IMsgLogService {
+    /**
+     * 分页查询
+     */
+    public Page<MsgLogDto> queryForMsgLogPage(Page<MsgLogDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<MsgLogDto> queryForMsgLogList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java

@@ -22,7 +22,6 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -841,4 +840,11 @@ public class CylinderInfoController extends BaseController {
         return ResponseHelper.buildResponse(true);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "气瓶超期数量统计")
+    @GetMapping(value = "/{threshold}/statistics")
+    public ResponseModel<Integer> getOverDateStatisticsNumber(@PathVariable int threshold){
+        return ResponseHelper.buildResponse(cylinderInfoServiceImpl.getOverDateStatisticsNumber(threshold));
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -558,4 +558,8 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
             });
         }
     }
+
+    public Integer getOverDateStatisticsNumber(int threshold) {
+        return this.baseMapper.countOverDateNumber(threshold);
+    }
 }
\ No newline at end of file