报警信息分页列表查询

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/controller/TpmMessageAlarmController.java

@@ -43,7 +43,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  * @Date:   2024-04-24
  * @Version: V1.0
  */
-@Api(tags="tpm_message_alarm")
+@Api(tags="报警信息")
 @RestController
 @RequestMapping("/tpmMessageAlarm/tpmMessageAlarm")
 @Slf4j
@@ -63,14 +63,16 @@ public class TpmMessageAlarmController extends JeecgController<TpmMessageAlarm,
 	//@AutoLog(value = "tpm_message_alarm-分页列表查询")
 	@ApiOperation(value="tpm_message_alarm-分页列表查询", notes="tpm_message_alarm-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<TpmMessageAlarm>> queryPageList(TpmMessageAlarm tpmMessageAlarm,
+	public Result<IPage<TpmMessageAlarmVo>> queryPageList(TpmMessageAlarmVo tpmMessageAlarm,
 														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 														  HttpServletRequest req) {
-		QueryWrapper<TpmMessageAlarm> queryWrapper = QueryGenerator.initQueryWrapper(tpmMessageAlarm, req.getParameterMap());
-		Page<TpmMessageAlarm> page = new Page<TpmMessageAlarm>(pageNo, pageSize);
-		IPage<TpmMessageAlarm> pageList = tpmMessageAlarmService.page(page, queryWrapper);
-		return Result.OK(pageList);
+		//QueryWrapper<TpmMessageAlarm> queryWrapper = QueryGenerator.initQueryWrapper(tpmMessageAlarm, req.getParameterMap());
+		Page<TpmMessageAlarmVo> page = new Page<TpmMessageAlarmVo>(pageNo, pageSize);
+		//IPage<TpmMessageAlarm> pageList = tpmMessageAlarmService.page(page, queryWrapper);
+		List<TpmMessageAlarmVo> list = tpmMessageAlarmService.getTpmMessageAlarmInfo(page, tpmMessageAlarm);
+		page.setRecords(list);
+		return Result.OK(page);
 	}
 	
 	/**

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/entity/TpmMessageAlarm.java

@@ -67,10 +67,12 @@ public class TpmMessageAlarm implements Serializable {
     @ApiModelProperty(value = "报警时间")
     private java.util.Date alarmtime;
 	/**报警类型：0通讯状态，1现场报警，2设备故障，3消防报警，4环境报警，5安全报警*/
+	@Dict(dicCode = "alarm_type")
 	@Excel(name = "报警类型：0通讯状态，1现场报警，2设备故障，3消防报警，4环境报警，5安全报警", width = 15)
     @ApiModelProperty(value = "报警类型：0通讯状态，1现场报警，2设备故障，3消防报警，4环境报警，5安全报警")
     private java.lang.String alarmtype;
 	/**报警等级：0普通，1严重，2事故*/
+	@Dict(dicCode = "alarm_level")
 	@Excel(name = "报警等级：0普通，1严重，2事故", width = 15)
     @ApiModelProperty(value = "报警等级：0普通，1严重，2事故")
     private java.lang.String alarmlevel;
@@ -99,6 +101,7 @@ public class TpmMessageAlarm implements Serializable {
     @ApiModelProperty(value = "阈值最大值")
     private java.lang.Double vmax;
 	/**状态：0 报警，1误报 ， 2 处理中，3已处理*/
+	@Dict(dicCode = "alarm_status")
 	@Excel(name = "状态：0 报警，1误报 ， 2 处理中，3已处理", width = 15)
     @ApiModelProperty(value = "状态：0 报警，1误报 ， 2 处理中，3已处理")
     private java.lang.Integer status;

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/mapper/TpmMessageAlarmMapper.java

@@ -22,5 +22,5 @@ public interface TpmMessageAlarmMapper extends BaseMapper<TpmMessageAlarm> {
     *   des: 查询报警信息
     *   date: 2024/4/24
     */
-    List<TpmMessageAlarmVo> getTpmMessageAlarmInfo(Page<TpmMessageAlarmVo> page, TpmMessageAlarm tpmMessageAlarm);
+    List<TpmMessageAlarmVo> getTpmMessageAlarmInfo(Page<TpmMessageAlarmVo> page,@Param("tpmMessageAlarm") TpmMessageAlarmVo tpmMessageAlarm);
 }

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/mapper/xml/TpmMessageAlarmMapper.xml

@@ -4,6 +4,55 @@
 
 
 
-    <select id="getTpmMessageAlarmInfo"
-            resultType="org.jeecg.modules.tpmMessageAlarm.entity.TpmMessageAlarmVo"></select>
+    <resultMap type="org.jeecg.modules.tpmMessageAlarm.entity.TpmMessageAlarmVo" id="SysAlarmResult">
+        <result property="id"    column="id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="equipmentid"    column="equipmentid"    />
+        <result property="alarmtime"    column="alarmtime"    />
+        <result property="alarmtype"    column="alarmtype"    />
+        <result property="alarmlevel"    column="alarmlevel"    />
+        <result property="msgcode"    column="msgcode"    />
+        <result property="paramcode"    column="paramcode"    />
+        <result property="paramname"    column="paramname"    />
+        <result property="nowvalue"    column="nowvalue"    />
+        <result property="vmin"    column="vmin"    />
+        <result property="vmax"    column="vmax"    />
+        <result property="status"    column="status"    />
+        <result property="handletime"    column="handletime"    />
+        <result property="handleuser"    column="handleuser"    />
+        <result property="handleremark"    column="handleremark"    />
+        <result property="url"    column="url"    />
+        <result property="distance"    column="distance"    />
+        <result property="position"    column="position"    />
+        <result property="year"    column="year"    />
+        <result property="month"    column="month"    />
+        <result property="week"    column="week"    />
+        <result property="day"    column="day"    />
+        <result property="dayofweek"    column="dayofweek"    />
+        <result property="equipmentname"    column="equipmentname"    />
+    </resultMap>
+
+    <sql id="selectSysAlarmVo">
+        select id, create_by, create_time, update_by, update_time, remark, equipmentid, alarmtime, alarmtype, alarmlevel, msgcode, paramcode, paramname, nowvalue, vmin, vmax, status, handletime, handleuser, handleremark, url, distance, position, year, month, week, day, dayofweek from tpm_message_alarm
+    </sql>
+
+    <select id="getTpmMessageAlarmInfo" parameterType="org.jeecg.modules.tpmMessageAlarm.entity.TpmMessageAlarm" resultMap="SysAlarmResult">
+        select s.id, s.create_by, s.create_time, s.update_by, s.update_time, s.remark, s.equipmentid,
+        s.alarmtime, s.alarmtype, s.alarmlevel, s.msgcode, s.paramcode, s.paramname, s.nowvalue, s.vmin,
+        s.vmax, s.status, s.handletime, s.handleuser, s.handleremark, s.url, s.distance, s.position, s.year,
+        s.month, s.week, s.day, s.dayofweek, e.equipmentname
+        from tpm_message_alarm as s
+        left join tpm_equipment as e on s.equipmentid=e.id
+        <where>
+            <if test="tpmMessageAlarm.equipmentname != null and tpmMessageAlarm.equipmentname != ''"> and e.equipmentname like concat('%', #{equipmentname}, '%')</if>
+            <if test="tpmMessageAlarm.alarmtime != null "> and s.day = DATE_FORMAT(#{alarmtime}, '%Y-%m-%d')</if>
+            <if test="tpmMessageAlarm.alarmtype != null  and tpmMessageAlarm.alarmtype != ''"> and s.alarmtype = #{alarmtype}</if>
+            <if test="tpmMessageAlarm.alarmlevel != null  and tpmMessageAlarm.alarmlevel != ''"> and s.alarmlevel = #{alarmlevel}</if>
+            <if test="tpmMessageAlarm.status != null"> and s.status = #{status}</if>
+        </where> order by s.alarmtime  desc
+    </select>
 </mapper>

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/service/ITpmMessageAlarmService.java

@@ -21,5 +21,5 @@ public interface ITpmMessageAlarmService extends IService<TpmMessageAlarm> {
     *   des: 查询报警信息
     *   date: 2024/4/24
     */
-    List<TpmMessageAlarmVo> getTpmMessageAlarmInfo(Page<TpmMessageAlarmVo> page, TpmMessageAlarm tpmMessageAlarm);
+    List<TpmMessageAlarmVo> getTpmMessageAlarmInfo(Page<TpmMessageAlarmVo> page, TpmMessageAlarmVo tpmMessageAlarm);
 }

module_tpm/src/main/java/org/jeecg/modules/tpmMessageAlarm/service/impl/TpmMessageAlarmServiceImpl.java

@@ -32,7 +32,7 @@ public class TpmMessageAlarmServiceImpl extends ServiceImpl<TpmMessageAlarmMappe
     *   date: 2024/4/24
     */
     @Override
-    public List<TpmMessageAlarmVo> getTpmMessageAlarmInfo(Page<TpmMessageAlarmVo> page, TpmMessageAlarm tpmMessageAlarm) {
+    public List<TpmMessageAlarmVo> getTpmMessageAlarmInfo(Page<TpmMessageAlarmVo> page, TpmMessageAlarmVo tpmMessageAlarm) {
         return alarmMapper.getTpmMessageAlarmInfo(page,tpmMessageAlarm);
     }
 }