|
|
@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
import com.elink.esua.epdc.commons.tools.constant.FieldConstant; |
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.commons.tools.utils.Result; |
|
|
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; |
|
|
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; |
|
|
|
|
|
import com.elink.esua.epdc.dto.constant.GroupConstant; |
|
|
import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; |
|
|
import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; |
|
|
import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; |
|
|
import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO; |
|
|
import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; |
|
|
import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO; |
|
|
@ -37,7 +38,6 @@ import com.elink.esua.epdc.modules.group.entity.GroupEntity; |
|
|
import com.elink.esua.epdc.modules.project.dao.PropertyProjectDao; |
|
|
import com.elink.esua.epdc.modules.project.dao.PropertyProjectDao; |
|
|
import com.elink.esua.epdc.dto.project.PropertyProjectDTO; |
|
|
import com.elink.esua.epdc.dto.project.PropertyProjectDTO; |
|
|
import com.elink.esua.epdc.modules.project.entity.PropertyProjectEntity; |
|
|
import com.elink.esua.epdc.modules.project.entity.PropertyProjectEntity; |
|
|
import com.elink.esua.epdc.modules.project.redis.PropertyProjectRedis; |
|
|
|
|
|
import com.elink.esua.epdc.modules.project.service.PropertyProjectService; |
|
|
import com.elink.esua.epdc.modules.project.service.PropertyProjectService; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
@ -58,17 +58,12 @@ import java.util.Map; |
|
|
@Service |
|
|
@Service |
|
|
public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectDao, PropertyProjectEntity> implements PropertyProjectService { |
|
|
public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectDao, PropertyProjectEntity> implements PropertyProjectService { |
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
private PropertyProjectRedis propertyProjectRedis; |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
private AdminFeignClient adminFeignClient; |
|
|
private AdminFeignClient adminFeignClient; |
|
|
|
|
|
|
|
|
@Resource |
|
|
@Resource |
|
|
private GroupDao groupDao; |
|
|
private GroupDao groupDao; |
|
|
|
|
|
|
|
|
private final String avatarUrl = "https://epdc-yushan.elinkservice.cn/files-pro/20200512/e58074e631c5413692623b63fd51f580.png"; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public PageData<PropertyProjectDTO> page(Map<String, Object> params) { |
|
|
public PageData<PropertyProjectDTO> page(Map<String, Object> params) { |
|
|
IPage<PropertyProjectEntity> page = getPage(params); |
|
|
IPage<PropertyProjectEntity> page = getPage(params); |
|
|
@ -142,7 +137,7 @@ public class PropertyProjectServiceImpl extends BaseServiceImpl<PropertyProjectD |
|
|
); |
|
|
); |
|
|
groupEntity.setReferenceBusinessId(entity.getId()); |
|
|
groupEntity.setReferenceBusinessId(entity.getId()); |
|
|
groupEntity.setState(10); |
|
|
groupEntity.setState(10); |
|
|
groupEntity.setGroupAvatar(avatarUrl); |
|
|
groupEntity.setGroupAvatar(GroupConstant.PROPERTY_GROUP_AVATAR); |
|
|
groupEntity.setGroupName(entity.getProjectName() + "群"); |
|
|
groupEntity.setGroupName(entity.getProjectName() + "群"); |
|
|
groupEntity.setGroupCategory("2"); |
|
|
groupEntity.setGroupCategory("2"); |
|
|
groupEntity.setGrid(entity.getGrid()); |
|
|
groupEntity.setGrid(entity.getGrid()); |
|
|
|