diff --git a/competition/src/main/java/com/huoran/competition/entity/Competition.java b/competition/src/main/java/com/huoran/competition/entity/Competition.java index 27489b7..25f3639 100644 --- a/competition/src/main/java/com/huoran/competition/entity/Competition.java +++ b/competition/src/main/java/com/huoran/competition/entity/Competition.java @@ -92,7 +92,7 @@ public class Competition implements Serializable { private String reportingPlace; - @ApiModelProperty(value = "创建来源(0默认平台创建)") + @ApiModelProperty(value = "创建来源(0默认平台创建 1...待定)") private Integer createSource; diff --git a/competition/src/main/java/com/huoran/competition/entity/req/PageCompetitionListReq.java b/competition/src/main/java/com/huoran/competition/entity/req/PageCompetitionListReq.java index 9c82b25..173b22b 100644 --- a/competition/src/main/java/com/huoran/competition/entity/req/PageCompetitionListReq.java +++ b/competition/src/main/java/com/huoran/competition/entity/req/PageCompetitionListReq.java @@ -53,4 +53,7 @@ public class PageCompetitionListReq extends PageReq{ @ApiModelProperty(value = "是否登录:-1未登录/1已登录") private Integer isLogin; + + @ApiModelProperty(value = "创建来源(0默认平台创建 1...待定)") + private Integer createSource; } \ No newline at end of file diff --git a/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml b/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml index 93e9248..8a14349 100644 --- a/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml +++ b/competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml @@ -94,6 +94,10 @@ and create_time between #{req.startTime} and #{req.endTime} + + and create_source = #{req.createSource} + + and platform_source =#{req.platformSource} diff --git a/nakadai/src/main/java/com/huoran/nakadai/controller/AliRealNameAuthenticationController.java b/nakadai/src/main/java/com/huoran/nakadai/controller/AliRealNameAuthenticationController.java index e47b53f..5d8c465 100644 --- a/nakadai/src/main/java/com/huoran/nakadai/controller/AliRealNameAuthenticationController.java +++ b/nakadai/src/main/java/com/huoran/nakadai/controller/AliRealNameAuthenticationController.java @@ -257,10 +257,10 @@ public class AliRealNameAuthenticationController { userInfoUpdateWrapper.eq("user_id", userAccount1.getUserId()); userInfoService.update(new HrUserInfo(), userInfoUpdateWrapper);*/ - UserInfo userInfo = new UserInfo(); + /*UserInfo userInfo = new UserInfo(); userInfo.setUserName(enterpriseCertification.getCompanyName()); userInfo.setUserId(userAccount1.getUserId()); - enterpriseCertificationService.updateUserInfo(userInfo); + enterpriseCertificationService.updateUserInfo(userInfo);*/ //删除团队信息 // enterpriseCertificationService.deleteTeamInformation(enterpriseCertification.getAccountId()); diff --git a/nakadai/src/main/java/com/huoran/nakadai/controller/PlatformTeamAccountController.java b/nakadai/src/main/java/com/huoran/nakadai/controller/PlatformTeamAccountController.java index ae9b2d6..6b18fed 100644 --- a/nakadai/src/main/java/com/huoran/nakadai/controller/PlatformTeamAccountController.java +++ b/nakadai/src/main/java/com/huoran/nakadai/controller/PlatformTeamAccountController.java @@ -19,10 +19,12 @@ import com.huoran.nakadai.service.PlatformTeamClassificationService; import com.huoran.nakadai.service.PlatformTeamService; import com.huoran.nakadai.service.SupplierClassificationConfigService; import com.huoran.nakadai.utils.GenerateCodeUtil; +import com.huoran.nakadai.utils.ali.HttpUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.apache.commons.lang3.StringUtils; +import org.apache.http.HttpResponse; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -31,6 +33,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -285,5 +288,38 @@ public class PlatformTeamAccountController { public R inviteJoinOrganization(@RequestBody @Valid InviteJoinInfo inviteJoinInfo) { return platformTeamAccountService.inviteJoinOrganization(inviteJoinInfo); } + + public static void main(String[] args) { + String host = "https://gpsyl.market.alicloudapi.com"; + String path = "/ai_market/kg/gu_piao_shi_ying_lv/v1"; + String method = "GET"; + String appcode = "4c22c2b34b2d4b5aaa57186a49aa3a4c"; + Map headers = new HashMap(); + //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105 + headers.put("Authorization", "APPCODE " + appcode); + Map querys = new HashMap(); + querys.put("PRICE", "6.5899"); + querys.put("PROFIT", "1"); + + + try { + /** + * 重要提示如下: + * HttpUtils请从 + * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java + * 下载 + * + * 相应的依赖请参照 + * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml + */ + HttpResponse response = HttpUtils.doGet(host, path, method, headers, querys); + System.out.println(response.toString()); + //获取response的body + //System.out.println(EntityUtils.toString(response.getEntity())); + } catch (Exception e) { + e.printStackTrace(); + } + } + } diff --git a/nakadai/src/main/java/com/huoran/nakadai/entity/ExplosiveRecommendation.java b/nakadai/src/main/java/com/huoran/nakadai/entity/ExplosiveRecommendation.java index 9873ced..ccaeeae 100644 --- a/nakadai/src/main/java/com/huoran/nakadai/entity/ExplosiveRecommendation.java +++ b/nakadai/src/main/java/com/huoran/nakadai/entity/ExplosiveRecommendation.java @@ -71,6 +71,9 @@ public class ExplosiveRecommendation implements Serializable { @ApiModelProperty(value = "跳转链接") private String jumpLink; + @ApiModelProperty(value = "描述") + private String description; + @ApiModelProperty(value = "发布状态(0默认未发布/1已发布)") private Integer publishStatus; diff --git a/nakadai/src/main/java/com/huoran/nakadai/entity/vo/TeamClassificationVO.java b/nakadai/src/main/java/com/huoran/nakadai/entity/vo/TeamClassificationVO.java index 8c2054f..d7a3dfc 100644 --- a/nakadai/src/main/java/com/huoran/nakadai/entity/vo/TeamClassificationVO.java +++ b/nakadai/src/main/java/com/huoran/nakadai/entity/vo/TeamClassificationVO.java @@ -30,6 +30,10 @@ public class TeamClassificationVO { @ApiModelProperty(value = "供应商分类配置id") private Integer classificationConfigId; + @ApiModelProperty(value = "联系号码") + private String phone; + + } diff --git a/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/PlatformTeamMapper.xml b/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/PlatformTeamMapper.xml index 679e153..2a35399 100644 --- a/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/PlatformTeamMapper.xml +++ b/nakadai/src/main/java/com/huoran/nakadai/mapper/xml/PlatformTeamMapper.xml @@ -10,7 +10,8 @@ sc.classification_name AS supplierClassificationName, sc.id AS supplierClassificationId, t.id AS teamId, - cc.id AS classificationConfigId + cc.id AS classificationConfigId, + c.phone FROM k_platform_team t INNER JOIN k_platform_team_account ta ON ta.manage_id = t.manage_id