Administrator 4 yıl önce
ebeveyn
işleme
37ee8ee94d
38 değiştirilmiş dosya ile 37 ekleme ve 51 silme
  1. 1 4
      src/main/java/com/goafanti/common/constant/ShiroConstants.java
  2. 0 1
      src/main/java/com/goafanti/common/controller/PublicController.java
  3. 0 1
      src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java
  4. 0 1
      src/main/java/com/goafanti/common/dao/PatentNewMapper.java
  5. 0 1
      src/main/java/com/goafanti/common/dao/PersonnelMidMapper.java
  6. 0 1
      src/main/java/com/goafanti/common/dao/PublicReleaseMapper.java
  7. 0 1
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  8. 0 1
      src/main/java/com/goafanti/common/dao/UserChannelMapper.java
  9. 0 1
      src/main/java/com/goafanti/common/dao/UserTransferLogMapper.java
  10. 0 1
      src/main/java/com/goafanti/common/task/ExpiredUserMemberTask.java
  11. 0 1
      src/main/java/com/goafanti/common/task/OrderReportTask.java
  12. 3 4
      src/main/java/com/goafanti/common/utils/DateUtils.java
  13. 2 0
      src/main/java/com/goafanti/common/utils/DecimalCalculate.java
  14. 0 1
      src/main/java/com/goafanti/common/utils/ExcelUtils.java
  15. 2 1
      src/main/java/com/goafanti/common/utils/excel/Excel.java
  16. 0 2
      src/main/java/com/goafanti/common/utils/excel/ExcelConstant.java
  17. 1 2
      src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java
  18. 0 1
      src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java
  19. 0 1
      src/main/java/com/goafanti/customer/bo/FollowBusinessBo.java
  20. 0 1
      src/main/java/com/goafanti/customer/service/CustomerService.java
  21. 0 1
      src/main/java/com/goafanti/order/bo/OrderListBo.java
  22. 16 0
      src/main/java/com/goafanti/order/bo/Outproject.java
  23. 0 9
      src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java
  24. 0 2
      src/main/java/com/goafanti/order/service/OrderNewService.java
  25. 0 1
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  26. 0 3
      src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java
  27. 1 0
      src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java
  28. 1 0
      src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java
  29. 1 0
      src/main/java/com/goafanti/organization/bo/ThirdPartyError.java
  30. 0 2
      src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java
  31. 0 1
      src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java
  32. 0 1
      src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java
  33. 0 1
      src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java
  34. 0 1
      src/main/java/com/goafanti/personnel/bo/PersonnelContractBo.java
  35. 5 0
      src/main/java/com/goafanti/user/bo/OrgIdentityDetailAdmin.java
  36. 4 0
      src/main/java/com/goafanti/user/bo/OrganizationIndentityUserBo.java
  37. 0 1
      src/main/java/com/goafanti/user/controller/UserChannelApiController.java
  38. 0 1
      src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

+ 1 - 4
src/main/java/com/goafanti/common/constant/ShiroConstants.java

@@ -6,8 +6,5 @@ public class ShiroConstants {
 	public static final String REDIS_SHIRO_SESSION = "goafanti-session:";
 	public static final String REDIS_SHIRO_ALL = "*goafanti-session:*";
 
-	// 0:禁止登录
-	public static final Integer USER_DISABLE = new Integer(0);
-	// 1:有效
-	public static final Integer USER_ENABLE = new Integer(1);
+	
 }

+ 0 - 1
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -43,7 +43,6 @@ import com.goafanti.common.model.User;
 import com.goafanti.common.service.DistrictGlossoryService;
 import com.goafanti.common.service.FieldGlossoryService;
 import com.goafanti.common.service.IndustryCategoryService;
-import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.MobileMessageUtils;

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

@@ -1,7 +1,6 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.OrganizationIdentity;
-import com.goafanti.common.model.OrganizationIdentityExample;
 import com.goafanti.user.bo.AuditorOrgIdentityDetailBo;
 import com.goafanti.user.bo.InputUserChannel;
 import com.goafanti.user.bo.OrgBasicInfoBo;

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

@@ -1,7 +1,6 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.PatentNew;
-import com.goafanti.common.model.PatentNewExample;
 import com.goafanti.common.model.PatentNewLog;
 
 import java.util.List;

