消息中心修改

src/main/java/org/rcisoft/sys/messageinstance/controller/MessageInstanceController.java

@@ -15,16 +15,18 @@ import org.rcisoft.core.model.CyPersistModel;
 import org.rcisoft.core.constant.CyMessCons;
 import org.rcisoft.core.controller.CyPaginationController;
 import org.rcisoft.core.model.CyGridModel;
+
 import javax.validation.Valid;
+
 import org.rcisoft.sys.messageinstance.entity.MessageInstance;
 import org.rcisoft.sys.messageinstance.service.MessageInstanceService;
 
 
 /**
-* Created by cy on 2022年11月16日 下午4:37:10.
-*/
+ * Created by cy on 2022年11月16日 下午4:37:10.
+ */
 @RestController
-@RequestMapping("/messageinstance")
+@RequestMapping("/messageInstance")
 public class MessageInstanceController extends CyPaginationController<MessageInstance> {
 
 
@@ -33,7 +35,7 @@ public class MessageInstanceController extends CyPaginationController<MessageIns
 
     //@PreAuthorize("@cyPerm.hasPerm('sys:sageInstance:add')")
     @CyOpeLogAnno(title = "system-用户消息表管理-新增用户消息表", businessType = CyLogTypeEnum.INSERT)
-    @ApiOperation(value="添加用户消息表", notes="添加用户消息表")
+    @ApiOperation(value = "添加用户消息表", notes = "添加用户消息表")
     @PostMapping(value = "/add")
     public CyResult add(@Valid MessageInstance messageInstance, BindingResult bindingResult) {
         CyPersistModel data = messageInstanceServiceImpl.persist(messageInstance);
@@ -42,12 +44,13 @@ public class MessageInstanceController extends CyPaginationController<MessageIns
                 CyMessCons.MESSAGE_ALERT_ERROR,
                 messageInstance);
     }
+
     //@PreAuthorize("@cyPerm.hasPerm('sys:sageInstance:delete')")
     @CyOpeLogAnno(title = "system-用户消息表管理-删除用户消息表", businessType = CyLogTypeEnum.DELETE)
-    @ApiOperation(value="逻辑删除用户消息表", notes="逻辑删除用户消息表")
+    @ApiOperation(value = "逻辑删除用户消息表", notes = "逻辑删除用户消息表")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
     @DeleteMapping("/deleteLogical/{businessId:\\w+}")
