消息改为已读

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReadIcMessageFormDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ReadIcMessageFormDTO implements Serializable {
+	private static final long serialVersionUID = 2697079163476964749L;
+
+	/**
+	 * 消息Id
+	 */
+	private String id;
+	//token中信息
+	private String customerId;
+	private String userId;
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java

@@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcMessageDTO;
 import com.epmet.dto.form.IcMessageFormDTO;
 import com.epmet.dto.form.IcMessageListFormDTO;
+import com.epmet.dto.form.ReadIcMessageFormDTO;
 import com.epmet.service.IcMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -83,5 +84,17 @@ public class IcMessageController {
         return new Result();
     }
 
+    /**
+     * @Author sun
+     * @Description 单条或批量修改已读
+     **/
+    @PostMapping("read")
+    public Result read(@LoginUser TokenDto tokenDto, @RequestBody ReadIcMessageFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        icMessageService.read(formDTO);
+        return new Result();
+    }
+
 
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java

@@ -3,6 +3,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IcMessageDTO;
 import com.epmet.dto.form.IcMessageListFormDTO;
+import com.epmet.dto.form.ReadIcMessageFormDTO;
 import com.epmet.entity.IcMessageEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -18,4 +19,6 @@ import java.util.List;
 public interface IcMessageDao extends BaseDao<IcMessageEntity> {
 
     List<IcMessageDTO> selectMessageList(IcMessageListFormDTO formDTO);
+
+    void upByUserId(ReadIcMessageFormDTO formDTO);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcMessageDTO;
 import com.epmet.dto.form.IcMessageFormDTO;
 import com.epmet.dto.form.IcMessageListFormDTO;
+import com.epmet.dto.form.ReadIcMessageFormDTO;
 import com.epmet.entity.IcMessageEntity;
 
 import java.util.List;
@@ -70,4 +71,6 @@ public interface IcMessageService extends BaseService<IcMessageEntity> {
     void delete(String[] ids);
 
     void saveIcMessageList(List<IcMessageFormDTO> msgList);
+
+    void read(ReadIcMessageFormDTO formDTO);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java

@@ -16,6 +16,7 @@ import com.epmet.dto.IcMessageDTO;
 import com.epmet.dto.form.IcMessageFormDTO;
 import com.epmet.dto.form.IcMessageListFormDTO;
 import com.epmet.dto.form.IcMoveInListFormDTO;
+import com.epmet.dto.form.ReadIcMessageFormDTO;
 import com.epmet.dto.result.AllGridsByUserIdResultDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcMoveInListResultDTO;
@@ -93,4 +94,17 @@ public class IcMessageServiceImpl extends BaseServiceImpl<IcMessageDao, IcMessag
         insertBatch(entityList);
     }
 
+    @Override
+    public void read(ReadIcMessageFormDTO formDTO) {
+        //id入参有值就按id修改，没值就按用户修改
+        if(StringUtils.isNotBlank(formDTO.getId())){
+            IcMessageEntity entity = new IcMessageEntity();
+            entity.setId(formDTO.getId());
+            updateById(entity);
+            return;
+        }
+        //批量修改某个人消息列表
+        baseDao.upByUserId(formDTO);
+    }
+
 }

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml

@@ -23,4 +23,15 @@
         AND user_id = #{userId}
     </select>
 
+    <update id="upByUserId" parameterType="com.epmet.dto.form.ReadIcMessageFormDTO">
+        UPDATE ic_message
+        SET read_flag = 'read',
+            updated_by = #{userId},
+            updated_time = NOW()
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+        AND user_id = #{userId}
+    </update>
+
 </mapper>