diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/ManagerApplication.java b/dataCenter-manager/src/main/java/com/mortals/xhx/ManagerApplication.java
index 9c2112e730df1db20e18cb584e0f3bff44b287c9..f697ee6ec27f71bc86bc00d5d78e96d0ce582329 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/ManagerApplication.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/ManagerApplication.java
@@ -6,12 +6,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ImportResource;
-//import springfox.documentation.swagger2.annotations.EnableSwagger2;
-@EnableFeignClients
@SpringBootApplication(scanBasePackages = {"com.mortals"})
@ServletComponentScan("com.mortals")
@ImportResource(locations = {"classpath:config/spring-config.xml"})
+@EnableFeignClients
public class ManagerApplication extends BaseWebApplication {
public static void main(String[] args) {
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/base/system/area/web/AreaController.java b/dataCenter-manager/src/main/java/com/mortals/xhx/base/system/area/web/AreaController.java
index 1fa0a1d5c5633945f116490c4a6af286d9f3ea05..59af9bd7ded891d7c4400c8f56a54dce7a8de5c9 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/base/system/area/web/AreaController.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/base/system/area/web/AreaController.java
@@ -73,6 +73,7 @@ public class AreaController extends BaseCRUDJsonMappingController<AreaService, A
if(StringUtils.isEmpty(form.getQuery().getName())){
form.getQuery().setLevel(AreaLevelEnum.PROVINCE.getValue());
}
+ form.getPageInfo().setPrePageResult(999);
return super.list(request, response, form);
}catch(Exception e){
log.error("鏌ヨ鍖哄煙淇℃伅鍒楄〃閿欒",e);
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java b/dataCenter-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java
index b16fc6d02789c9c4499311382f40b6fc8f09a104..78cb4ef4de3029a340d418bbdc887bb629946eea 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java
@@ -6,9 +6,11 @@ import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.code.UploadFileType;
+import com.mortals.xhx.tools.uid.ISeqGeneratorService;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -32,6 +34,9 @@ public class UploadServiceImpl implements UploadService {
@Value("${upload.path}")
private String filePath;
+ @Autowired
+ private ISeqGeneratorService seqGeneratorService;
+
@Override
public String saveFileUpload(MultipartFile tempFile, String prePath, IUser user) {
if (tempFile == null || tempFile.getSize() == 0) {
@@ -54,7 +59,10 @@ public class UploadServiceImpl implements UploadService {
if (!pathDir.exists()) {
pathDir.mkdirs();
}
- String newName = System.currentTimeMillis() + "." + extension;
+ //閲囩敤鍒嗗竷寮廼d浣滀负鏂囦欢鍚�
+ String newName = seqGeneratorService.nextOrderId(1020) + "." + extension;
+ //搴熷純
+// String newName = System.currentTimeMillis() + "." + extension;
String filePathAll = filePath + newName;
File uploadFile = new File(filePathAll);
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/common/utils/DateByAffairUtils.java b/dataCenter-manager/src/main/java/com/mortals/xhx/common/utils/DateByAffairUtils.java
index 483dfa552aa1dd3504dbf10f4d9b97a0fdd023a0..b810978de6495b31074e91dca9b62bc436a967f3 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/common/utils/DateByAffairUtils.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/common/utils/DateByAffairUtils.java
@@ -10,7 +10,7 @@ import java.util.Date;
import java.util.Random;
/**
- * @author Wz
+ * @author liaoxin
* @Date: 2021-08-2021/8/2-10:01
* @Description:
*/
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/data/web/DataAreaController.java b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/data/web/DataAreaController.java
index 8eef89bf44a617522f53f92de0d99fd38e58b514..ca0719829a6d9ea6e59a4fe754b16b6cf1643468 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/data/web/DataAreaController.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/data/web/DataAreaController.java
@@ -10,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import com.mortals.framework.web.BaseCRUDJsonMappingController;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -40,4 +42,9 @@ public class DataAreaController extends BaseCRUDJsonMappingController<DataAreaSe
return cityList;
}
+ @Override
+ public String list(HttpServletRequest request, HttpServletResponse response, DataAreaForm form) {
+ form.getPageInfo().setPrePageResult(999);
+ return super.list(request, response, form);
+ }
}
\ No newline at end of file
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ApplyAndAcceptInformationTaskImpl.java b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ApplyAndAcceptInformationTaskImpl.java
index eb8dff36f384c607772dbe25791b96d26a89f55c..b9143e5d642daaf32cd1cba0a904003aae8bad84 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ApplyAndAcceptInformationTaskImpl.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ApplyAndAcceptInformationTaskImpl.java
@@ -29,7 +29,7 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
- * @author Wz
+ * @author liaoxin
* @Date: 2021-08-2021/8/3-16:28
* @Description:鍔炰欢鏁版嵁鎺ㄩ€佺渷涓€浣撳寲骞冲彴(鐢宠骞跺彈鐞�)
*/
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/CreateTableTaskImpl.java b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/CreateTableTaskImpl.java
index 88c48ca295df6aa9ba7e4d5386b7de0275e8a5a2..d959373511c3a6392e514a4a15ba0d898342c7e7 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/CreateTableTaskImpl.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/CreateTableTaskImpl.java
@@ -17,7 +17,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
/**
- * @author Wz
+ * @author liaoxin
* @Date: 2021-08-2021/8/4-16:19
* @Description:
*/
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/DecideInformationTaskImpl.java b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/DecideInformationTaskImpl.java
index d169c3ce0d6b6062691d81540de422f2f10541b0..1ab20da85e86b0d90e55a464c968bd2a41ffafbb 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/DecideInformationTaskImpl.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/DecideInformationTaskImpl.java
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
- * @author Wz
+ * @author liaoxin
* @Date: 2021-08-2021/8/3-16:28
* @Description:鍔炰欢鏁版嵁鎺ㄩ€佺渷涓€浣撳寲骞冲彴锛堝喅瀹氾級
*/
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ReviewInformationTaskImpl.java b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ReviewInformationTaskImpl.java
index d2df69b78acba7e0e7c6d0758e6a4a59b08303d1..ce8c1e0975e32db37bb9bc57a71fd4ba136aff35 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ReviewInformationTaskImpl.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/task/ReviewInformationTaskImpl.java
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
- * @author Wz
+ * @author liaoxin
* @Date: 2021-08-2021/8/3-16:28
* @Description:鍔炰欢鏁版嵁鎺ㄩ€佺渷涓€浣撳寲骞冲彴锛堝鏌ワ級
*/
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/web/InformationController.java b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/web/InformationController.java
index 3199dbb0ec2f4f0d1fd07bf9ba6fc11c0c7e2a93..b086aafb531298d62c187d289c37de1f327a9332 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/web/InformationController.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/information/web/InformationController.java
@@ -7,8 +7,10 @@ import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonController;
import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.feign.ElasticsearchClient;
import com.mortals.xhx.modules.information.model.InformationEntity;
import com.mortals.xhx.modules.information.service.InformationService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject;
@@ -27,6 +29,9 @@ import java.util.Map;
@RequestMapping("/information")
public class InformationController extends BaseCRUDJsonController<InformationService, InformationForm, InformationEntity,Long> {
+ @Autowired
+ private ElasticsearchClient elasticsearchClient;
+
public InformationController(){
super.setFormClass(InformationForm.class);
@@ -47,7 +52,10 @@ public class InformationController extends BaseCRUDJsonController<InformationSer
@PostMapping(value="list")
public String list(HttpServletRequest request, HttpServletResponse response, InformationForm form) {
try{
- return super.list(request, response, form);
+ //鏁版嵁閲忚繃澶ф椂锛屾煡璇㈡晥鐜囦綆涓�
+// return super.list(request, response, form);
+ //璋冪敤es鏌ヨ鎺ュ彛(鐩墠鍒嗛〉鏂瑰紡涓烘祬鍒嗛〉锛屽垎椤甸噺瓒呰繃1W鏉℃椂锛屽缓璁娇鐢ㄦ繁鍒嗛〉锛屼絾娣卞垎椤典笉鏀寔璺抽〉鏌ヨ)
+ return elasticsearchClient.queryEla(form.getPageInfo().getCurrPage(),form.getPageInfo().getPrePageResult()).toString();
}catch(Exception e){
log.error("鏌ヨ鍔炰欢淇℃伅鍒楄〃閿欒",e);
JSONObject ret = new JSONObject();
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/service/QueryInformationServiceImpl.java b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/service/QueryInformationServiceImpl.java
index 5add6131a5140f455ba9bbd41168fc71cf936728..8862833df68fc764d7691020c6adde6b90264e28 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/service/QueryInformationServiceImpl.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/service/QueryInformationServiceImpl.java
@@ -3,6 +3,7 @@ package com.mortals.xhx.modules.service;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.common.code.MenuLinkType;
import com.mortals.xhx.common.utils.DateByAffairUtils;
import com.mortals.xhx.modules.information.model.InformationEntity;
import com.mortals.xhx.modules.information.model.InformationQuery;
@@ -79,4 +80,7 @@ public class QueryInformationServiceImpl {
//琛ㄧず涓婁釜鏈堝凡鍏ㄩ儴澶勭悊瀹�
return informationService.find(informationQuery, pageInfo, null).getList();
}
+
+
+
}
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/listener/InformationDataConversionListener.java b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/listener/InformationDataConversionListener.java
index cfb63b52a72b6300b21d59d4e4b6ab8f0e2e583f..129b137b586fa4f05c829c57aad49b20d6925bdc 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/listener/InformationDataConversionListener.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/listener/InformationDataConversionListener.java
@@ -18,7 +18,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
/**
- * @author Wz
+ * @author liaoxin
* @Date: 2021-07-2021/7/30-15:06
* @Description:
*/
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/task/SupplementTaskImpl.java b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/task/SupplementTaskImpl.java
index 119220f4f3a53e1011d49209a3c10b147587c742..303ddd210057e135b277e93a4a49b1a8ac3dfc58 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/task/SupplementTaskImpl.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/modules/supplement/task/SupplementTaskImpl.java
@@ -29,7 +29,7 @@ import java.util.List;
import java.util.stream.Collectors;
/**
- * @author Wz
+ * @author liaoxin
* @Date: 2021-08-2021/8/2-10:44
* @Description:鏁版嵁娓呮礂
*/
@@ -170,12 +170,12 @@ public class SupplementTaskImpl implements ITaskExcuteService {
}
private List<SupplementEntity> queryDataThatHasNotBeenPushed(String excuteParam) {
- List<SupplementEntity> supplementEntities = new ArrayList<>();
+ List<SupplementEntity> supplementEntities;
SupplementQuery supplementQuery = new SupplementQuery();
supplementQuery.setIsExecute("0");
supplementQuery.setIsSuccess("0");
PageInfo pageInfo = new PageInfo();
- pageInfo.setPrePageResult(Integer.valueOf(excuteParam));
+ pageInfo.setPrePageResult(Integer.parseInt(excuteParam));
//TODO锛� 鏉℃暟闄愬埗
//鏈湀绗竴澶�
String theFirstDayOfTheMonth = new SimpleDateFormat("yyyy-MM-dd").format(DateByAffairUtils.getMonthFirstDate(new Date()));
@@ -215,8 +215,7 @@ public class SupplementTaskImpl implements ITaskExcuteService {
//鑾峰彇褰撳墠鏃堕棿
supplementQuery.setCreateDateEnd(
DateUtils.convertTime2Str(new Date().getTime(), DateUtils.P_yyyy_MM_dd_HH_mm_ss));
- List<SupplementEntity> list = supplementService.find(supplementQuery, pageInfo,null).getList();
- return list;
+ return supplementService.find(supplementQuery, pageInfo,null).getList();
}
}
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/test0002/teeee.java b/dataCenter-manager/src/main/java/com/mortals/xhx/test0002/teeee.java
index fc51568db598f55cab57afe0d91db47de35ed717..771904f877aa4bf0a807c69d2921ddae31b6a5e0 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/test0002/teeee.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/test0002/teeee.java
@@ -13,7 +13,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * @author Wz
+ * @author liaoxin
* @Date: 2021-08-2021/8/6-14:10
* @Description:
*/
diff --git a/dataCenter-manager/src/main/java/com/mortals/xhx/test0002/testModel.java b/dataCenter-manager/src/main/java/com/mortals/xhx/test0002/testModel.java
index e3863283b44c70cbfad45d303afdb8febecbc5e5..cb2f099d24192b79e64489906e70aa6f37b20f04 100644
--- a/dataCenter-manager/src/main/java/com/mortals/xhx/test0002/testModel.java
+++ b/dataCenter-manager/src/main/java/com/mortals/xhx/test0002/testModel.java
@@ -3,7 +3,7 @@ package com.mortals.xhx.test0002;
import lombok.Data;
/**
- * @author Wz
+ * @author liaoxin
* @Date: 2021-08-2021/8/6-15:16
* @Description:
*/