修改--修改bug
This commit is contained in:
parent
7d3420afa1
commit
1cc41ec09f
@ -1416,11 +1416,11 @@ public class AppSystemController extends BaseController {
|
||||
userPublishWorkSourceListDto.setSource(userPublishWorkSourceListDto.getCity()+userPublishWorkSourceListDto.getScenic()+userPublishWorkSourceListDto.getPart()+userPublishWorkSourceListDto.getCoordinate());
|
||||
|
||||
//--------------------------------------测试时直接注释掉-------------------------------------------------
|
||||
// LocalDate now = LocalDate.now();
|
||||
// long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime());
|
||||
// userPublishWorkSourceListDto.setrDays(daysBetween);
|
||||
LocalDate now = LocalDate.now();
|
||||
long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime());
|
||||
userPublishWorkSourceListDto.setrDays(daysBetween);
|
||||
//--------------------------------------测试时直接注释掉end-----------------------------------------------
|
||||
userPublishWorkSourceListDto.setrDays(0L);
|
||||
// userPublishWorkSourceListDto.setrDays(0L);
|
||||
}
|
||||
//-----------------------------------查看该作品所属资源位end---------------------------------------------
|
||||
|
||||
@ -2071,12 +2071,12 @@ public class AppSystemController extends BaseController {
|
||||
for(UserPublishWorkSourceListDto userPublishWorkSourceListDto: sourceList){
|
||||
userPublishWorkSourceListDto.setSource(userPublishWorkSourceListDto.getCity()+userPublishWorkSourceListDto.getScenic()+userPublishWorkSourceListDto.getPart()+userPublishWorkSourceListDto.getCoordinate());
|
||||
|
||||
//------------------------- 测试版本先注释掉--------------------------------------
|
||||
// LocalDate now = LocalDate.now();
|
||||
// long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime());
|
||||
// userPublishWorkSourceListDto.setrDays(daysBetween);
|
||||
//---------------------------测试版本先注释掉end----------------------------------
|
||||
userPublishWorkSourceListDto.setrDays(0L);
|
||||
// ------------------------- 测试版本先注释掉--------------------------------------
|
||||
LocalDate now = LocalDate.now();
|
||||
long daysBetween = ChronoUnit.DAYS.between(now, userPublishWorkSourceListDto.getEndTime());
|
||||
userPublishWorkSourceListDto.setrDays(daysBetween);
|
||||
// ---------------------------测试版本先注释掉end----------------------------------
|
||||
// userPublishWorkSourceListDto.setrDays(0L);
|
||||
}
|
||||
//-----------------------------------查看该作品所属资源位end---------------------------------------------
|
||||
|
||||
@ -2088,6 +2088,8 @@ public class AppSystemController extends BaseController {
|
||||
userFollow.setFollowedUserId(userPublishWorkDetail.getUserId());
|
||||
userFollow.setStatus("0");
|
||||
List<SysUserFollow> userFollowList = userFollowService.selectSysUserFollowList(userFollow);
|
||||
|
||||
|
||||
if(userFollowList.size() > 0){
|
||||
// 以关注
|
||||
userPublishWorkDetail.setIsFollow("1");
|
||||
@ -2143,7 +2145,7 @@ public class AppSystemController extends BaseController {
|
||||
userFollow.setStatus("0");
|
||||
List<SysUserFollow> userFollowList = userFollowService.selectSysUserFollowList(userFollow);
|
||||
if(userFollowList.size() > 0){
|
||||
// 以关注
|
||||
// 已关注
|
||||
moreUserDetailDto.setIsFollow("1");
|
||||
}else{
|
||||
moreUserDetailDto.setIsFollow("0");
|
||||
|
||||
@ -215,7 +215,7 @@ public class dailySysServer {
|
||||
// 这里应该每天12点后更新一次,
|
||||
@Scheduled(cron = "0 5 12 * * ?")
|
||||
@Transactional
|
||||
@GetMapping("/dailySource")
|
||||
// @GetMapping("/dailySource")
|
||||
public void updateDailySource(){
|
||||
|
||||
LocalDate now = LocalDate.now();
|
||||
|
||||
@ -9,7 +9,8 @@ spring:
|
||||
master:
|
||||
url: jdbc:mysql://localhost:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
|
||||
# url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 腾讯云
|
||||
# url: jdbc:mysql://172.17.0.3:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 火山云
|
||||
# url: jdbc:mysql://localhost:3306/xingming?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
|
||||
username: root
|
||||
|
||||
@ -16,6 +16,7 @@ ruoyi:
|
||||
domain: http://10.0.0.17:8081
|
||||
|
||||
# domain: http://82.156.153.112:8081
|
||||
# domain: http://14.103.162.172:8081
|
||||
#
|
||||
# idCardPath: /home/IdCard
|
||||
# profile: /home/uploadPath
|
||||
@ -83,7 +84,9 @@ spring:
|
||||
redis:
|
||||
# 地址
|
||||
host: localhost
|
||||
# host: 172.17.0.3
|
||||
# host: 172.17.0.3 # 腾讯云
|
||||
# host: 172.17.0.2 #火山云
|
||||
|
||||
# 端口，默认为6379
|
||||
port: 6379
|
||||
# 数据库索引
|
||||
|
||||
@ -11,6 +11,8 @@ public class MoreUserDetailDto {
|
||||
private String avatar;
|
||||
private String remark;
|
||||
private String isFollow;
|
||||
private String signature;
|
||||
private String backGround;
|
||||
// private List<UserPublishWorkMoreDto> userWorkList;
|
||||
|
||||
public Long getUserId() {
|
||||
@ -53,6 +55,22 @@ public class MoreUserDetailDto {
|
||||
this.isFollow = isFollow;
|
||||
}
|
||||
|
||||
public String getSignature() {
|
||||
return signature;
|
||||
}
|
||||
|
||||
public void setSignature(String signature) {
|
||||
this.signature = signature;
|
||||
}
|
||||
|
||||
public String getBackGround() {
|
||||
return backGround;
|
||||
}
|
||||
|
||||
public void setBackGround(String back_ground) {
|
||||
this.backGround = back_ground;
|
||||
}
|
||||
|
||||
// public List<UserPublishWorkMoreDto> getUserWorkList() {
|
||||
// return userWorkList;
|
||||
// }
|
||||
|
||||
@ -27,6 +27,8 @@ public class UserPublishWorkDetailDto {
|
||||
private String isFollow;
|
||||
private String isAddLike;
|
||||
|
||||
private String isMine = "0";
|
||||
|
||||
private List<UserPublishWorkSourceListDto> sourceList;
|
||||
|
||||
// private List<UserWork> userWorkList;
|
||||
@ -140,6 +142,14 @@ public class UserPublishWorkDetailDto {
|
||||
this.isAddLike = isAddLike;
|
||||
}
|
||||
|
||||
public String getIsMine() {
|
||||
return isMine;
|
||||
}
|
||||
|
||||
public void setIsMine(String isMine) {
|
||||
this.isMine = isMine;
|
||||
}
|
||||
|
||||
// public List<UserWork> getUserWorkList() {
|
||||
// return userWorkList;
|
||||
// }
|
||||
|
||||
@ -79,6 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="nickName" column="nick_name"/>
|
||||
<result property="avatar" column="avatar"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="avatar" column="avatar"/>
|
||||
<result property="backGround" column="back_ground"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectUserVo">
|
||||
@ -222,9 +225,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
|
||||
</select>
|
||||
<select id="getMoreUserDetail" resultMap="MoreUserDetailDtoResult">
|
||||
select nick_name, remark, avatar
|
||||
from sys_user
|
||||
where user_id = #{userId}
|
||||
select su.nick_name, su.remark, su.avatar, ui.signature, ui.back_ground
|
||||
from sys_user su
|
||||
left join user_info ui on su.user_id = ui.user_id
|
||||
where su.user_id = #{userId}
|
||||
</select>
|
||||
<select id="getAPPUser" resultMap="SysUserResult">
|
||||
select * from sys_user where user_type = '0000000000'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user