报警信息

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

@@ -61,7 +61,7 @@ public class TpmMessageAlarmController extends JeecgController<TpmMessageAlarm,
 	 * @return
 	 */
 	//@AutoLog(value = "tpm_message_alarm-分页列表查询")
-	@ApiOperation(value="tpm_message_alarm-分页列表查询", notes="tpm_message_alarm-分页列表查询")
+	@ApiOperation(value="报警信息-分页列表查询", notes="报警信息-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<TpmMessageAlarmVo>> queryPageList(TpmMessageAlarmVo tpmMessageAlarm,
 														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -81,8 +81,8 @@ public class TpmMessageAlarmController extends JeecgController<TpmMessageAlarm,
 	 * @param tpmMessageAlarm
 	 * @return
 	 */
-	@AutoLog(value = "tpm_message_alarm-添加")
-	@ApiOperation(value="tpm_message_alarm-添加", notes="tpm_message_alarm-添加")
+	@AutoLog(value = "报警信息-添加")
+	@ApiOperation(value="报警信息-添加", notes="报警信息-添加")
 	//@RequiresPermissions("org.jeecg.modules:tpm_message_alarm:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TpmMessageAlarm tpmMessageAlarm) {
@@ -96,8 +96,8 @@ public class TpmMessageAlarmController extends JeecgController<TpmMessageAlarm,
 	 * @param tpmMessageAlarm
 	 * @return
 	 */
-	@AutoLog(value = "tpm_message_alarm-编辑")
-	@ApiOperation(value="tpm_message_alarm-编辑", notes="tpm_message_alarm-编辑")
+	@AutoLog(value = "报警信息-编辑")
+	@ApiOperation(value="报警信息-编辑", notes="报警信息-编辑")
 	//@RequiresPermissions("org.jeecg.modules:tpm_message_alarm:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TpmMessageAlarm tpmMessageAlarm) {
@@ -111,8 +111,8 @@ public class TpmMessageAlarmController extends JeecgController<TpmMessageAlarm,
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "tpm_message_alarm-通过id删除")
-	@ApiOperation(value="tpm_message_alarm-通过id删除", notes="tpm_message_alarm-通过id删除")
+	@AutoLog(value = "报警信息-通过id删除")
+	@ApiOperation(value="报警信息-通过id删除", notes="报警信息-通过id删除")
 	//@RequiresPermissions("org.jeecg.modules:tpm_message_alarm:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -126,8 +126,8 @@ public class TpmMessageAlarmController extends JeecgController<TpmMessageAlarm,
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "tpm_message_alarm-批量删除")
-	@ApiOperation(value="tpm_message_alarm-批量删除", notes="tpm_message_alarm-批量删除")
+	@AutoLog(value = "报警信息-批量删除")
+	@ApiOperation(value="报警信息-批量删除", notes="报警信息-批量删除")
 	//@RequiresPermissions("org.jeecg.modules:tpm_message_alarm:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -142,7 +142,7 @@ public class TpmMessageAlarmController extends JeecgController<TpmMessageAlarm,
 	 * @return
 	 */
 	//@AutoLog(value = "tpm_message_alarm-通过id查询")
-	@ApiOperation(value="tpm_message_alarm-通过id查询", notes="tpm_message_alarm-通过id查询")
+	@ApiOperation(value="报警信息-通过id查询", notes="报警信息-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<TpmMessageAlarm> queryById(@RequestParam(name="id",required=true) String id) {
 		TpmMessageAlarm tpmMessageAlarm = tpmMessageAlarmService.getById(id);

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

@@ -40,16 +40,16 @@ public class TpmMessageAlarm implements Serializable {
     @ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/
@@ -57,13 +57,14 @@ public class TpmMessageAlarm implements Serializable {
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
 	/**设备id*/
-	@Excel(name = "设备id", width = 15)
+    @Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
+    @Excel(name = "设备id", width = 15)
     @ApiModelProperty(value = "设备id")
     private java.lang.String equipmentid;
 	/**报警时间*/
-	@Excel(name = "报警时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "报警时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "报警时间")
     private java.util.Date alarmtime;
 	/**报警类型：0通讯状态，1现场报警，2设备故障，3消防报警，4环境报警，5安全报警*/
@@ -106,9 +107,9 @@ public class TpmMessageAlarm implements Serializable {
     @ApiModelProperty(value = "状态：0 报警，1误报 ， 2 处理中，3已处理")
     private java.lang.Integer status;
 	/**处理日期*/
-	@Excel(name = "处理日期", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "处理日期", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "处理日期")
     private java.util.Date handletime;
 	/**处理人*/