anderx před 5 roky
rodič
revize
0cf1478130
21 změnil soubory, kde provedl 44 přidání a 57 odebrání
  1. 0 9
      src/main/java/com/goafanti/admin/controller/AdminSystemController.java
  2. 11 1
      src/main/java/com/goafanti/common/controller/WebpageController.java
  3. 0 1
      src/main/java/com/goafanti/common/dao/PersonnelMidMapper.java
  4. 0 1
      src/main/java/com/goafanti/core/shiro/token/UserRealm.java
  5. 4 0
      src/main/java/com/goafanti/customer/bo/CustomerOrganizationDetailBo.java
  6. 0 9
      src/main/java/com/goafanti/order/bo/Outproject.java
  7. 1 0
      src/main/java/com/goafanti/organization/bo/ThirdPartyError.java
  8. 9 0
      src/main/java/com/goafanti/permission/bo/Navigation.java
  9. 0 1
      src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java
  10. 4 1
      src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java
  11. 0 1
      src/main/java/com/goafanti/personnel/bo/PersonnelContractBo.java
  12. 5 0
      src/main/java/com/goafanti/user/bo/OrgIdentityDetailAdmin.java
  13. 4 0
      src/main/java/com/goafanti/user/bo/OrganizationIndentityUserBo.java
  14. 0 3
      src/main/java/com/goafanti/user/controller/UserApiController.java
  15. 0 9
      src/main/java/com/goafanti/user/controller/UserBasicInfoController.java
  16. 0 5
      src/main/java/com/goafanti/user/controller/UserLoginController.java
  17. 0 3
      src/main/java/com/goafanti/user/service/UserIdentityService.java
  18. 0 2
      src/main/java/com/goafanti/user/service/UserService.java
  19. 0 7
      src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java
  20. 1 1
      src/main/resources/spring/spring-mvc.xml
  21. 5 3
      src/main/webapp/WEB-INF/web.xml

+ 0 - 9
src/main/java/com/goafanti/admin/controller/AdminSystemController.java

