删除pom中的feilong

pom.xml

@@ -227,11 +227,11 @@
             <artifactId>hutool</artifactId>
             <version>${hutool.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.feilong.platform</groupId>
-            <artifactId>feilong-core</artifactId>
-            <version>${feilong-platform.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.feilong.platform</groupId>-->
+<!--            <artifactId>feilong-core</artifactId>-->
+<!--            <version>${feilong-platform.version}</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
@@ -428,4 +428,19 @@
 
     </build>
 
+    <distributionManagement>
+        <repository>
+            <!--这里的id与settings.xml中的servers节点配置的用户ID一直，这样才能使用配置的用户去上传到maven私有仓库 -->
+            <!--此仓库对应的为RELEASE版本的jar-->
+            <id>public</id>
+            <url>http://221.224.91.21:9019/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <!--这里的id与settings.xml中的servers节点配置的用户ID一直，这样才能使用配置的用户去上传到maven私有仓库 -->
+            <!--此仓库对应的为SNAPSHOT版本的jar-->
+            <id>public</id>
+            <url>http://221.224.91.21:9019/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
 </project>

src/main/java/platform/modules/carrier/service/RentalProjectService.java

@@ -1,6 +1,5 @@
 package platform.modules.carrier.service;
 
-import com.feilong.core.util.CollectionsUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/platform/modules/company/service/CompanyBrdinvestmentService.java

@@ -3,6 +3,7 @@ package platform.modules.company.service;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 import platform.common.base.service.BaseService;
+import platform.common.util.DateUtil;
 import platform.modules.company.entity.CompanyBrdinvestment;
 import tk.mybatis.mapper.entity.Example;
 
@@ -19,7 +20,7 @@ public class CompanyBrdinvestmentService extends BaseService<CompanyBrdinvestmen
      */
     public List<CompanyBrdinvestment> findByCid(Integer companyId) {
 
-        int year = com.feilong.core.date.DateUtil.getYear(new Date());
+        int year = Integer.parseInt(DateUtil.getCurrentDateString("yyyy"));
         //新数据
         List<CompanyBrdinvestment> brdinvestments = new ArrayList<>();
         for (int i = 1; i <= 3; i++) {

src/main/java/platform/modules/company/service/ProjectApplicationService.java

@@ -280,7 +280,7 @@ public class ProjectApplicationService extends BaseService<ProjectApplication> {
             return infos;
         } else {
             List<ProjectApplicationOperationsInfo> operationsInfo = new ArrayList<ProjectApplicationOperationsInfo>();
-            int year = com.feilong.core.date.DateUtil.getYear(new Date());
+            int year = Integer.parseInt(DateUtil.getCurrentDateString("yyyy"));
             for (int i = 1; i <= 3; i++) {
                 int dataYear = year - i;
                 ProjectApplicationOperationsInfo info = new ProjectApplicationOperationsInfo();
@@ -576,7 +576,7 @@ public class ProjectApplicationService extends BaseService<ProjectApplication> {
         List<ProjectApplicationOperationsInfo> operationsInfo = apply.getOperationsInfo();
         for (ProjectApplicationOperationsInfo info : operationsInfo) {
             if (null != info.getOperation_income()) {
-                CompanyOprationsInfo preInfo = companyOprationsInfoService.findCompanyOprationsByCidAndYear(companyInfo.getCompany_id(), String.valueOf(com.feilong.core.date.DateUtil.getYear(new Date())), Constant.DictionaryType.PROJECT_APPLICATION);
+                CompanyOprationsInfo preInfo = companyOprationsInfoService.findCompanyOprationsByCidAndYear(companyInfo.getCompany_id(), DateUtil.getCurrentDateString("yyyy"), Constant.DictionaryType.PROJECT_APPLICATION);
                 if (null != preInfo) {
                     preInfo.setOperation_income(Double.parseDouble(info.getOperation_income()));
                     companyOprationsInfoService.updateSelective(preInfo);

src/main/java/platform/modules/company/service/ProjectIntelligentService.java

@@ -438,7 +438,7 @@ public class ProjectIntelligentService extends BaseService<ProjectIntelligent> {
             return infos;
         } else {
             List<ProjectApplicationOperationsInfo> operationsInfo = new ArrayList<ProjectApplicationOperationsInfo>();
-            int year = com.feilong.core.date.DateUtil.getYear(new Date());
+            int year = Integer.parseInt(DateUtil.getCurrentDateString("yyyy"));
             for (int i = 1; i <= 3; i++) {
                 int dataYear = year - i;
                 ProjectApplicationOperationsInfo info = new ProjectApplicationOperationsInfo();
@@ -504,7 +504,7 @@ public class ProjectIntelligentService extends BaseService<ProjectIntelligent> {
         if (!CollectionUtils.isEmpty(operationsInfo)) {
             for (ProjectApplicationOperationsInfo info : operationsInfo) {
                 if (null != info.getOperation_income()) {
-                    CompanyOprationsInfo preInfo = companyOprationsInfoService.findCompanyOprationsByCidAndYear(companyInfo.getCompany_id(), String.valueOf(com.feilong.core.date.DateUtil.getYear(new Date())), Constant.DictionaryType.PROJECT_INTELLIGENT);
+                    CompanyOprationsInfo preInfo = companyOprationsInfoService.findCompanyOprationsByCidAndYear(companyInfo.getCompany_id(), DateUtil.getCurrentDateString("yyyy"), Constant.DictionaryType.PROJECT_INTELLIGENT);
                     if (null != preInfo) {
                         preInfo.setOperation_income(Double.parseDouble(info.getOperation_income()));
                         companyOprationsInfoService.updateSelective(preInfo);

src/main/java/platform/modules/company/service/ProjectMattersService.java

@@ -741,7 +741,7 @@ public class ProjectMattersService extends BaseService<ProjectMatters> {
             return infos;
         } else {
             List<ProjectApplicationOperationsInfo> operationsInfo = new ArrayList<ProjectApplicationOperationsInfo>();
-            int year = com.feilong.core.date.DateUtil.getYear(new Date());
+            int year = Integer.parseInt(DateUtil.getCurrentDateString("yyyy"));
             for (int i = 1; i <= 3; i++) {
                 int dataYear = year - i;
                 ProjectApplicationOperationsInfo info = new ProjectApplicationOperationsInfo();

src/main/java/platform/modules/company/service/ProjectProvincesService.java

@@ -624,7 +624,7 @@ public class ProjectProvincesService extends BaseService<ProjectProvinces> {
         List<ProjectApplicationOperationsInfo> operationsInfo = apply.getOperationsInfo();
         for (ProjectApplicationOperationsInfo info : operationsInfo) {
             if (null != info.getOperation_income()) {
-                CompanyOprationsInfo preInfo = companyOprationsInfoService.findCompanyOprationsByCidAndYear(companyInfo.getCompany_id(), String.valueOf(com.feilong.core.date.DateUtil.getYear(new Date())), Constant.DictionaryType.PROJECT_PROVINCES);
+                CompanyOprationsInfo preInfo = companyOprationsInfoService.findCompanyOprationsByCidAndYear(companyInfo.getCompany_id(), DateUtil.getCurrentDateString("yyyy"), Constant.DictionaryType.PROJECT_PROVINCES);
                 if (null != preInfo) {
                     preInfo.setOperation_income(Double.parseDouble(info.getOperation_income()));
                     companyOprationsInfoService.updateSelective(preInfo);
@@ -682,7 +682,7 @@ public class ProjectProvincesService extends BaseService<ProjectProvinces> {
             return infos;
         } else {
             List<ProjectApplicationOperationsInfo> operationsInfo = new ArrayList<ProjectApplicationOperationsInfo>();
-            int year = com.feilong.core.date.DateUtil.getYear(new Date());
+            int year = Integer.parseInt(DateUtil.getCurrentDateString("yyyy"));
             for (int i = 1; i <= 3; i++) {
                 int dataYear = year - i;
                 ProjectApplicationOperationsInfo info = new ProjectApplicationOperationsInfo();

src/main/java/platform/modules/government/service/PolicyExaminationService.java

@@ -15,6 +15,7 @@ import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import platform.common.base.service.BaseService;
+import platform.common.util.DateUtil;
 import platform.common.util.HttpClientUtil;
 import platform.modules.build.entity.Company;
 import platform.modules.build.service.CompanyService;
@@ -304,7 +305,7 @@ public class PolicyExaminationService extends BaseService<CompanyPolicy>{
 
         //近三年经营数据
         List<CompanyBrdinvestment> brdinvestmentList = companyPolicy.getCompanyBrdinvestments();
-        int year = com.feilong.core.date.DateUtil.getYear(new Date());
+        int year = Integer.parseInt(DateUtil.getCurrentDateString("yyyy"));
         for (CompanyBrdinvestment brdinvestment : brdinvestmentList){
             if (brdinvestment.getYear() == year-1){
                 companyPolicyDto.setA36(brdinvestment.getTotalsales().intValue());//近三年销售额2017年