*）增加消息列表接口

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

@@ -46,4 +46,6 @@ public class MsgLogDto extends BaseDto {
     @ApiModelProperty(value = "站端类型： WEB,APP")
     private String terminalType;
 
+    @ApiModelProperty(value = "是否已读")
+    private Boolean isRead = false;
 }

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

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.naming.ldap.PagedResultsControl;
 import java.util.Date;
 
 /**
@@ -70,5 +69,9 @@ public class MsgLog extends BaseEntity {
      */
 	private String terminalType;
 
-
+    /**
+     * 是否已读
+     */
+    @TableField("is_read")
+    private Boolean isRead = false;
 }

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

@@ -5,12 +5,16 @@ 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;
@@ -37,28 +41,28 @@ public class MsgLogController extends BaseController {
      * @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);
-	}
+    @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));
-	}
+    @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 主键
@@ -67,63 +71,85 @@ public class MsgLogController extends BaseController {
     @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){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(msgLogServiceImpl.removeById(sequenceNbr));
     }
 
     /**
      * 根据sequenceNbr查询
      *
-	 * @param 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));
-	}
+    @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));
-	}
+    @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());
-	}
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "消息流水表列表全部数据查询", notes = "消息流水表列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<MsgLogDto>> selectForList() {
+        return ResponseHelper.buildResponse(msgLogServiceImpl.queryForMsgLogList());
+    }
+
+    /**
+     * 告警数量统计
+     *
+     * @return Integer
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "告警数量统计", notes = "告警数量统计")
+    @GetMapping(value = "/count")
+    public ResponseModel<Integer> countByTerminalType(
+            @RequestParam(value = "terminalType", required = false) String terminalType) {
+        return ResponseHelper.buildResponse(msgLogServiceImpl.countByTerminalType(terminalType));
+    }
 
-	/**
-	 * 告警数量统计
-	 *
-	 * @return Integer
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "告警数量统计",   notes = "告警数量统计")
-	@GetMapping(value = "/count")
-	public ResponseModel<Integer> countByTerminalType(
-			@RequestParam(value = "terminalType",required = false) String terminalType) {
-		return ResponseHelper.buildResponse(msgLogServiceImpl.countByTerminalType(terminalType));
-	}
+    /**
+     * 列表分页查询
+     *
+     * @param current      当前页
+     * @param current      每页大小
+     * @param terminalType 终端类型
+     * @param isRead       是否未读
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page/terminalType")
+    @ApiOperation(httpMethod = "GET", value = "消息流水表分页查询", notes = "消息流水表分页查询")
+    public ResponseModel<Page<MsgLogDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                       @RequestParam(value = "size") int size,
+                                                       @RequestParam(value = "terminalType") String terminalType,
+                                                       @RequestParam(value = "isRead") Boolean isRead) {
+        Page<MsgLogDto> page = new Page<MsgLogDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(msgLogServiceImpl.queryForMsgLogByTerminalTypePage(page, terminalType, isRead));
+    }
 }
\ No newline at end of file

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

@@ -89,4 +89,8 @@ public class MsgLogServiceImpl extends BaseService<MsgLogDto,MsgLog,MsgLogMapper
     public Integer countByTerminalType(String terminalType) {
         return this.list(new LambdaQueryWrapper<MsgLog>().eq(StringUtils.isNotEmpty(terminalType), MsgLog::getTerminalType, terminalType)).size();
     }
+
+    public Page<MsgLogDto> queryForMsgLogByTerminalTypePage(Page<MsgLogDto> page, String terminalType, Boolean isRead) {
+        return this.queryForPage(page, "rec_date", false, terminalType, isRead);
+    }
 }
\ No newline at end of file

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

@@ -62,7 +62,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
      * 分页查询
      */
     public Page<TaskDto> queryForTaskPage(Page<TaskDto> page, String userId, @Condition(Operator.in) List<Integer> status) {
-        return this.queryForPage(page, null, false, userId, status);
+        return this.queryForPage(page, "rec_date", false, userId, status);
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/db/changelog/tzs-1.0.0.0.xml

@@ -1457,7 +1457,43 @@
 		</sql>
 	</changeSet>
 
+	<changeSet author="xl" id="2022-06-01-01">
+		<preConditions onFail="MARK_RAN">
+			<not>
+				<tableExists tableName="tz_task"/>
+			</not>
+		</preConditions>
+		<comment>add table tz_task</comment>
+		<sql>
+			CREATE TABLE `tz_task` (
+			`sequence_nbr` bigint(20) NOT NULL COMMENT 'id',
+			`name` varchar(255) DEFAULT NULL COMMENT '任务名称',
+			`content` text COMMENT '内容',
+			`description` varchar(500) DEFAULT NULL COMMENT '描述',
+			`status` int(1) DEFAULT NULL COMMENT '状态【0：待填报，1：待签收，2：已完成】',
+			`user_id` varchar(255) DEFAULT NULL COMMENT '用户ID',
+			`create_date` datetime DEFAULT NULL COMMENT '创建时间',
+			`rec_user_name` varchar(15) DEFAULT NULL COMMENT '更新人名称',
+			`rec_user_id` varchar(19) DEFAULT NULL COMMENT '用户ID',
+			`rec_date` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+			`is_delete` bit(1) NOT NULL COMMENT '是否删除',
+			`app_id` varchar(255) DEFAULT NULL COMMENT '对接公司编码',
+			`dept_id` varchar(255) DEFAULT NULL COMMENT '单位ID',
+			`dept_name` varchar(255) DEFAULT NULL COMMENT '单位名称'
+			) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='任务表';
+		</sql>
+	</changeSet>
 
+	<changeSet author="xl" id="2022-06-01-02">
+		<preConditions onFail="MARK_RAN">
+			<tableExists tableName="tz_msg_log"/>
+		</preConditions>
+		<comment>modify table tz_msg_log add is_read columns</comment>
+		<sql>
+			ALTER TABLE `tz_msg_log` add is_read bit(1) DEFAULT NULL COMMENT '是否已读【0：未读；1：已读】';
+			UPDATE tz_msg_log set is_read = false;
+		</sql>
+	</changeSet>
 
 </databaseChangeLog>