bugfix:openapi启动找不到类问题修改（气瓶原CylinderFillingMessageService类移至openapi…

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/CylinderController.java

@@ -3,11 +3,10 @@ package com.yeejoin.amos.api.openapi.controller;
 import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
 import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
 import com.yeejoin.amos.api.openapi.constant.Constant;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessage;
 import com.yeejoin.amos.api.openapi.face.model.*;
 import com.yeejoin.amos.api.openapi.face.service.*;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessage;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessageModel;
-import com.yeejoin.amos.boot.module.cylinder.api.service.CylinderFillingMessageService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
@@ -33,7 +32,9 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/cylinder")
@@ -59,7 +60,7 @@ public class CylinderController {
 	@Autowired
 	private CylinderFillingDataValidationService cylinderFillingDataValidationService;
 	@Autowired
-	CylinderFillingMessageService cylinderFillingMessageService;
+	TmCylinderFillingMessageService cylinderFillingMessageService;
 	@Autowired
 	private EmqKeeper emqKeeper;
 	@Autowired

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/CylinderPageController.java

@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
 import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessageModel;
 import com.yeejoin.amos.api.openapi.face.model.CylinderTableModel;
 import com.yeejoin.amos.api.openapi.face.model.CylinderUnitTree;
 import com.yeejoin.amos.api.openapi.face.orm.entity.OpenapiBizToken;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
 import com.yeejoin.amos.api.openapi.face.service.*;
-import com.yeejoin.amos.boot.module.cylinder.api.service.CylinderFillingMessageService;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessageModel;
+import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.logging.log4j.LogManager;
@@ -52,7 +51,7 @@ public class CylinderPageController {
 	@Autowired
 	private CylinderDateInfoService cylinderDateInfoService;
 	@Autowired
-	CylinderFillingMessageService cylinderFillingMessageService;
+	TmCylinderFillingMessageService cylinderFillingMessageService;
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(value = "服务商树")

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/service/CylinderFillingMessageService.java

-package com.yeejoin.amos.boot.module.cylinder.api.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessageModel;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
-import com.yeejoin.amos.boot.module.cylinder.api.mapper.CylinderFillingMessageMapper;
-import com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderFillingMessageEntity;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
-import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import joptsimple.internal.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.text.DecimalFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Component
-public class CylinderFillingMessageService extends BaseService<CylinderFillingMessageModel, CylinderFillingMessageEntity, CylinderFillingMessageMapper> {
-
-    @Autowired
-    ITzBaseEnterpriseInfoService iTzBaseEnterpriseInfoService;
-
-    public IPage<CylinderFillingMessageModel> getUploadCylinderLogs(PageParam pageParam, String regionCode) {
-        CompanyModel result = Privilege.companyClient.queryByCompanyCode(regionCode).getResult();
-        Page<CylinderFillingMessageModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-        if(result != null){
-            IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
-            List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList());
-            if(appIds.size() >  0){
-                List<TzBaseEnterpriseInfoDto> tzBaseEnterpriseInfoDtos = iTzBaseEnterpriseInfoService.queryByAppId(appIds);
-                if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoDtos)){
-                    Map<String, String> map = tzBaseEnterpriseInfoDtos.stream().collect(Collectors.toMap(TzBaseEnterpriseInfoDto::getAppId, TzBaseEnterpriseInfoDto::getUseUnitCode));
-                    uploadCylinderLogsByOrgCode.getRecords().forEach(x -> {
-                        x.setUseUnitCode(map.get(x.getAppId()));
-                    });
-                }
-            }
-        }
-        return page;
-    }
-
-    public IPage<CylinderFillingMessageModel> getUploadCylinderLogsByOrgCode(Page<CylinderFillingMessageModel> page, @Condition(Operator.likeRight) String orgCode) {
-        return queryForPage(page, null, false, orgCode);
-    }
-}

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

@@ -2,8 +2,6 @@ package com.yeejoin.amos.boot.module.cylinder.flc.biz.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,11 +13,6 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderFillingMessageModel;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
-import com.yeejoin.amos.boot.module.cylinder.api.service.CylinderFillingMessageService;
-import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.*;
-import com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl.*;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
@@ -28,8 +21,10 @@ import com.yeejoin.amos.boot.module.cylinder.api.entity.MsgLog;
 import com.yeejoin.amos.boot.module.cylinder.biz.service.impl.BaseUnitLicenceServiceImpl;
 import com.yeejoin.amos.boot.module.cylinder.biz.service.impl.ESCylinderServiceImpl;
 import com.yeejoin.amos.boot.module.cylinder.biz.service.impl.TzBaseEnterpriseInfoServiceImpl;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.*;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderInfo;
 import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderUnit;
