diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 70e93c0cd..4ea75bed9 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -68,6 +68,7 @@ public class CommonConstants { public static final String SQUAREBRACKETSRIGHT = "]"; public static final String PATH_SPILT = "/"; + public static final String PATH_BAR = "-"; public static final String ROOT_REGION_PATH = "/1/"; /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml index aff427604..fda49919d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml @@ -322,6 +322,8 @@ start_date as startDate, close_time as closeTime, location as location, + closed_type as closedType, + creator as creator, exhibition_name as exhibitionName, collaborators as collaboratorStr from hy_exhibition diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java index e328c2af1..cf7d6abfd 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java @@ -27,6 +27,10 @@ public class ExhibitionDTO { private String collaboratorStr; + private String creator; + + private Integer closedType; + private List collaborators; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java index dd10ac5b5..eb16c07e1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java @@ -18,6 +18,10 @@ public class ExhibitionVO { private String startDate; + private Integer closedType; + + private String createId; + private Integer id; private List collaborators; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java index e62bb5c50..3c0073c32 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java @@ -330,7 +330,9 @@ public class ExhibitionServiceImpl implements ExhibitionService { list.forEach(exhibitionDTO->{ ExhibitionVO exhibitionVO = new ExhibitionVO(); exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName()); - exhibitionVO.setStartDate(exhibitionDTO.getStartDate()); + exhibitionVO.setCreateId(exhibitionDTO.getCreator()); + exhibitionVO.setClosedType(exhibitionDTO.getClosedType()); + exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT)); exhibitionVO.setId(exhibitionDTO.getId()); exhibitionVOS.add(exhibitionVO); }); @@ -368,7 +370,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { exhibitionDTOS.forEach(exhibitionDTO->{ ExhibitionVO exhibitionVO = new ExhibitionVO(); exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName()); - exhibitionVO.setStartDate(exhibitionDTO.getStartDate()); + exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT)); exhibitionVO.setLocation(exhibitionDTO.getLocation()); exhibitionVO.setId(exhibitionDTO.getId()); //需要加载协作人才加载 不需要的时候 不加载 diff --git a/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties index a17d74480..4b73f0cb0 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap-pre.properties @@ -1,4 +1,8 @@ -spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 -spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.discovery.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.server-addr=10.0.0.192:8848 +#spring.cloud.nacos.config.file-extension=properties +#spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 +spring.cloud.nacos.discovery.server-addr=120.92.151.10:8848 +spring.cloud.nacos.config.server-addr=120.92.151.10:8848 spring.cloud.nacos.config.file-extension=properties spring.cloud.nacos.config.namespace=ca99b6a9-b48c-4575-9d07-fc50132b3122 \ No newline at end of file diff --git a/coolstore-partner-webb/src/main/resources/bootstrap.properties b/coolstore-partner-webb/src/main/resources/bootstrap.properties index e8cb5a145..fd6fa0390 100644 --- a/coolstore-partner-webb/src/main/resources/bootstrap.properties +++ b/coolstore-partner-webb/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-webb -spring.profiles.active=dev +spring.profiles.active=pre server.port=31000 server.servlet.context-path=/partner/pc