|
@@ -10,6 +10,7 @@ import com.gyee.frame.model.auto.GyeeBraceletuser;
|
|
import com.gyee.frame.model.auto.Gyeeuser;
|
|
import com.gyee.frame.model.auto.Gyeeuser;
|
|
import com.gyee.frame.model.custom.DataVo;
|
|
import com.gyee.frame.model.custom.DataVo;
|
|
import com.gyee.frame.model.custom.DatasVo;
|
|
import com.gyee.frame.model.custom.DatasVo;
|
|
|
|
+import com.gyee.frame.model.custom.NoReadVo;
|
|
import com.gyee.frame.service.ChatDetailService;
|
|
import com.gyee.frame.service.ChatDetailService;
|
|
import com.gyee.frame.service.GyeeBraceletuserService;
|
|
import com.gyee.frame.service.GyeeBraceletuserService;
|
|
import com.gyee.frame.service.GyeeuserService;
|
|
import com.gyee.frame.service.GyeeuserService;
|
|
@@ -122,6 +123,11 @@ public class ChatDetailController {
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
for(ChatDetail po:result)
|
|
for(ChatDetail po:result)
|
|
{
|
|
{
|
|
|
|
+ if(po.getPointtoid().equals(send))
|
|
|
|
+ {
|
|
|
|
+ po.setReceiveip("1");
|
|
|
|
+ chatDetailService.updateByPrimaryKeySelective(po);
|
|
|
|
+ }
|
|
DatasVo vo=new DatasVo();
|
|
DatasVo vo=new DatasVo();
|
|
vo.setSend(po.getSendingid());
|
|
vo.setSend(po.getSendingid());
|
|
vo.setReceive(po.getPointtoid());
|
|
vo.setReceive(po.getPointtoid());
|
|
@@ -179,6 +185,16 @@ public class ChatDetailController {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ @GetMapping("/selectNoreadInfoByUserId")
|
|
|
|
+ @ResponseBody
|
|
|
|
+ public List<NoReadVo> selectNoreadInfoByUserId(String userid) {
|
|
|
|
+
|
|
|
|
+ List<NoReadVo> result=chatDetailService.selectNoreadInfoByUserId(userid);
|
|
|
|
+
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
@PostMapping("/insertSelective")
|
|
@PostMapping("/insertSelective")
|
|
@ResponseBody
|
|
@ResponseBody
|
|
public int insertSelective(HttpServletRequest request, @RequestBody DatasVo vo) {
|
|
public int insertSelective(HttpServletRequest request, @RequestBody DatasVo vo) {
|
|
@@ -211,6 +227,7 @@ public class ChatDetailController {
|
|
temp=temp.substring(0,temp.length()-4)+".jpg";
|
|
temp=temp.substring(0,temp.length()-4)+".jpg";
|
|
po.setRemark2(temp);
|
|
po.setRemark2(temp);
|
|
}
|
|
}
|
|
|
|
+
|
|
//获取IP地址
|
|
//获取IP地址
|
|
String ipAddress = IpUtil.getIpAddr(request);
|
|
String ipAddress = IpUtil.getIpAddr(request);
|
|
|
|
|