+import com.yeejoin.amos.boot.module.cylinder.flc.biz.service.impl.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -54,7 +49,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 气瓶基本信息
@@ -106,8 +100,7 @@ public class CylinderInfoController extends BaseController {
 
 	@Autowired
 	private CylinderAreaDataServiceImpl cylinderAreaDataService;
-	@Autowired
-	CylinderFillingMessageService cylinderFillingMessageService;
+
 	/**
 	 * 新增气瓶基本信息
 	 *
@@ -1457,14 +1450,7 @@ public class CylinderInfoController extends BaseController {
 		return ResponseHelper.buildResponse(result);
 	}
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(value = "同步气瓶数据日志")
-	@GetMapping(value = "/logs")
-	@DS("cyl")
-	public ResponseModel<IPage<CylinderFillingMessageModel>> getUploadCylinderLogs(PageParam pageParam, String regionCode )  {
-		IPage<CylinderFillingMessageModel> result = cylinderFillingMessageService.getUploadCylinderLogs(pageParam, regionCode);
-		return ResponseHelper.buildResponse(result);
-	}
+
 
 
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/CylinderStatisticsMapper.java

 package com.yeejoin.amos.boot.module.statistics.api.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.statistics.api.dto.CylinderFillingMessageModel;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -39,4 +40,6 @@ public interface CylinderStatisticsMapper {
     IPage<TzBaseEnterpriseInfoDto> getStationRateSubPage(IPage<TzBaseEnterpriseInfoDto> page,
                                                          @Param("companyName") String companyName,
                                                          @Param("orgCode") String orgCode);
+    IPage<CylinderFillingMessageModel> getUploadCylinderLogsPage(IPage<CylinderFillingMessageModel> page,
+                                                             @Param("orgCode") String orgCode);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CylinderStatisticsMapper.xml

@@ -91,5 +91,13 @@
         order by rec_date desc
     </select>
 
-
+    <select id="getUploadCylinderLogsPage"
+            resultType="com.yeejoin.amos.boot.module.statistics.api.dto.CylinderFillingMessageModel">
+        select * from iot_cylinder_filling_logs
+        <where>
+            <if test="orgCode != null and orgCode != '' ">
+                and org_code like CONCAT(#{orgCode},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/CylinderDPStatisticsController.java

@@ -7,9 +7,11 @@ import com.yeejoin.amos.boot.module.common.api.dto.CylinderFillingRecordStatisti
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.CylinderDPStatisticsServiceImpl;
+import com.yeejoin.amos.boot.module.statistics.api.dto.CylinderFillingMessageModel;
 import com.yeejoin.amos.boot.module.statistics.api.dto.SubTreeDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.ESCylinderFillingRecordDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.ObjectUtils;
@@ -171,7 +173,6 @@ public class CylinderDPStatisticsController extends BaseController {
         return ResponseHelper.buildResponse(dpStatisticsService.getStationRateSubChart(dpFilterParamForDetailDto));
     }
 
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻列表")
     @PostMapping(value = "/getStationRateSubPage")
@@ -179,7 +180,11 @@ public class CylinderDPStatisticsController extends BaseController {
         return ResponseHelper.buildResponse(dpStatisticsService.getStationRateSubPage(dpFilterParamForDetailDto));
     }
 
-
-
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "同步气瓶数据日志")
+    @GetMapping(value = "/logs")
+    public ResponseModel<IPage<CylinderFillingMessageModel>> getUploadCylinderLogs(PageParam pageParam, String regionCode )  {
+        IPage<CylinderFillingMessageModel> result = dpStatisticsService.getUploadCylinderLogs(pageParam, regionCode);
+        return ResponseHelper.buildResponse(result);
+    }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderDPStatisticsServiceImpl.java

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.CylinderFillingRecordStatisti
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
+import com.yeejoin.amos.boot.module.statistics.api.dto.CylinderFillingMessageModel;
 import com.yeejoin.amos.boot.module.statistics.api.dto.SecurityIndexCountItemDto;
 import com.yeejoin.amos.boot.module.statistics.api.dto.SubTreeDto;
 import com.yeejoin.amos.boot.module.statistics.api.enums.AnomalyTypeEnum;
@@ -18,10 +19,13 @@ import com.yeejoin.amos.boot.module.statistics.api.mapper.AQZSDPStatisticsMapper
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.ESCylinderFillingRecordDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.CylinderAreaDataMapper;
 import com.yeejoin.amos.boot.module.ymt.flc.api.mapper.CylinderInfoMapper;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -43,6 +47,7 @@ import org.elasticsearch.search.sort.SortOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -54,6 +59,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
+
 /**
  * 气瓶区域统计表服务实现类
  *
@@ -80,12 +86,16 @@ public class CylinderDPStatisticsServiceImpl {
     @Autowired
     private AQZSDPStatisticsServiceImpl statisticsService;
 
+    private final TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+
+    private final CylinderOpenApiServiceImpl cylinderOpenApiService;
+
     /**
      * 气瓶图列换算单位上限
      */
     private final static Long CYLINDER_LEGEND_UPPER_LIMIT = 100000L;
 
-    public CylinderDPStatisticsServiceImpl(StCommonServiceImpl stCommonService, RestHighLevelClient restHighLevelClient, TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper, CylinderAreaDataMapper cylinderAreaDataMapper, CylinderStatisticsMapper cylinderStatisticsMapper, CylinderInfoMapper cylinderInfoMapper,AQZSDPStatisticsMapper statisticsMapper) {
+    public CylinderDPStatisticsServiceImpl(StCommonServiceImpl stCommonService, RestHighLevelClient restHighLevelClient, TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper, CylinderAreaDataMapper cylinderAreaDataMapper, CylinderStatisticsMapper cylinderStatisticsMapper, CylinderInfoMapper cylinderInfoMapper, AQZSDPStatisticsMapper statisticsMapper, TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper, CylinderOpenApiServiceImpl cylinderOpenApiService) {
         this.stCommonService = stCommonService;
         this.restHighLevelClient = restHighLevelClient;
         this.baseEnterpriseInfoMapper = baseEnterpriseInfoMapper;
@@ -93,6 +103,8 @@ public class CylinderDPStatisticsServiceImpl {
         this.cylinderStatisticsMapper = cylinderStatisticsMapper;
         this.cylinderInfoMapper = cylinderInfoMapper;
         this.statisticsMapper = statisticsMapper;
+        this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
+        this.cylinderOpenApiService = cylinderOpenApiService;
     }
 
 
@@ -840,7 +852,26 @@ public class CylinderDPStatisticsServiceImpl {
         if(ObjectUtils.isEmpty(orgCode)){
             return null;
         }
-        IPage<TzBaseEnterpriseInfoDto> result = cylinderStatisticsMapper.getStationRateSubPage(page, dpFilterParamForDetailDto.getCompanyName(), orgCode);
-        return result;
+        return cylinderStatisticsMapper.getStationRateSubPage(page, dpFilterParamForDetailDto.getCompanyName(), orgCode);
+    }
+
+    public IPage<CylinderFillingMessageModel> getUploadCylinderLogs(PageParam pageParam, String regionCode) {
+        CompanyModel result = Privilege.companyClient.queryByCompanyCode(regionCode).getResult();
+        Page<CylinderFillingMessageModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+        if(result != null){
+            IPage<CylinderFillingMessageModel> uploadCylinderLogsByOrgCode = cylinderOpenApiService.getUploadCylinderLogsByOrgCode(page, result.getOrgCode());
+            List<String> appIds = uploadCylinderLogsByOrgCode.getRecords().stream().map(CylinderFillingMessageModel::getAppId).collect(Collectors.toList()).stream().filter(x -> !ValidationUtil.isEmpty(x)).distinct().collect(Collectors.toList());
+            if(!appIds.isEmpty()){
+                List<TzBaseEnterpriseInfo> tzBaseEnterpriseInfoList = tzBaseEnterpriseInfoMapper.selectList(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().in(TzBaseEnterpriseInfo::getAppId, appIds));
+                if (!ValidationUtil.isEmpty(tzBaseEnterpriseInfoList)){
+                    Map<String, String> map = tzBaseEnterpriseInfoList.stream().collect(Collectors.toMap(TzBaseEnterpriseInfo::getAppId, TzBaseEnterpriseInfo::getUseUnitCode));
+                    uploadCylinderLogsByOrgCode.getRecords().forEach(x -> {
+                        x.setUseUnitCode(map.get(x.getAppId()));
+                    });
+                }
+            }
+        }
+        return page;
     }
+
 }
\ No newline at end of file