Explorar o código

合并并修改

limin %!s(int64=7) %!d(string=hai) anos
pai
achega
243abd3138

+ 0 - 38
src/main/java/com/goafanti/app/bo/HomeImages.java

@@ -1,38 +0,0 @@
-package com.goafanti.app.bo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class HomeImages {
-	
-
-	public String img1="/customer_sys_file/1/GGN1.jpg";
-	
-	public String img2="/customer_sys_file/1/GG2.jpg";
-	
-	public String img3="/customer_sys_file/1/GG3.jpg";
-	
-	public String img4="/customer_sys_file/1/GG4.jpg";
-	
-	private List<HomeImgBo> imagers=new ArrayList<>();
-	
-	public  List<HomeImgBo> getImagers(HttpServletRequest request) {
-		String url=request.getServerName();
-		
-		if (url.contains("uat")) {
-			imagers.add(new HomeImgBo("14bd3573-7d09-4dcd-bfa0-10ad3285e3e9",img1,"成果"));
-			imagers.add(new HomeImgBo("e9c9577f-5b01-446a-b5f8-7667be957b4a",img2,"需求"));
-			imagers.add(new HomeImgBo("2023b591-c5fd-4c24-a5ca-a7eb491e8d9e",img3,"专家"));
-			imagers.add(new HomeImgBo(null,img4,null));
-		}else {
-			imagers.add(new HomeImgBo("065de736-9b40-4678-93bc-e95f5e8c529b",img1,"成果"));
-			imagers.add(new HomeImgBo("739aed36-6ee6-406f-b03e-97d719b484b9",img2,"需求"));
-			imagers.add(new HomeImgBo("af430be8-7752-43ac-ad82-27f02be317e6",img3,"专家"));
-			imagers.add(new HomeImgBo(null,img4,null));
-		}
-		return imagers;
-	}
-	
-}

+ 1 - 41
src/main/java/com/goafanti/app/bo/HomeImgBo.java

