小程序列表、单位总览修改

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/dto/InspectionDetectionInfoModelForWX.java

@@ -18,5 +18,5 @@ public class InspectionDetectionInfoModelForWX {
     private String inspectConclusion;
 
     @ApiModelProperty(value = "下次检验日期")
-    private Date nextInspectDate;
+    private String nextInspectDate;
 }

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/entity/InspectionDetectionInfo.java

@@ -63,7 +63,7 @@ public class InspectionDetectionInfo extends AbstractEquipBaseEntity {
 	 *      */
 
 	@TableField(value ="\"INSPECT_DATE\"")
-	private Date inspectDate;
+	private String inspectDate;
 	/**
 	 *  	 * 检验结论
 	 *      */

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAppService.java

@@ -59,6 +59,7 @@ import com.yeejoin.amos.boot.module.app.api.entity.ProduceInfo;
 import com.yeejoin.amos.boot.module.app.api.entity.ProtectionDevices;
 import com.yeejoin.amos.boot.module.app.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.app.api.entity.UseInfo;
+import com.yeejoin.amos.boot.module.app.api.enums.EquipmentCategoryEnum;
 import com.yeejoin.amos.boot.module.app.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.app.api.mapper.CategoryOtherInfoMapper;
 import com.yeejoin.amos.boot.module.app.api.mapper.EquipmentCategoryMapper;
@@ -68,8 +69,10 @@ import com.yeejoin.amos.boot.module.app.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.app.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.app.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
@@ -81,6 +84,16 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -91,6 +104,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.crypto.Cipher;
@@ -180,6 +194,9 @@ public class TzsAppService {
 	private Resource equipCategory;
 
 	@Autowired
+	RestHighLevelClient restHighLevelClient;
+
+	@Autowired
 	private RedisUtil redisUtil;
 
 	private static final String STREET = "STREET";
@@ -707,18 +724,54 @@ public class TzsAppService {
 		Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
 		List<Map<String, Object>> mapList = resourceJson.get(EquipmentClassifityEnum.BDLS.getCode());
 		List<Map<String, Object>> list = new ArrayList<>();
-		List<Map<String, Object>> listMap = equipmentCategoryMapper.getCategoryCount(companyCode);
-		for (Map<String, Object> map : mapList) {
-			for (Map<String, Object> map1 : listMap) {
-				if (map.get("code").equals(map1.get("category"))) {
-					map.put("waitClaim", map1.get("waitClaim"));
-					map.put("alreadyClaim", map1.get("alreadyClaim"));
-					map.put("refuseClaim", map1.get("refuseClaim"));
-					Long sum = Long.valueOf(map1.get("waitClaim").toString()) + Long.valueOf(map1.get("alreadyClaim").toString()) + Long.valueOf(map1.get("refuseClaim").toString());
-					map.put("sum", sum);
+		SearchSourceBuilder builder = new SearchSourceBuilder();
+		builder.trackTotalHits(true);
+		SearchRequest request = new SearchRequest();
+		request.indices("idx_biz_view_jg_all");
+		BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+
+		BoolQueryBuilder query = QueryBuilders.boolQuery();
+		query.must(QueryBuilders.matchPhraseQuery("USE_UNIT_CREDIT_CODE", companyCode));
+		boolMust.must(query);
+
+		TermsAggregationBuilder field1Aggregation = AggregationBuilders
+				.terms("group_by_code")
+				.field("EQU_LIST_CODE")
+				.size(1000);
+
+		TermsAggregationBuilder field2Aggregation = AggregationBuilders
+				.terms("group_by_status")
+				.field("STATUS")
+				.size(1000);
+		builder.query(boolMust);
+		field1Aggregation.subAggregation(field2Aggregation);
+		builder.aggregation(field1Aggregation);
+		builder.size(0);
+		request.source(builder);
+		Map<String, Object> statusCountMap = new HashMap<>();
+		try {
+			SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+			Terms field1Terms = response.getAggregations().get("group_by_code");
+			for (Terms.Bucket field1Bucket : field1Terms.getBuckets()) {
+				Terms field2Terms = field1Bucket.getAggregations().get("group_by_status");
+				for (Terms.Bucket field2Bucket : field2Terms.getBuckets()) {
+					String field1Value = field1Bucket.getKeyAsString();
+					String field2Value = EquipmentCategoryEnum.YRL.getName().equals(field2Bucket.getKeyAsString()) ? "alreadyClaim" :
+							EquipmentCategoryEnum.DRL.getName().equals(field2Bucket.getKeyAsString()) ? "waitClaim" :
+									EquipmentCategoryEnum.YJL.getName().equals(field2Bucket.getKeyAsString()) ? "refuseClaim" : "caogao";
+					long docCount = field2Bucket.getDocCount();
+					statusCountMap.put(field1Value + "|" + field2Value, docCount);
 				}
 			}
-			list.add(map);
+		} catch (IOException e) {
+			throw new BadRequest("es数据查询失败");
+		}
+		for (Map<String, Object> item : mapList) {
+			item.put("waitClaim", getCountNumber(item.get("code").toString(), "waitClaim", statusCountMap));
+			item.put("alreadyClaim", getCountNumber(item.get("code").toString(), "alreadyClaim", statusCountMap));
+			item.put("refuseClaim", getCountNumber(item.get("code").toString(), "refuseClaim", statusCountMap));
+			item.put("sum", Long.parseLong(item.get("waitClaim").toString()) + Long.parseLong(item.get("alreadyClaim").toString()) + Long.parseLong(item.get("refuseClaim").toString()));
+			list.add(item);
 		}
 		page.setCurrent(1);
 		page.setTotal(list.size());
@@ -726,6 +779,11 @@ public class TzsAppService {
 		return page;
 	}
 
+	private Long getCountNumber(String type, String status, Map<String, Object> statusCountMap) {
+		String key = type + "|" + status;
+		return Long.parseLong(statusCountMap.getOrDefault(key, "0").toString());
+	}
+
 	public Page<Map<String, Object>> getTable(Map<String, Object> map) {
 		Page<Map<String, Object>> table = null;
 		String teqy = (String) map.get("teqy");