+ 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/common/dao/PublicReleaseMapper.java

@@ -1,7 +1,6 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.admin.bo.OutPublicRelease;
-import com.goafanti.admin.bo.OutPublicReleaseList;
 import com.goafanti.common.model.PublicRelease;
 
 public interface PublicReleaseMapper {

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

@@ -2,7 +2,6 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.bo.UserOrderTask;
 import com.goafanti.common.model.TOrderTask;
-import com.goafanti.common.model.TOrderTaskExample;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TOrderTaskListBo;

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

@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Param;
 
 import com.goafanti.common.model.UserChannel;
 import com.goafanti.user.bo.InputUserChannel;
-import com.goafanti.user.bo.OutUserChannel;
 
 public interface UserChannelMapper {
     /**

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

@@ -1,7 +1,6 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.UserTransferLog;
-import com.goafanti.common.model.UserTransferLogExample;
 import com.goafanti.customer.bo.transferListBo;
 import com.goafanti.user.bo.InputUserChannel;
 

+ 0 - 1
src/main/java/com/goafanti/common/task/ExpiredUserMemberTask.java

@@ -2,7 +2,6 @@ package com.goafanti.common.task;
 
 import javax.annotation.Resource;
 
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import com.goafanti.common.utils.LoggerUtils;

+ 0 - 1
src/main/java/com/goafanti/common/task/OrderReportTask.java

@@ -7,7 +7,6 @@ import javax.annotation.Resource;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import com.goafanti.common.utils.LoggerUtils;

+ 3 - 4
src/main/java/com/goafanti/common/utils/DateUtils.java

@@ -7,7 +7,6 @@ import java.util.Date;
 
 
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.PublicRelease;
 
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
@@ -278,7 +277,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 */
 	public static Date getFirstDayOfQuarter(Integer year, Integer quarter) {
 		Calendar calendar = Calendar.getInstance();
-		Integer month = new Integer(0);
+		Integer month = 0;
 		if (quarter == 1) {
 			month = 1 - 1;
 		} else if (quarter == 2) {
@@ -315,7 +314,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 */
 	public static Date getLastDayOfQuarter(Integer year, Integer quarter) {
 		Calendar calendar = Calendar.getInstance();
-		Integer month = new Integer(0);
+		Integer month = 0;
 		if (quarter == 1) {
 			month = 3 - 1;
 		} else if (quarter == 2) {
@@ -352,7 +351,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 */
 	public static Date getLastDayOfLastQuarter(Integer year, Integer quarter) {
 		Calendar calendar = Calendar.getInstance();
-		Integer month = new Integer(0);
+		Integer month = 0;
 		if (quarter == 1) {
 			month = 12 - 1;
 		} else if (quarter == 2) {

+ 2 - 0
src/main/java/com/goafanti/common/utils/DecimalCalculate.java

@@ -75,6 +75,7 @@ public class DecimalCalculate {
 	 *            表示表示需要精确到小数点以后几位。
 	 * @return 两个参数的商
 	 */
+	@SuppressWarnings("deprecation")
 	public static double div(double v1, double v2, int scale) {
 		if (scale < 0) {
 			throw new IllegalArgumentException("The scale must be a positive integer or zero");
@@ -93,6 +94,7 @@ public class DecimalCalculate {
 	 *            小数点后保留几位
 	 * @return 四舍五入后的结果
 	 */
+	@SuppressWarnings("deprecation")
 	public static double round(double v, int scale) {
 		if (scale < 0) {
 			throw new IllegalArgumentException("The scale must be a positive integer or zero");

+ 0 - 1
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -17,7 +17,6 @@ import java.util.regex.Pattern;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.goafanti.customer.bo.CustomerExcelBo;

+ 2 - 1
src/main/java/com/goafanti/common/utils/excel/Excel.java

@@ -60,7 +60,8 @@ public @interface Excel
     /**
      * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
      */
-    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+    @SuppressWarnings("deprecation")
+	public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
 
     /**
      * 导出类型(0数字 1字符串)

+ 0 - 2
src/main/java/com/goafanti/common/utils/excel/ExcelConstant.java

@@ -1,8 +1,6 @@
 package com.goafanti.common.utils.excel;
 
 import com.goafanti.order.enums.LiquidationNewState;
-import com.goafanti.order.enums.NewProjectStatus;
-import com.goafanti.order.enums.OrderNewState;
 
 public class ExcelConstant {
 	

+ 1 - 2
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -48,10 +48,8 @@ import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
 import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.apache.poi.xssf.usermodel.XSSFFont;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -465,6 +463,7 @@ public class NewExcelUtil<T> {
 	/**
 	 * 添加单元格
 	 */
+	@SuppressWarnings("deprecation")
 	public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
 		Cell cell = null;
 		try {

+ 0 - 1
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -16,7 +16,6 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.ContractLogMapper;
 import com.goafanti.common.dao.ContractMapper;
 import com.goafanti.common.dao.CopyrightInfoMapper;
-import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.OrgCognizanceMapper;
 import com.goafanti.common.dao.PatentInfoMapper;
 import com.goafanti.common.dao.TechProjectMapper;

+ 0 - 1
src/main/java/com/goafanti/customer/bo/FollowBusinessBo.java

@@ -1,6 +1,5 @@
 package com.goafanti.customer.bo;
 
-import java.util.Date;
 import java.util.List;
 
 /**

+ 0 - 1
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -29,7 +29,6 @@ import com.goafanti.customer.bo.InputListChannel;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.customer.bo.StatisticBo;
 import com.goafanti.customer.bo.transferListBo;
-import com.goafanti.user.bo.OutUserChannel;
 
 public interface CustomerService {
 	/**

+ 0 - 1
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -3,7 +3,6 @@ package com.goafanti.order.bo;
 import java.math.BigDecimal;
 
 import com.goafanti.common.utils.excel.Excel;
-import com.goafanti.common.utils.excel.Excel.ColumnType;
 
 
 /**

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

@@ -6,4 +6,20 @@ public class Outproject {
 	
 	private String name;
 
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
 }

+ 0 - 9
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -1,18 +1,9 @@
 package com.goafanti.order.controller;
 
-import java.io.IOException;
-import java.io.OutputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

+ 0 - 2
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -1,6 +1,5 @@
 package com.goafanti.order.service;
 
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
@@ -8,7 +7,6 @@ import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 
 
-import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderNewWithBLOBs;

+ 0 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -44,7 +44,6 @@ import com.goafanti.common.model.TOrderRefund;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.SendEmailUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;

+ 0 - 3
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -6,7 +6,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -17,8 +16,6 @@ import com.goafanti.common.dao.TOrderBillNewMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.model.TOrderNew;
-import com.goafanti.common.utils.ExportExcelUtil;
-import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -87,6 +87,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_INVPICE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId(),0);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	public boolean checkAmount(TOrderInvoice t) {
 		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -122,6 +122,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	public int deleteAllReceivables() {
 		return temporaryReceivablesMapper.deleteByaid(TokenManager.getAdminId());
 	}
+	@SuppressWarnings("deprecation")
 	@Override
 	public int batchImport() {
 		List<TemporaryReceivables> list=temporaryReceivablesMapper.selectByaid(TokenManager.getAdminId());

+ 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);
 	}

+ 0 - 2
src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java

@@ -1,10 +1,8 @@
 package com.goafanti.organization.service;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
 
 import com.goafanti.common.model.CompanyLibrary;
 import com.goafanti.common.model.OfficialFeePrice;

+ 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;

+ 0 - 1
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -39,7 +39,6 @@ import com.goafanti.common.model.Role;
 import com.goafanti.common.model.RolePermission;
 import com.goafanti.common.model.RoleResources;
 import com.goafanti.common.model.UserRole;
-import com.goafanti.common.model.UserTransferLog;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;

+ 0 - 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;
 

+ 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 - 1
src/main/java/com/goafanti/user/controller/UserChannelApiController.java

@@ -20,7 +20,6 @@ import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.model.Attachment;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.excel.NewExcelUtil;
-import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.InputUserChannel;
 import com.goafanti.user.bo.OutUserChannel;
 import com.goafanti.user.service.UserChannelService;

+ 0 - 1
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -1,7 +1,6 @@
 package com.goafanti.user.service.impl;
 
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;