@@ -1,40 +1,3 @@
-<<<<<<< HEAD
-package com.goafanti.app.bo;
-
-public class HomeImgBo {
-	/**跳转ID*/
-	private String id;
-	/**轮播图片*/
-	private String imgUrl;
-	/**类型*/
-	private String type;
-	
-	HomeImgBo(String id,String imgUrl,String type){
-		this.id = id;
-		this.imgUrl = imgUrl;
-		this.type = type;
-	}
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
-	public String getImgUrl() {
-		return imgUrl;
-	}
-	public void setImgUrl(String imgUrl) {
-		this.imgUrl = imgUrl;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-	}
-=======
 package com.goafanti.app.bo;
 
 public class HomeImgBo {
@@ -63,7 +26,4 @@ public class HomeImgBo {
 	public void setJumpUrl(String jumpUrl) {
 		this.jumpUrl = jumpUrl;
 	}
-
-	
-	}
->>>>>>> refs/remotes/origin/patch
+}

+ 0 - 63
src/main/java/com/goafanti/app/service/impl/AppHomePageServiceImpl.java

@@ -1,63 +0,0 @@
-package com.goafanti.app.service.impl;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.goafanti.app.bo.AppHomePage;
-import com.goafanti.app.bo.HomeAchievemend;
-import com.goafanti.app.bo.HomeImages;
-import com.goafanti.app.service.AppHomePageService;
-import com.goafanti.common.dao.AchievementMapper;
-import com.goafanti.common.dao.DemandMapper;
-import com.goafanti.common.dao.UserIdentityMapper;
-import com.goafanti.user.service.UserIdentityService;
-
-@Service
-public  class AppHomePageServiceImpl implements AppHomePageService{
-	@Autowired
-	AchievementMapper	achievementMapper;
-	@Autowired
-	DemandMapper	demandMapper;
-	@Autowired
-	UserIdentityMapper	userIdentityMapper;
-	@Autowired
-	UserIdentityService userIdentityService;
-	
-
-	@Override
-	public AppHomePage getAppHomePage(HttpServletRequest request) {
-		AppHomePage ap=new AppHomePage();
-		ap.setHomeImg(new HomeImages().getImagers(request));
-		ap.setAdvertising(userIdentityService.advertising());
-		List<HomeAchievemend> h=achievementMapper.getAppHomeAchievement();
-		for (HomeAchievemend ha : h) {
-			if (null!=ha.getImg()&&ha.getImg().indexOf(",")>0) {
-				ha.setImg(ha.getImg().substring(0, ha.getImg().indexOf(",")));
-			}
-		}
-		ap.setAchievemend(h);
-		return ap;
-	}
-
-
-	@Override
-	public List<?> getHomeRecommended(Integer type) {
-		if (type==1) {
-		return achievementMapper.getAppHomeRecommended();			
-		}
-		if (type==2) {
-			return 	demandMapper.getAppHomeRecommended();
-		}
-		if (type==3) {
-			return userIdentityMapper.getAppHomeRecommended();
-		}
-		return null;
-	}
-
-	
-
-	
-}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1169
src/main/java/com/goafanti/common/controller/WebpageController.java


+ 3 - 3
src/main/java/com/goafanti/common/dao/MessageFromSystemMapper.java

@@ -80,7 +80,7 @@ public interface MessageFromSystemMapper {
 	int updateByPrimaryKey(MessageFromSystem record);
 
 	/**
-     * 查询发�?�目�??
+     * 查询发送目标
      * @param sql
      * @return
      */
@@ -122,7 +122,7 @@ public interface MessageFromSystemMapper {
 	String selectJPushAcc(@Param("uid")String uid);
 
 	/**
-	 * 绑定第三方账�?
+	 * 绑定第三方账
 	 * @param uuid
 	 * @param registrationId
 	 * @param userName
@@ -133,7 +133,7 @@ public interface MessageFromSystemMapper {
 			@Param("easemobName")String easemobName, @Param("easemobPass")String easemobPass, @Param("uid")String uid,@Param("lastLoginTime")Date lastLoginTime);
 	
 	/**
-	 * 把消息置为已�??
+	 * 把消息置为已
 	 * @param messageId
 	 * @param uid
 	 * @param readTime

+ 1 - 1
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -17,7 +17,7 @@ public class DemandListBo extends InputDemand{
 	
 	//demandType String 映射
 	private String	demandTypeS;
-	//有效�
+	//有效
 	private Date	validityPeriod;
 	
 	//是�关注

+ 26 - 25
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -43,6 +43,7 @@ import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.easemob.EasemobUtils;
+import com.goafanti.order.enums.AuditState;
 import com.goafanti.user.bo.ExpertUserIdentity;
 import com.goafanti.user.bo.InputOrgPro;
 import com.goafanti.user.bo.InputOrganizationIdentity;
@@ -114,7 +115,7 @@ public class UserApiController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "必须指定", "密码"));
 		}
 		if (password.equals(newPassword)) {
-			res.getError().add(buildError(ErrorConstants.PWD_SAME_ERROR, "新密码必须与原密码不��?!"));
+			res.getError().add(buildError(ErrorConstants.PWD_SAME_ERROR, "新密码必须与原密码不匹配!"));
 		}
 
 		if (res.getError().isEmpty() && TokenManager.isLogin()) {
@@ -144,21 +145,21 @@ public class UserApiController extends BaseApiController {
 	public Result updateMobile(String mobile, String mobileCode) {
 		Result res = new Result();
 		if (StringUtils.isBlank(mobile)) {
-			res.getError().add(buildError(ErrorConstants.MOBILE_EMPTY_ERROR, "手机号不能为�?!"));
+			res.getError().add(buildError(ErrorConstants.MOBILE_EMPTY_ERROR, "手机号不能为�?!"));
 			return res;
 		}
 
 		if (StringUtils.isBlank(mobileCode)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "手机验证�?"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "手机验证�?"));
 			return res;
 		}
-		// 验证�?15分钟有效
+		// 验证�?15分钟有效
 		if (TimeUtils.checkOverTime("register")) {
-			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失�?"));
+			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失�?"));
 			return res;
 		}
 		if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.M_CODE).equals(mobileCode)) {
-			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错�?"));
+			res.getError().add(buildError(ErrorConstants.MCODE_ERROR, "手机验证码错�?"));
 			return res;
 		}
 		User user = userService.selectByPrimaryKey(TokenManager.getUserId());
@@ -194,7 +195,7 @@ public class UserApiController extends BaseApiController {
 	}
 
 	/**
-	 * 公共可替�?
+	 * 公共可替�?
 	 */
 	@RequestMapping(value = "/avatar/uploadReplace", method = RequestMethod.POST)
 	public Result avatarReplace(HttpServletRequest req, String sign) {
@@ -345,14 +346,14 @@ public class UserApiController extends BaseApiController {
 		}
 
 		if (StringUtils.isBlank(pro.getCompanyName())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到单位名�?", "单位名称"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到单位名�?", "单位名称"));
 			return res;
 		}
 		return res;
 	}
 
 	/**
-	 * 团体会员�?术能�?
+	 * 团体会员�?术能�?
 	 * 
 	 * @param orgTech
 	 * @return
@@ -409,7 +410,7 @@ public class UserApiController extends BaseApiController {
 			return res;
 		}
 		if(null == userIdentity.getExpertAudit()){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "审核状�?�未提交"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "审核状�?�未提交"));
 			return res;
 		}
 		if(StringUtils.isBlank(userIdentity.getUid())) {
@@ -429,7 +430,7 @@ public class UserApiController extends BaseApiController {
 			User user = new User();
 			BeanUtils.copyProperties(userIdentity, ui);
 			BeanUtils.copyProperties(userIdentity, user);
-			//获得用户的认证信�?
+			//获得用户的认证信�?
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
 			if (null == u) {
 				ui.setId(UUID.randomUUID().toString());
@@ -437,11 +438,11 @@ public class UserApiController extends BaseApiController {
 				userIdentityService.insert(ui);
 			} else {
 				System.out.println(u.getAuditStatus());
-				//判断审核状�??
-				if (userIdentity.getExpertAudit() == 0 || userIdentity.getExpertAudit() == 3) {
-					ui.setExpertAudit(1);
+				//判断审核状�??
+				if (userIdentity.getAuditStatus() == 0 || userIdentity.getAuditStatus() == 3) {
+					ui.setAuditStatus(1);
 				} else {
-					res.getError().add(buildError("", "已经提交审核或�?�审核已经�?�过"));
+					res.getError().add(buildError("", "已经提交审核或�?�审核已经�?�过"));
 					return res;
 				}
 				ui.setId(u.getId());
@@ -452,7 +453,7 @@ public class UserApiController extends BaseApiController {
 			userService.updateByPrimaryKeySelective(user);
 			userIdentity.setGraduateSchool(ui.getGraduateSchool());
 			userIdentity.setExpert(ui.getExpert());
-			userIdentity.setExpertAudit(ui.getExpertAudit());
+			userIdentity.setAuditStatus(ui.getAuditStatus());
 		}
 		res.setData(userIdentity);
 		return res;
@@ -595,7 +596,7 @@ public class UserApiController extends BaseApiController {
 	}
 
 	/**
-	 * 个人会员职业信息/团体会员�?术能�?
+	 * 个人会员职业信息/团体会员�?术能�?
 	 * 
 	 * @return
 	 */
@@ -633,7 +634,7 @@ public class UserApiController extends BaseApiController {
 	@RequestMapping(value = "/nickname", method = RequestMethod.GET)
 	public Result nickname() {
 		User u = userService.selectByPrimaryKey(TokenManager.getUserId());
-		Assert.notNull(u, "用户不存�?");
+		Assert.notNull(u, "用户不存�?");
 		return res().data(u.getNickname());
 	}
 
@@ -683,7 +684,7 @@ public class UserApiController extends BaseApiController {
 	}
 	
 	/**
-	 * 登陆后返回用户基本信�?
+	 * 登陆后返回用户基本信�?
 	 * 
 	 * @return
 	 */
@@ -712,7 +713,7 @@ public class UserApiController extends BaseApiController {
 	}
 
 	/**
-	 * 个人实名认证流程下一�?
+	 * 个人实名认证流程下一�?
 	 */
 	@RequestMapping(value = "/userNextPro", method = RequestMethod.POST)
 	public Result userNextProcess(UserIdentity userIdentity, String verificationCode) {
@@ -815,13 +816,13 @@ public class UserApiController extends BaseApiController {
 	private Result checkCertify(Result res) {
 		OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
 		if (null == o || !IdentityAuditStatus.PASSED.getCode().equals(o.getAuditStatus())) {
-			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未�?�过实名认证,无法操作!"));
+			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未�?�过实名认证,无法操作!"));
 		}
 		return res;
 	}
 	
 	/**
-	 * 新增客户联系�?
+	 * 新增客户联系�?
 	 * @param bo
 	 * @return
 	 */
@@ -841,7 +842,7 @@ public class UserApiController extends BaseApiController {
 	}
 	
 	/**
-	 * 修改客户联系�?
+	 * 修改客户联系�?
 	 * @param bo
 	 * @return
 	 */
@@ -861,7 +862,7 @@ public class UserApiController extends BaseApiController {
 	}
 	
 	/**
-	 * 删除客户联系�?
+	 * 删除客户联系�?
 	 * @param id
 	 * @return
 	 */
@@ -877,7 +878,7 @@ public class UserApiController extends BaseApiController {
 	}
 	
 	/**
-	 * 获取用户联系�?
+	 * 获取用户联系�?
 	 * @return
 	 */
 	@RequestMapping(value = "/getUserContacts", method = RequestMethod.GET)