Merge branch 'develop_tzs_register' of…

amos-boot-data/amos-boot-data-openapi/pom.xml

@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-			<version>3.1.0</version>
+			<version>3.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SyncCylinderDataService.java

@@ -32,6 +32,7 @@ import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderUnitMapper;
 import java.util.List;
 
 @Component
+@DS("tzs")
 public class SyncCylinderDataService
 {
   /**

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingCheckService.java

@@ -4,6 +4,7 @@ package com.yeejoin.amos.api.openapi.face.service;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderFillingCheckDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderFillingDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,8 @@ public class TmCylinderFillingCheckService extends BaseService<TmCylinderFilling
     private RedisTemplate redisTemplate;
 	@Autowired
 	private SyncCylinderDataService syncCylinderDataService;
-    @Transactional(rollbackFor= {Exception.class})
+
+	@DSTransactional
 	public String createCylinderFillingAfter(List<TmCylinderFillingCheckModel> model) {
 		// TODO Auto-generated method stub
 //		if (ValidationUtil.isEmpty(model))

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingExamineService.java

@@ -4,6 +4,7 @@ package com.yeejoin.amos.api.openapi.face.service;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.yeejoin.amos.api.openapi.face.model.TmCylinderUnitModel;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderFillingExamineDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto;
@@ -42,7 +43,7 @@ public class TmCylinderFillingExamineService extends BaseService<TmCylinderFilli
 	private SyncCylinderDataService syncCylinderDataService;
 
 
-    @Transactional(rollbackFor= {Exception.class})
+	@DSTransactional
 	public String createCylinderFillingExamine(List<TmCylinderFillingExamineModel> model) {
 		// TODO Auto-generated method stub
 		if (ValidationUtil.isEmpty(model))

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingRecordService.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderFillingRecordRepository;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
@@ -55,7 +56,7 @@ public class TmCylinderFillingRecordService extends BaseService<TmCylinderFillin
 	@Autowired
 	private SyncCylinderDataService syncCylinderDataService;
 
-    @Transactional(rollbackFor= {Exception.class})
+	@DSTransactional
 	public String createCylinderFilling(List<TmCylinderFillingRecordModel> model) {
 		// TODO Auto-generated method stub
 //		if (ValidationUtil.isEmpty(model))
@@ -73,6 +74,7 @@ public class TmCylinderFillingRecordService extends BaseService<TmCylinderFillin
 		return "OK";
 	}
 
+	@DS("tzs")
 	private void syncCylinderFilling(List<TmCylinderFillingRecordModel> model) {
 		syncCylinderDataService.syncCylinderFillingRecord(model);
 	}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingService.java

@@ -4,6 +4,7 @@ package com.yeejoin.amos.api.openapi.face.service;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.yeejoin.amos.api.openapi.face.model.TmCylinderUnitModel;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderFillingDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInfoDto;
@@ -40,7 +41,7 @@ public class TmCylinderFillingService extends BaseService<TmCylinderFillingModel
 	@Autowired
 	private SyncCylinderDataService syncCylinderDataService;
 
-    @Transactional(rollbackFor= {Exception.class})
+    @DSTransactional
 	public String createCylinderFillingBefore(List<TmCylinderFillingModel> model) {
 		// TODO Auto-generated method stub
 //		if (ValidationUtil.isEmpty(model))

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderInfoService.java

@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.api.openapi.face.model.TmCylinderUnitModel;
 import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderInfoRepository;
@@ -58,7 +59,7 @@ public class TmCylinderInfoService extends BaseService<TmCylinderInfoModel, TmCy
 	@Autowired
 	ESCylinderInfoRepository esCylinderInfoRepository;
 
-    @Transactional(rollbackFor= {Exception.class})
+	@DSTransactional
 	public String createCylinderInfo(List<TmCylinderInfoModel> model) {
 		// TODO Auto-generated method stub
 		if (ValidationUtil.isEmpty(model))

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderInspectionService.java

@@ -4,6 +4,7 @@ package com.yeejoin.amos.api.openapi.face.service;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInspectionDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +40,8 @@ public class TmCylinderInspectionService extends BaseService<TmCylinderInspectio
     private RedisTemplate redisTemplate;
 	@Autowired
 	private SyncCylinderDataService syncCylinderDataService;
-    @Transactional(rollbackFor= {Exception.class})
+
+	@DSTransactional
 	public String createCylinderInspection(List<TmCylinderInspectionModel> model) {
 		if (ValidationUtil.isEmpty(model))
 			throw new BadRequest("气瓶检验信息为空.");

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderTagsService.java

@@ -4,6 +4,7 @@ package com.yeejoin.amos.api.openapi.face.service;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInspectionDto;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderTagsDto;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +41,7 @@ public class TmCylinderTagsService extends BaseService<TmCylinderTagsModel, TmCy
 	@Autowired
 	private SyncCylinderDataService syncCylinderDataService;
 
-    @Transactional(rollbackFor= {Exception.class})
+	@DSTransactional
 	public String createCylinderTag(List<TmCylinderTagsModel> model) {
 		// TODO Auto-generated method stub
 		if (ValidationUtil.isEmpty(model))

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderUnitService.java

@@ -4,6 +4,7 @@ package com.yeejoin.amos.api.openapi.face.service;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
@@ -39,7 +40,8 @@ public class TmCylinderUnitService extends BaseService<TmCylinderUnitModel, TmCy
     private RedisTemplate redisTemplate;
 	@Autowired
 	private SyncCylinderDataService syncCylinderDataService;
-	@Transactional(rollbackFor= {Exception.class})
+
+	@DSTransactional
 	public String createCylinderUnit(List<TmCylinderUnitModel> model) {
 		if (ValidationUtil.isEmpty(model))
 			throw new BadRequest("气瓶企业信息数据为空.");

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/mapper/CylCylinderFillingCheckMapper.java

@@ -34,7 +34,7 @@ public interface CylCylinderFillingCheckMapper extends BaseMapper<CylinderFillin
 
     boolean updataSyncFilling(@Param("ids") List<Long> appIds);
 
-    boolean saveAndBatchInsert(@Param("list") List<CylinderFilling> list);
+    void saveAndBatchInsert(@Param("list") List<CylinderFilling> list);
 
     Long selectCountTotal();
 

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/api/mapper/CylinderUnitMapper.java

@@ -56,6 +56,7 @@ public interface CylinderUnitMapper extends BaseMapper<CylinderUnit> {
      * @return list
      */
     List<CityCylinderInfoDto> getCylinderDataByLevel(@Param("level") String level);
+
     void saveOrUpdateBatch(@Param("list") List<CylinderUnit> list);
 
 

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/resources/mapper/CylCylinderFillingCheckMapper.xml

@@ -141,10 +141,8 @@
 
             LIMIT 1000
     </select>
-    <insert id="saveAndBatchInsert">
-        INSERT INTO "tz_cylinder_filling"
-             (
-        sequence_nbr,
+    <insert id="saveAndBatchInsert" parameterType="com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderFillingRecord">
+        INSERT INTO tz_cylinder_filling( sequence_nbr,
         filling_before_id,
         filling_unit_name,
         sequence_code,

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/controller/CylinderInfoController.java

@@ -1361,7 +1361,7 @@ public class CylinderInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "市级为维度，各市的充装次数和累计充装量")
 	@GetMapping(value = "/countFillingTimesAndQuantityByCity")
-	public ResponseModel<Object> countFillingTimesAndQuantityByCity() {
+	public ResponseModel<Map<String, Object>> countFillingTimesAndQuantityByCity() {
 		return ResponseHelper.buildResponse(cylinderInfoServiceImpl.countFillingTimesAndQuantityByCity());
 	}
 }

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -1260,66 +1260,120 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
 
 
 
-    public List<Map<String, Object>> countFillingTimesAndQuantityByCity() {
+    public Map<String, Object> countFillingTimesAndQuantityByCity() {
         // 查询所有的市级城市
         List<RegionModel> regionModelList = Systemctl.regionClient.queryByLevel("2").getResult();
         // 并行处理每个城市的数据
         List<CompletableFuture<Map<String, Object>>> futures = regionModelList.stream()
                 .map(regionModel -> CompletableFuture.supplyAsync(() -> esQuery(regionModel)))
                 .collect(Collectors.toList());
-        return futures.stream()
+        List<Map<String, Object>> collect = futures.stream()
                 .map(CompletableFuture::join)
                 .collect(Collectors.toList());
+        return assemblingHistogramData(collect);
+        // Map<String, Object> stringObjectMap = esQuery(regionModelList.get(3));
+        // ArrayList<Map<String, Object>> ss = new ArrayList<>();
+        // ss.add(stringObjectMap);
+        // return assemblingHistogramData(ss);
+    }
+
+    private static Map<String, Object> assemblingHistogramData(List<Map<String, Object>> collect) {
+        // 组装数据
+        // {
+        //     "seriesData": [
+        //         {
+        //             "data": [
+        //                 3,
+        //                 2,
+        //                 2,
+        //                 3,
+        //                 1
+        //             ],
+        //             "name": "正常点",
+        //             "stack": "正常点"
+        //         },
+        //         {
+        //             "data": [
+        //                 1,
+        //                 1,
+        //                 2,
+        //                 1,
+        //                 2
+        //             ],
+        //             "name": "异常点",
+        //             "stack": "巡检点"
+        //         }
+        //     ],
+        //     "axisData": [
+        //         "A",
+        //         "B",
+        //         "C",
+        //         "D",
+        //         "E"
+        //     ]
+        // }
+        Map<String, Object> result = new HashMap<>();
+        List<Map<String, Object>> seriesData = new ArrayList<>();
+        List<String> axisData = new ArrayList<>();
+        List<String> seriesFillingTimesDataList = new ArrayList<>();
+        List<String> seriesCumulativeFillingQuantityDataList = new ArrayList<>();
+        collect.forEach(x->{
+            axisData.add(String.valueOf(x.get("regionName")));
+            seriesFillingTimesDataList.add(String.valueOf(x.get("fillingTimes")));
+            seriesCumulativeFillingQuantityDataList.add(String.valueOf(x.get("fillingQuantity")));
+        });
+        HashMap<String, Object> temMap1 = new HashMap<>();
+        temMap1.put("data",seriesFillingTimesDataList);
+        temMap1.put("name","充装次数");
+        temMap1.put("stack","充装次数");
+        HashMap<String, Object> temMap2 = new HashMap<>();
+        temMap2.put("data",seriesCumulativeFillingQuantityDataList);
+        temMap2.put("name","累计充装量");
+        temMap2.put("stack","累计充装量");
+        seriesData.add(temMap1);
+        seriesData.add(temMap2);
+        result.put("seriesData",seriesData);
+        result.put("axisData",axisData);
+        return result;
     }
 
 
     private Map<String, Object> esQuery(RegionModel regionModel) {
         SearchRequest searchRequest = new SearchRequest(INDEX_NAME);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-
         // 将 regionModel.getRegionCode() 转换成匹配中间部分的格式
         String regionCodePattern = "*" + regionModel.getRegionCode() + "*";
-
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
         boolQueryBuilder.must(QueryBuilders.wildcardQuery("regionCode", regionCodePattern));
-
         searchSourceBuilder.query(boolQueryBuilder);
         searchSourceBuilder.aggregation(
                 AggregationBuilders.cardinality("total_filling_count")
-                        .field("sequenceNbr.keyword")
+                        .field("sequenceNbr")
         );
         searchSourceBuilder.aggregation(
                 AggregationBuilders.sum("total_filling_quantity")
                         .field("fillingQuantity")
         );
-
         searchRequest.source(searchSourceBuilder);
         System.out.println("Search Request: " + searchRequest);
 
         try {
             // 执行搜索请求
             SearchResponse searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
-
             // 获取所有聚合结果
             Aggregations aggregations = searchResponse.getAggregations();
-
             ParsedCardinality cardinalityAgg = aggregations.get("total_filling_count");
             long uniqueCount = cardinalityAgg.getValue();
-
             Sum sumAgg = aggregations.get("total_filling_quantity");
             double totalSum = sumAgg.getValue();
-
             System.out.println("填充数量的唯一值数量: " + uniqueCount);
             System.out.println("填充量的总和: " + totalSum);
-
             Map<String, Object> resultMap = new HashMap<>();
             resultMap.put(REGION_CODE, regionModel.getRegionCode());
             resultMap.put(REGION_NAME, regionModel.getRegionName());
             resultMap.put(FILLING_TIMES, uniqueCount);
             resultMap.put(FILLING_QUANTITY, totalSum);
-
             return resultMap;
-
         } catch (IOException e) {
             e.printStackTrace();
         }