@@ -4,19 +4,14 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.bo.InputAdmin;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.enums.AdminFields;
@@ -41,10 +36,6 @@ public class AdminSystemController extends BaseApiController {
 	@RequestMapping(value = "/updateAdminInfo", method = RequestMethod.POST)
 	public Result updateAdminInfo(@Valid InputAdmin admin, String pwd, BindingResult bindingResult) {
 		Result res = new Result();
-		/*if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "超级管理员"));
-			return res;
-		}*/
 
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),

+ 11 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -142,7 +142,8 @@ public class WebpageController extends BaseController {
 	 */
 	@RequestMapping(value = "/", method = RequestMethod.GET)
 	public ModelAndView defaultIndex(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/admin/login");
+//		modelview.setViewName("/admin/login");
+		modelview.setViewName("../dist/index");
 		return modelview; 
 	}
 
@@ -154,4 +155,13 @@ public class WebpageController extends BaseController {
 		return modelview;
 	}
 	
+	@RequestMapping(value = "/index", method = RequestMethod.GET)
+	public ModelAndView ant(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("../dist/index");
+		return modelview;
+	}
+	
+	
+	
+	
 }

+ 0 - 1
src/main/java/com/goafanti/common/dao/PersonnelMidMapper.java

@@ -2,7 +2,6 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.PersonnelMid;
 import com.goafanti.common.model.PersonnelMidExample;
-import com.goafanti.personnel.bo.IntpersonnelWelfareBo;
 
 import java.util.List;
 import org.apache.ibatis.annotations.Param;

+ 0 - 1
src/main/java/com/goafanti/core/shiro/token/UserRealm.java

@@ -17,7 +17,6 @@ import org.apache.shiro.subject.PrincipalCollection;
 import org.apache.shiro.subject.SimplePrincipalCollection;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.alibaba.druid.support.logging.Log;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AftUser;

+ 4 - 0
src/main/java/com/goafanti/customer/bo/CustomerOrganizationDetailBo.java

@@ -3,6 +3,10 @@ package com.goafanti.customer.bo;
 import com.goafanti.common.model.OrganizationIdentity;
 
 public class CustomerOrganizationDetailBo extends OrganizationIdentity{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	private String identifyName;
 	private String societyTag;
 	private String companyLogoUrl;

+ 0 - 9
src/main/java/com/goafanti/order/bo/Outproject.java

@@ -1,9 +0,0 @@
-package com.goafanti.order.bo;
-
-public class Outproject {
-	
-	private String id;
-	
-	private String name;
-
-}

+ 1 - 0
src/main/java/com/goafanti/organization/bo/ThirdPartyError.java

@@ -32,6 +32,7 @@ public enum ThirdPartyError {
 
 	
 
+	@SuppressWarnings("unlikely-arg-type")
 	public static boolean containsType(Integer code) {
 		return status.containsKey(code);
 	}

+ 9 - 0
src/main/java/com/goafanti/permission/bo/Navigation.java

@@ -1,5 +1,7 @@
 package com.goafanti.permission.bo;
 
+import java.util.List;
+
 /**
  * 导航
  * @author Administrator
@@ -9,6 +11,7 @@ public class Navigation {
 	private String id;
 	private String name;
 	private String url;
+	private List<Menu> list;
 	public String getId() {
 		return id;
 	}
@@ -27,4 +30,10 @@ public class Navigation {
 	public void setUrl(String url) {
 		this.url = url;
 	}
+	public List<Menu> getList() {
+		return list;
+	}
+	public void setList(List<Menu> list) {
+		this.list = list;
+	}
 }

+ 0 - 1
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.dao.PermissionMapper;

+ 4 - 1
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -10,7 +10,6 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.commons.beanutils.BeanUtils;
-import org.apache.shiro.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -256,6 +255,10 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 	@Override
 	public List<Navigation> selectNavList(){
 		String aid = TokenManager.hasRole(AFTConstants.SUPERADMIN) ? null : TokenManager.getAdminId();
+		List<Navigation> list=permissionMapper.selectNavList(aid);
+		for (Navigation n : list) {
+			if (n.getId()!=null) n.setList(selectMenuList(n.getId()));
+		}
 		return permissionMapper.selectNavList(aid);
 	}
 

+ 0 - 1
src/main/java/com/goafanti/personnel/bo/PersonnelContractBo.java

@@ -1,6 +1,5 @@
 package com.goafanti.personnel.bo;
 
-import java.util.Date;
 
 import com.goafanti.common.model.PersonnelContract;
 

+ 5 - 0
src/main/java/com/goafanti/user/bo/OrgIdentityDetailAdmin.java

@@ -3,6 +3,11 @@ package com.goafanti.user.bo;
 import com.goafanti.common.model.OrganizationIdentity;
 
 public class OrgIdentityDetailAdmin extends OrganizationIdentity {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
 	private String level;
 	
 	private String ratepayId;

+ 4 - 0
src/main/java/com/goafanti/user/bo/OrganizationIndentityUserBo.java

@@ -3,6 +3,10 @@ package com.goafanti.user.bo;
 import com.goafanti.common.model.OrganizationIdentity;
 
 public class OrganizationIndentityUserBo extends OrganizationIdentity{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	private String ratepayId;
 
 	public String getRatepayId() {

+ 0 - 3
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -20,10 +20,8 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.IdentityAuditStatus;
 import com.goafanti.common.enums.IdentityProcess;
-import com.goafanti.common.enums.OrgHumanResourceFields;
 import com.goafanti.common.enums.OrgProFields;
 import com.goafanti.common.enums.OrganizationIdentityFields;
 import com.goafanti.common.enums.OrganizationTechFields;
@@ -32,7 +30,6 @@ import com.goafanti.common.enums.UserCareerFields;
 import com.goafanti.common.enums.UserEduFields;
 import com.goafanti.common.enums.UserIdentityFields;
 import com.goafanti.common.enums.UserType;
-import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.OrganizationTech;
 import com.goafanti.common.model.User;

+ 0 - 9
src/main/java/com/goafanti/user/controller/UserBasicInfoController.java

@@ -1,12 +1,8 @@
 package com.goafanti.user.controller;
 
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
-import java.util.UUID;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -18,17 +14,12 @@ import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.OrgBasicInfoFields;
-import com.goafanti.common.model.NatureOwnership;
 import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.User;

+ 0 - 5
src/main/java/com/goafanti/user/controller/UserLoginController.java

@@ -1,9 +1,6 @@
 package com.goafanti.user.controller;
 
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
-import java.util.UUID;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -25,8 +22,6 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.MessageConsumer;
-import com.goafanti.common.model.MessageProducer;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.TimeUtils;
 import com.goafanti.common.utils.VerifyCodeUtils;

+ 0 - 3
src/main/java/com/goafanti/user/service/UserIdentityService.java

@@ -1,11 +1,8 @@
 package com.goafanti.user.service;
 
-import java.util.List;
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.model.UserIdentity;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.user.bo.Advertisings;
 import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserIdentityDetailAdminBo;

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

@@ -1,7 +1,6 @@
 package com.goafanti.user.service;
 
 import java.util.List;
-import java.util.Map;
 
 import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -12,7 +11,6 @@ import com.goafanti.user.bo.StarListBo;
 import com.goafanti.user.bo.UserBasicInfo;
 import com.goafanti.user.bo.UserDownLoadBo;
 import com.goafanti.user.bo.UserNames;
-import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.bo.UserPartnerDetailBo;
 
 public interface UserService {

+ 0 - 7
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -8,16 +8,12 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
 
 import com.goafanti.common.bo.Result;
-import com.goafanti.common.bo.fieldGlossoryBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DistrictGlossoryMapper;
 import com.goafanti.common.dao.IndustryCategoryMapper;
@@ -33,11 +29,9 @@ import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.User;
 import com.goafanti.common.model.UserIdentity;
-import com.goafanti.common.utils.LoggerUtils;
 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.Advertisings;
 import com.goafanti.user.bo.AuditorUserIdentityDetailBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserIdentityDetailAdminBo;
@@ -59,7 +53,6 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 	@Autowired
 	IndustryCategoryMapper industryCategoryMapper;
 
-	private static final Logger	logger	= LoggerFactory.getLogger(UserIdentityServiceImpl.class);
 
 	@Override
 	public UserIdentity selectUserIdentityByUserId(String uid) {

+ 1 - 1
src/main/resources/spring/spring-mvc.xml

@@ -55,7 +55,7 @@
 		static resources in the ${webappRoot}/assets directory -->
 	<mvc:resources mapping="/static/images/**" location="/WEB-INF/images/" />
 	<mvc:resources mapping="/static/html/**" location="/WEB-INF/html/" />
-	<mvc:resources mapping="/static/**" location="/WEB-INF/build/" />
+	<mvc:resources mapping="/static/**" location="/WEB-INF/dist/" />
 	<mvc:resources mapping="/favicon.ico" location="/WEB-INF/assets/favicon.ico" />
 	<mvc:resources mapping="/robots.txt" location="/WEB-INF/assets/robots.txt" />
 	

+ 5 - 3
src/main/webapp/WEB-INF/web.xml

@@ -1,6 +1,8 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
+		
 	<display-name>basics</display-name>
 
 	<!-- The definition of the Root Spring Container shared by all Servlets