-    public CyResult deleteLogical(@PathVariable int businessId,MessageInstance messageInstance) {
+    public CyResult deleteLogical(@PathVariable int businessId, MessageInstance messageInstance) {
         messageInstance.setBusinessId(businessId);
         CyPersistModel data = messageInstanceServiceImpl.removeLogical(messageInstance);
         return CyResultGenUtil.builder(data,
@@ -55,12 +58,13 @@ public class MessageInstanceController extends CyPaginationController<MessageIns
                 CyMessCons.MESSAGE_ALERT_ERROR,
                 businessId);
     }
+
     //@PreAuthorize("@cyPerm.hasPerm('sys:sageInstance:delete')")
     @CyOpeLogAnno(title = "system-用户消息表管理-删除用户消息表", businessType = CyLogTypeEnum.DELETE)
-    @ApiOperation(value="删除用户消息表", notes="删除用户消息表")
+    @ApiOperation(value = "删除用户消息表", notes = "删除用户消息表")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
     @DeleteMapping("/delete/{businessId:\\w+}")
-    public CyResult delete(@PathVariable int businessId,MessageInstance messageInstance) {
+    public CyResult delete(@PathVariable int businessId, MessageInstance messageInstance) {
         messageInstance.setBusinessId(businessId);
         CyPersistModel data = messageInstanceServiceImpl.remove(messageInstance);
         return CyResultGenUtil.builder(data,
@@ -71,7 +75,7 @@ public class MessageInstanceController extends CyPaginationController<MessageIns
 
     //@PreAuthorize("@cyPerm.hasPerm('sys:sageInstance:update')")
     @CyOpeLogAnno(title = "system-用户消息表管理-修改用户消息表", businessType = CyLogTypeEnum.UPDATE)
-    @ApiOperation(value="修改用户消息表", notes="修改用户消息表")
+    @ApiOperation(value = "修改用户消息表", notes = "修改用户消息表")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
     @PutMapping("/update/{businessId:\\w+}")
     public CyResult update(@PathVariable int businessId, @Valid MessageInstance messageInstance, BindingResult bindingResult) {
@@ -85,7 +89,7 @@ public class MessageInstanceController extends CyPaginationController<MessageIns
 
     //@PreAuthorize("@cyPerm.hasPerm('sys:sageInstance:query')")
     @CyOpeLogAnno(title = "system-用户消息表管理-查询用户消息表", businessType = CyLogTypeEnum.QUERY)
-    @ApiOperation(value="查询单一用户消息表", notes="查询单一用户消息表")
+    @ApiOperation(value = "查询单一用户消息表", notes = "查询单一用户消息表")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
     @GetMapping("/detail/{businessId:\\w+}")
     public CyResult detail(@PathVariable int businessId) {
@@ -97,7 +101,7 @@ public class MessageInstanceController extends CyPaginationController<MessageIns
 
     //@PreAuthorize("@cyPerm.hasPerm('sys:sageInstance:list')")
     @CyOpeLogAnno(title = "system-用户消息表管理-查询用户消息表", businessType = CyLogTypeEnum.QUERY)
-    @ApiOperation(value="查询用户消息表集合", notes="查询用户消息表集合")
+    @ApiOperation(value = "查询用户消息表集合", notes = "查询用户消息表集合")
     @GetMapping(value = "/queryMessageInstances")
     public CyResult queryMessageInstances(MessageInstance messageInstance) {
         return CyResultGenUtil.builder(new CyPersistModel(1),
@@ -108,7 +112,7 @@ public class MessageInstanceController extends CyPaginationController<MessageIns
 
     //@PreAuthorize("@cyPerm.hasPerm('sys:sageInstance:list')")
     @CyOpeLogAnno(title = "system-用户消息表管理-查询用户消息表", businessType = CyLogTypeEnum.QUERY)
-    @ApiOperation(value="分页查询用户消息表集合", notes="分页查询用户消息表集合")
+    @ApiOperation(value = "分页查询用户消息表集合", notes = "分页查询用户消息表集合")
     @GetMapping(value = "/queryMessageInstanceByPagination")
     public CyGridModel listByPagination(MessageInstance messageInstance) {
         messageInstanceServiceImpl.findAllByPagination(getPaginationUtility(), messageInstance);

src/main/java/org/rcisoft/sys/messageinstance/dao/MessageInstanceRepository.java

@@ -12,8 +12,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**
-* Created with cy on 2022年11月16日 下午4:37:10.
-*/
+ * Created with cy on 2022年11月16日 下午4:37:10.
+ */
 
 public interface MessageInstanceRepository extends CyBaseMapper<MessageInstance> {
 
@@ -22,8 +22,7 @@ public interface MessageInstanceRepository extends CyBaseMapper<MessageInstance>
 
     /**
      * 分页查询 messageInstance
-    *
      */
-    IPage<MessageInstance> queryMessageInstancesPaged(CyPageInfo cyPageInfo,@Param("entity") MessageInstance messageInstance);
+    IPage<MessageInstance> queryMessageInstancesPaged(CyPageInfo cyPageInfo, @Param("entity") MessageInstance messageInstance);
 }
 

src/main/java/org/rcisoft/sys/messageinstance/entity/MessageInstance.java

@@ -5,11 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
 import org.rcisoft.core.entity.CyIdIncreEntity;
-import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
 * Created with cy on 2022年11月16日 下午4:37:10.
@@ -75,22 +72,6 @@ public class MessageInstance  extends CyIdIncreEntity<MessageInstance> {
      @Excel(name = "已读状态（0未读 1已读）已读时更新updatetime", orderNum = "6", width = 20)
      private String readFlag;
 
-     /**
-     * @desc 创建日期
-     * @column create_time
-     * @default
-     */
-     @Excel(name = "创建日期", orderNum = "7", width = 20)
-     private Date createTime;
-
-     /**
-     * @desc 修改日期
-     * @column update_time
-     * @default
-     */
-     @Excel(name = "修改日期", orderNum = "8", width = 20)
-     private Date updateTime;
-
      /**
      * @desc 0:系统推送，1：后台发布
      * @column type

src/main/java/org/rcisoft/sys/messageinstance/service/MessageInstanceService.java

@@ -16,6 +16,7 @@ public interface MessageInstanceService {
 
     /**
      * 保存 用户消息表
+     *
      * @param messageInstance
      * @return
      */
@@ -23,18 +24,23 @@ public interface MessageInstanceService {
 
     /**
      * 删除 用户消息表
+     *
      * @param messageInstance
      * @return
      */
     CyPersistModel remove(MessageInstance messageInstance);
+
     /**
      * 逻辑删除 用户消息表
+     *
      * @param messageInstance
      * @return
      */
     CyPersistModel removeLogical(MessageInstance messageInstance);
+
     /**
      * 修改 用户消息表
+     *
      * @param messageInstance
      * @return
      */
@@ -42,6 +48,7 @@ public interface MessageInstanceService {
 
     /**
      * 根据id查询 用户消息表
+     *
      * @param id
      * @return
      */
@@ -49,6 +56,7 @@ public interface MessageInstanceService {
 
     /**
      * 分页查询 用户消息表
+     *
      * @param messageInstance
      * @return
      */
@@ -58,11 +66,11 @@ public interface MessageInstanceService {
 
     /**
      * 查询list 用户消息表
+     *
      * @param messageInstance
      * @return
      */
     List<MessageInstance> findAll(MessageInstance messageInstance);
 
 
-
 }

src/main/java/org/rcisoft/sys/messageinstance/service/impl/MessageInstanceServiceImpl.java

@@ -15,100 +15,111 @@ import org.springframework.transaction.annotation.Transactional;
 import org.rcisoft.core.model.CyPageInfo;
 
 import java.util.List;
+
 import lombok.extern.slf4j.Slf4j;
 
 /**
  * Created by cy on 2022年11月16日 下午4:37:10.
  */
 @Service
-@Transactional(readOnly = true,propagation = Propagation.NOT_SUPPORTED)
+@Transactional(readOnly = true, propagation = Propagation.NOT_SUPPORTED)
 @Slf4j
-public class MessageInstanceServiceImpl extends ServiceImpl<MessageInstanceRepository,MessageInstance>  implements MessageInstanceService {
+public class MessageInstanceServiceImpl extends ServiceImpl<MessageInstanceRepository, MessageInstance> implements MessageInstanceService {
 
 
     /**
      * 保存 用户消息表
+     *
      * @param messageInstance
      * @return
      */
-    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
-    public CyPersistModel persist(MessageInstance messageInstance){
+    public CyPersistModel persist(MessageInstance messageInstance) {
         //增加操作
         int line = baseMapper.insert(messageInstance);
-        log.debug(CyUserUtil.getAuthenUsername()+"新增了ID为"+
-            messageInstance.getBusinessId()+"的用户消息表信息");
+        log.debug(CyUserUtil.getAuthenUsername() + "新增了ID为" +
+                messageInstance.getBusinessId() + "的用户消息表信息");
         return new CyPersistModel(line);
     }
 
     /**
      * 删除 用户消息表
+     *
      * @param messageInstance
      * @return
      */
-    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
-    public CyPersistModel remove(MessageInstance messageInstance){
+    public CyPersistModel remove(MessageInstance messageInstance) {
         int line = baseMapper.realDelete(messageInstance);
-        log.debug(CyUserUtil.getAuthenUsername()+"删除了ID为"+
-            messageInstance.getBusinessId()+"的用户消息表信息");
+        log.debug(CyUserUtil.getAuthenUsername() + "删除了ID为" +
+                messageInstance.getBusinessId() + "的用户消息表信息");
         return new CyPersistModel(line);
     }
+
     /**
      * 逻辑删除 用户消息表
+     *
      * @param messageInstance
      * @return
      */
-    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
-    public CyPersistModel removeLogical(MessageInstance messageInstance){
+    public CyPersistModel removeLogical(MessageInstance messageInstance) {
         messageInstance.setDeleted();
         int line = baseMapper.deleteById(messageInstance);
-            log.debug(CyUserUtil.getAuthenUsername()+"逻辑删除了ID为"+
-                messageInstance.getBusinessId()+"的用户消息表信息");
+        log.debug(CyUserUtil.getAuthenUsername() + "逻辑删除了ID为" +
+                messageInstance.getBusinessId() + "的用户消息表信息");
         return new CyPersistModel(line);
     }
+
     /**
      * 修改 用户消息表
+     *
      * @param messageInstance
      * @return
      */
-    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
-    public CyPersistModel merge(MessageInstance messageInstance){
+    public CyPersistModel merge(MessageInstance messageInstance) {
         int line = baseMapper.updateById(messageInstance);
-        log.debug(CyUserUtil.getAuthenUsername()+"修改了ID为"+ messageInstance.getBusinessId()+"的用户消息表信息");
+        log.debug(CyUserUtil.getAuthenUsername() + "修改了ID为" + messageInstance.getBusinessId() + "的用户消息表信息");
         return new CyPersistModel(line);
     }
 
     /**
      * 根据id查询 用户消息表
+     *
      * @param id
      * @return
      */
     @Override
-    public MessageInstance findById(int id){
+    public MessageInstance findById(int id) {
         return baseMapper.selectById(id);
     }
 
     /**
      * 分页查询 用户消息表
+     *
      * @param messageInstance
      * @return
      */
     @Override
     public IPage<MessageInstance> findAllByPagination(CyPageInfo<MessageInstance> paginationUtility,
-        MessageInstance messageInstance){
-        return baseMapper.queryMessageInstancesPaged(paginationUtility,messageInstance);
+                                                      MessageInstance messageInstance) {
+        return baseMapper.queryMessageInstancesPaged(paginationUtility, messageInstance);
 
     }
+
     /**
      * 查询list 用户消息表
+     *
      * @param messageInstance
      * @return
      */
     @Override
-    public List<MessageInstance> findAll(MessageInstance messageInstance){
+    public List<MessageInstance> findAll(MessageInstance messageInstance) {
         return baseMapper.queryMessageInstances(messageInstance);
 
     }

src/main/java/org/rcisoft/sys/messageinstance/mapper/MessageInstanceMapper.xml → src/main/resources/mapper/MessageInstanceMapper.xml

@@ -9,26 +9,25 @@
         <result column="template_id" jdbcType="BIGINT" property="templateId"/>
         <result column="recipient_id" jdbcType="BIGINT" property="recipientId"/>
         <result column="push_time" jdbcType="TIMESTAMP" property="pushTime"/>
-        <result column="status" jdbcType="CHAR" property="status"/>
-        <result column="read_flag" jdbcType="CHAR" property="readFlag"/>
-        <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
+        <result column="status" jdbcType="VARCHAR" property="status"/>
+        <result column="read_flag" jdbcType="VARCHAR" property="readFlag"/>
+        <result column="flag" jdbcType="VARCHAR" property="flag"/>
+        <result column="del_flag" jdbcType="VARCHAR" property="delFlag"/>
         <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
-        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
-        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
         <result column="type" jdbcType="VARCHAR" property="type"/>
+        <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
     </resultMap>
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
     <select id="queryMessageInstances" resultMap="BaseResultMap">
         select * from message_instance
-        where 1=1
+        where del_flag='0' and flag = '1'
         <if test="entity.recipientId !=null">
             and recipient_id = #{entity.recipientId}
         </if>
-        <if test="entity.delFlag !=null and entity.delFlag != '' ">
-            and del_flag = #{entity.delFlag}
-        </if>
         <if test="entity.flag !=null and entity.flag != '' ">
             and read_flag = #{entity.flag}
         </if>
@@ -36,15 +35,12 @@
 
     <select id="queryMessageInstancesPaged" resultMap="BaseResultMap">
         select * from message_instance
-        where 1=1
+        where del_flag='0' and flag = '1'
         <if test="entity.recipientId !=null">
             and recipient_id = #{entity.recipientId}
         </if>
-        <if test="entity.delFlag !=null and entity.delFlag != '' ">
-            and del_flag = #{entity.delFlag}
-        </if>
-        <if test="entity.flag !=null and entity.flag != '' ">
-            and read_flag = #{entity.flag}
+        <if test="entity.readFlag !=null and entity.readFlag != '' ">
+            and read_flag = #{entity.readFlag}
         </if>
     </select>
 </mapper>