Kaynağa Gözat

Merge branch 'test' of ssh://anderx@git.jishutao.com:55555/jishutao/jitao-server.git into test

anderx 7 yıl önce
ebeveyn
işleme
69fbfa0a7a

+ 1 - 1
GeneratorConfig.xml

@@ -12,4 +12,4 @@
    <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="jitao-server" type="XMLMAPPER" />
    <table schema="aft" tableName="banners"/>
   </context>
-</generatorConfiguration>
+</generatorConfiguration>

+ 7 - 0
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -416,4 +416,11 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(userIdentityService.updateAuditing(identity));
 		return res;
 	}
+	
+	//获得注册用户信息
+	@RequestMapping(value="/user/info", method = RequestMethod.GET)
+	public Result userInfo(User user, Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		return res;
+	}
 }

+ 7 - 2
src/main/java/com/goafanti/message/controller/AdminMessageController.java

@@ -403,12 +403,17 @@ public class AdminMessageController extends CertifyApiController{
 			messageProducer.setCreateTime(null);
 		}
 		Result res = checkMessage(messageProducer);
-		if(StringUtils.isBlank(TokenManager.getUserId())){
+		
+		if(StringUtils.isBlank(TokenManager.getUserId()) && StringUtils.isBlank(TokenManager.getAdminId())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "登录数据失效"));
 		}
 		if (res.getError().isEmpty()) {
 			//新增消息
-			res.setData(jtMessageProducerService.addMessage(messageProducer));
+			int err = jtMessageProducerService.addMessage(messageProducer);
+			if(err == -1){
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "没有找到您的用户信息,不能创建消息"));
+			}
+			res.setData(err);
 		}
 		return res;
 	}

+ 10 - 1
src/main/java/com/goafanti/message/service/impl/JtMessageProducerServiceImpl.java

@@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.JtMessageConsumerMapper;
 import com.goafanti.common.dao.JtMessageProducerMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -28,6 +29,8 @@ public class JtMessageProducerServiceImpl  extends BaseMybatisDao<JtMessageProdu
 	@Autowired
 	private UserMapper userMapper;
 	@Autowired
+	private AdminMapper adminMapper;
+	@Autowired
 	private JtMessageConsumerMapper jtMessageConsumerMapper;
 	
 
@@ -36,7 +39,13 @@ public class JtMessageProducerServiceImpl  extends BaseMybatisDao<JtMessageProdu
 		//处理消息内容
 		messageProducer.setId(UUID.randomUUID().toString());
 		//获得当前登录用户名字
-		String create = userMapper.selectByPrimaryKey(TokenManager.getUserId()).getUsername();
+		String create = adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getName();
+		if(StringUtils.isBlank(create)){
+			create = userMapper.selectByPrimaryKey(TokenManager.getUserId()).getUsername();
+		}
+		if(StringUtils.isBlank(create)){
+			return -1;
+		}
 		messageProducer.setCreater(create);
 		if(null != messageProducer.getCreateTime()){
 			messageProducer.setCreateTime(new Date());

+ 2 - 1
src/main/java/com/goafanti/user/service/UserService.java

@@ -9,7 +9,6 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.UserBaseBo;
 import com.goafanti.user.bo.UserDownLoadBo;
-import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserNames;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
@@ -62,5 +61,7 @@ public interface UserService {
 
 	
 	
+	Pagination<User> userInfo(User user, Integer pageNo, Integer pageSize);
+	
 	
 }

+ 8 - 3
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -12,7 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.goafanti.app.bo.UserBasicInfo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.JpushEasemobAccountMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
@@ -20,11 +19,9 @@ import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.user.bo.ClientListBo;
 import com.goafanti.user.bo.OrgUnitNames;
 import com.goafanti.user.bo.UserBaseBo;
 import com.goafanti.user.bo.UserDownLoadBo;
-import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserNames;
 import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
@@ -226,6 +223,14 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	public Integer selectByMobieAndTypeCount(String mobile ) {
 		return userMapper.selectByMobieAndTypeCount(mobile);
 	}
+	@Override
+	public Pagination<User> userInfo(User user, Integer pageNo, Integer pageSize) {
+		Map<String,Object> map = new HashMap<String, Object>();
+		map.put("username", "");
+		map.put("mobile", "");
+		map.put("type", "");
+		return null;
+	}
 
 
 	

+ 2 - 2
src/main/webapp/WEB-INF/views/common.html

@@ -116,9 +116,9 @@
 					<p>
 						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexPolicy}">知识产权交易政策</a>
 					</p>
-					<p>
+					<!-- <p>
 						<a th:href="@{/portal/technologyTrading/tradingIndex#trandingIndexExpert}">权威专家</a>
-					</p>
+					</p> -->
 				</li>
 				<!-- <li>
 					<div>知识产权维权</div>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/index.html


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/tradingIndex.html