调整气瓶接入框架并重命名相同气瓶相关实体

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

@@ -186,7 +186,13 @@
 			<artifactId>tablesaw-excel</artifactId>
 			<version>0.43.1</version>
 		</dependency>
-	</dependencies>
+    <dependency>
+      <groupId>com.amosframework.boot</groupId>
+      <artifactId>amos-boot-module-cylinder-api</artifactId>
+      <version>1.0.1</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
 	<build>
 		<plugins>
 			<plugin>

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/OpenapiApplication.java

@@ -16,6 +16,7 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -42,7 +43,10 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
 @EnableScheduling
 @MapperScan(value = { "org.typroject.tyboot.*.*.face.orm.dao", "com.yeejoin.amos.api.*.face.orm.dao", "org.typroject.tyboot.face.*.orm.dao*",
 		"com.yeejoin.amos.boot.biz.common.dao.mapper" })
-@ComponentScan({ "org.typroject", "com.yeejoin.amos" })
+@ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" }, excludeFilters = @ComponentScan.Filter(
+		type = FilterType.REGEX,
+		pattern = "com.yeejoin.amos.boot.biz.common.controller.*|com.yeejoin.amos.boot.module.common.api.core.framework.*"
+))
 public class OpenapiApplication {
 
 	private static final Logger logger = LogManager.getLogger(OpenapiApplication.class);

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/aop/ControllerAop.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/aop/OpenApiControllerAop.java

@@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRequest;
 @Aspect
 @Component
 @Order(value = 0)
-public class ControllerAop {
-    private static final Logger logger = LogManager.getLogger(ControllerAop.class);
+public class OpenApiControllerAop {
+    private static final Logger logger = LogManager.getLogger(OpenApiControllerAop.class);
     @Autowired
     private RedisTemplate redisTemplate;
 

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/config/FeignConfiguration.java

-package com.yeejoin.amos.api.openapi.config;
-
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.support.SpringEncoder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author DELL
- */
-@Configuration
-public class FeignConfiguration {
-
-    /**
-     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
-     * @return
-     */
-    @Bean
-    public FeignAuthRequestInterceptor basicAuthRequestInterceptor() {
-        return new FeignAuthRequestInterceptor();
-    }
-
-    @Autowired
-    private ObjectFactory<HttpMessageConverters> messageConverters;
-
-    @Bean
-    public Encoder feignComFormEncoder() {
-        return new SpringFormEncoder(new SpringEncoder(messageConverters));
-    }
-
-
-}
+//package com.yeejoin.amos.api.openapi.config;
+//
+//import feign.codec.Encoder;
+//import feign.form.spring.SpringFormEncoder;
+//import org.springframework.beans.factory.ObjectFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+//import org.springframework.cloud.openfeign.support.SpringEncoder;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+///**
+// * @author DELL
+// */
+//@Configuration
+//public class FeignConfiguration {
+//
+//    /**
+//     * 创建Feign请求拦截器，在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
+//     * @return
+//     */
+//    @Bean
+//    public FeignAuthRequestInterceptor basicAuthRequestInterceptor() {
+//        return new FeignAuthRequestInterceptor();
+//    }
+//
+//    @Autowired
+//    private ObjectFactory<HttpMessageConverters> messageConverters;
+//
+//    @Bean
+//    public Encoder feignComFormEncoder() {
+//        return new SpringFormEncoder(new SpringEncoder(messageConverters));
+//    }
+//
+//
+//}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/config/MultipartSupportConfig.java

@@ -15,7 +15,7 @@ import org.springframework.web.context.request.RequestContextListener;
  * @Description:
  * @Date: 2020/3/30 16:26
  */
-@Configuration
+//@Configuration
 public class MultipartSupportConfig {
 
     @Autowired

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

@@ -15,33 +15,27 @@ import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.doc.TycloudResource;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
 import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingCheckModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingExamineModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingExamineModelList;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingModelList;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingRecordModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderInfoModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderInfoModelList;
-import com.yeejoin.amos.api.openapi.face.model.CylinderInspectionModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderInspectionModelList;
-import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModelList;
-import com.yeejoin.amos.api.openapi.face.model.CylinderUnitModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderUnitModelList;
-import com.yeejoin.amos.api.openapi.face.service.CylinderFillingCheckService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderFillingExamineService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderFillingRecordService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderFillingService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderInfoService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderInspectionService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderTagsService;
-import com.yeejoin.amos.api.openapi.face.service.CylinderUnitService;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingCheckModel;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingExamineModel;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingModel;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingModelList;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingRecordModel;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderInfoModel;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderInspectionModel;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderTagsModel;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderUnitModel;
+import com.yeejoin.amos.api.openapi.face.service.TmCylinderFillingCheckService;
+import com.yeejoin.amos.api.openapi.face.service.TmCylinderFillingExamineService;
+import com.yeejoin.amos.api.openapi.face.service.TmCylinderFillingRecordService;
+import com.yeejoin.amos.api.openapi.face.service.TmCylinderFillingService;
+import com.yeejoin.amos.api.openapi.face.service.TmCylinderInfoService;
+import com.yeejoin.amos.api.openapi.face.service.TmCylinderInspectionService;
+import com.yeejoin.amos.api.openapi.face.service.TmCylinderTagsService;
+import com.yeejoin.amos.api.openapi.face.service.TmCylinderUnitService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -53,27 +47,27 @@ import net.sf.json.JSONObject;
 public class CylinderController {
 	private static final Logger logger = LogManager.getLogger(CylinderController.class);
 	@Autowired
-	private CylinderUnitService cylinderUnitService;
+	private TmCylinderUnitService cylinderUnitService;
 	@Autowired
-	private CylinderFillingCheckService cylinderFillingCheckService;
+	private TmCylinderFillingCheckService cylinderFillingCheckService;
 	@Autowired
-	private CylinderFillingExamineService cylinderFillingExamineService;
+	private TmCylinderFillingExamineService cylinderFillingExamineService;
 	@Autowired
-	private CylinderFillingRecordService cylinderFillingRecordService;
+	private TmCylinderFillingRecordService cylinderFillingRecordService;
 	@Autowired
-	private CylinderFillingService cylinderFillingService;
+	private TmCylinderFillingService cylinderFillingService;
 	@Autowired
-	private CylinderInfoService cylinderInfoService;
+	private TmCylinderInfoService cylinderInfoService;
 	@Autowired
-	private CylinderInspectionService cylinderInspectionService;
+	private TmCylinderInspectionService cylinderInspectionService;
 	@Autowired
-	private CylinderTagsService cylinderTagsService;
+	private TmCylinderTagsService cylinderTagsService;
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(value = "气瓶企业信息")
 	@PostMapping(value = "/unit")
 	@RestEventTrigger(value = "openapiLogEventHandler")
-	public ResponseModel<String> cylinderUnit(@RequestBody List<CylinderUnitModel> unitData) throws Exception {
+	public ResponseModel<String> cylinderUnit(@RequestBody List<TmCylinderUnitModel> unitData) throws Exception {
 		return ResponseHelper.buildResponse(cylinderUnitService.createCylinderUnit(unitData));
 	}
 
@@ -81,7 +75,7 @@ public class CylinderController {
 	@ApiOperation(value = "气瓶基础数据")
 	@PostMapping(value = "/info")
 	@RestEventTrigger(value = "openapiLogEventHandler")
-	public ResponseModel<String> cylinderInfo(@RequestBody List<CylinderInfoModel> infoData) throws Exception {
+	public ResponseModel<String> cylinderInfo(@RequestBody List<TmCylinderInfoModel> infoData) throws Exception {
 		return ResponseHelper.buildResponse(cylinderInfoService.createCylinderInfo(infoData));
 	}
 
@@ -89,7 +83,7 @@ public class CylinderController {
 	@ApiOperation(value = "气瓶标签数据")
 	@PostMapping(value = "/tag")
 	@RestEventTrigger(value = "openapiLogEventHandler")
-	public ResponseModel<String> cylinderTagInfo(@RequestBody List<CylinderTagsModel> tagData) throws Exception {
+	public ResponseModel<String> cylinderTagInfo(@RequestBody List<TmCylinderTagsModel> tagData) throws Exception {
 		return ResponseHelper.buildResponse(cylinderTagsService.createCylinderTag(tagData));
 	}
 
@@ -97,7 +91,7 @@ public class CylinderController {
 	@ApiOperation(value = "气瓶检验数据")
 	@PostMapping(value = "/inspection")
 	@RestEventTrigger(value = "openapiLogEventHandler")
-	public ResponseModel<String> cylinderInspectionInfo(@RequestBody List<CylinderInspectionModel> inspectionData) throws Exception {
+	public ResponseModel<String> cylinderInspectionInfo(@RequestBody List<TmCylinderInspectionModel> inspectionData) throws Exception {
 		return ResponseHelper.buildResponse(cylinderInspectionService.createCylinderInspection(inspectionData));
 
 	}
@@ -111,15 +105,15 @@ public class CylinderController {
 		logger.info("气瓶充装数据"+fillingData);
 		JSONObject jsonobject = JSONObject.fromObject(fillingData);
 		Map<String, Class> classMap = new HashMap<String, Class>();
-		classMap.put("fillingBefore", CylinderFillingModel.class);
-		classMap.put("filling", CylinderFillingRecordModel.class);
-		classMap.put("fillingAfter", CylinderFillingCheckModel.class);
-		CylinderFillingModelList cylinderFillingModelList = (CylinderFillingModelList) JSONObject.toBean(jsonobject,
-				CylinderFillingModelList.class, classMap);
+		classMap.put("fillingBefore", TmCylinderFillingModel.class);
+		classMap.put("filling", TmCylinderFillingRecordModel.class);
+		classMap.put("fillingAfter", TmCylinderFillingCheckModel.class);
+		TmCylinderFillingModelList cylinderFillingModelList = (TmCylinderFillingModelList) JSONObject.toBean(jsonobject,
+				TmCylinderFillingModelList.class, classMap);
 
-		List<CylinderFillingModel> fillingBefores = cylinderFillingModelList.getFillingBefore();
-		List<CylinderFillingRecordModel> fillings = cylinderFillingModelList.getFilling();
-		List<CylinderFillingCheckModel> fillingAfters = cylinderFillingModelList.getFillingAfter();
+		List<TmCylinderFillingModel> fillingBefores = cylinderFillingModelList.getFillingBefore();
+		List<TmCylinderFillingRecordModel> fillings = cylinderFillingModelList.getFilling();
+		List<TmCylinderFillingCheckModel> fillingAfters = cylinderFillingModelList.getFillingAfter();
 		if (ValidationUtil.isEmpty(fillingBefores) && ValidationUtil.isEmpty(fillings) && ValidationUtil.isEmpty(fillingAfters)) {
 			throw new BadRequest("液化气体气瓶充装信息-充装前检查信息、液化气体气瓶充装信息-充装记录信息、液化气体气瓶充装信息-充装后复查信息为空.");
 		}
@@ -141,7 +135,7 @@ public class CylinderController {
 	@ApiOperation(value = "气瓶充装审核数据")
 	@PostMapping(value = "/fillingAudit")
 	@RestEventTrigger(value = "openapiLogEventHandler")
-	public ResponseModel<String> cylinderFillingAudit(@RequestBody List<CylinderFillingExamineModel> fillingAuditData) throws Exception {
+	public ResponseModel<String> cylinderFillingAudit(@RequestBody List<TmCylinderFillingExamineModel> fillingAuditData) throws Exception {
 		return ResponseHelper.buildResponse(cylinderFillingExamineService.createCylinderFillingExamine(fillingAuditData));
 
 	}

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

@@ -28,21 +28,21 @@ import java.util.List;
 public class CylinderPageController {
 	private static final Logger logger = LogManager.getLogger(CylinderPageController.class);
 	@Autowired
-	private CylinderUnitService cylinderUnitService;
+	private TmCylinderUnitService cylinderUnitService;
 	@Autowired
-	private CylinderFillingCheckService cylinderFillingCheckService;
+	private TmCylinderFillingCheckService cylinderFillingCheckService;
 	@Autowired
-	private CylinderFillingExamineService cylinderFillingExamineService;
+	private TmCylinderFillingExamineService cylinderFillingExamineService;
 	@Autowired
-	private CylinderFillingRecordService cylinderFillingRecordService;
+	private TmCylinderFillingRecordService cylinderFillingRecordService;
 	@Autowired
-	private CylinderFillingService cylinderFillingService;
+	private TmCylinderFillingService cylinderFillingService;
 	@Autowired
-	private CylinderInfoService cylinderInfoService;
+	private TmCylinderInfoService cylinderInfoService;
 	@Autowired
-	private CylinderInspectionService cylinderInspectionService;
+	private TmCylinderInspectionService cylinderInspectionService;
 	@Autowired
-	private CylinderTagsService cylinderTagsService;
+	private TmCylinderTagsService cylinderTagsService;
 	@Autowired
 	private OpenapiBizTokenService openapiBizTokenService;
 	@Autowired

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderFillingCheckModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderFillingCheckModel.java

 package com.yeejoin.amos.api.openapi.face.model;
 
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderFillingCheckModel extends AbstractBaseModel{
+public class TmCylinderFillingCheckModel extends AbstractBaseModel{
 	/**
 	 * 
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderFillingExamineModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderFillingExamineModel.java

 package com.yeejoin.amos.api.openapi.face.model;
 
-import java.util.Date;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderFillingExamineModel extends AbstractBaseModel{
+public class TmCylinderFillingExamineModel extends AbstractBaseModel{
 	/**
 	 * 
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderFillingExamineModelList.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderFillingExamineModelList.java

@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderFillingExamineModelList extends AbstractBaseModel{
+public class TmCylinderFillingExamineModelList extends AbstractBaseModel{
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	private List<CylinderFillingExamineModel> fillingAudit;
+	private List<TmCylinderFillingExamineModel> fillingAudit;
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderFillingModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderFillingModel.java

 package com.yeejoin.amos.api.openapi.face.model;
 
-import java.util.Date;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderFillingModel extends AbstractBaseModel{
+public class TmCylinderFillingModel extends AbstractBaseModel{
 	/**
 	 * 
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderFillingModelList.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderFillingModelList.java

@@ -8,14 +8,14 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderFillingModelList extends AbstractBaseModel{
+public class TmCylinderFillingModelList extends AbstractBaseModel{
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 	private String type;
-	private List<CylinderFillingModel> fillingBefore;
-	private List<CylinderFillingRecordModel> filling;
-	private List<CylinderFillingCheckModel> fillingAfter;
+	private List<TmCylinderFillingModel> fillingBefore;
+	private List<TmCylinderFillingRecordModel> filling;
+	private List<TmCylinderFillingCheckModel> fillingAfter;
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderFillingRecordModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderFillingRecordModel.java

 package com.yeejoin.amos.api.openapi.face.model;
 
-import java.util.Date;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderFillingRecordModel extends AbstractBaseModel{
+public class TmCylinderFillingRecordModel extends AbstractBaseModel{
 	/**
 	 * 
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderInfoModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderInfoModel.java

 package com.yeejoin.amos.api.openapi.face.model;
 
-import java.util.Date;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderInfoModel extends AbstractBaseModel{
+public class TmCylinderInfoModel extends AbstractBaseModel{
 	/**
 	 * 
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderInfoModelList.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderInfoModelList.java

@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderInfoModelList extends AbstractBaseModel{
+public class TmCylinderInfoModelList extends AbstractBaseModel{
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	private List<CylinderInfoModel> info;
+	private List<TmCylinderInfoModel> info;
 
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderInspectionModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderInspectionModel.java

 package com.yeejoin.amos.api.openapi.face.model;
 
-import java.util.Date;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderInspectionModel extends AbstractBaseModel{
+public class TmCylinderInspectionModel extends AbstractBaseModel{
 	/**
 	 * 
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderInspectionModelList.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderInspectionModelList.java

@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderInspectionModelList extends AbstractBaseModel{
+public class TmCylinderInspectionModelList extends AbstractBaseModel{
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private List<CylinderInspectionModel> inspection;
+	private List<TmCylinderInspectionModel> inspection;
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderTagsModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderTagsModel.java

@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderTagsModel extends AbstractBaseModel{
+public class TmCylinderTagsModel extends AbstractBaseModel{
 	/**
 	 * 
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderTagsModelList.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderTagsModelList.java

@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderTagsModelList extends AbstractBaseModel{
+public class TmCylinderTagsModelList extends AbstractBaseModel{
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private List<CylinderTagsModel> tag;
+	private List<TmCylinderTagsModel> tag;
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderUnitModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderUnitModel.java

 package com.yeejoin.amos.api.openapi.face.model;
 
-import java.util.Date;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class CylinderUnitModel extends AbstractBaseModel{
+public class TmCylinderUnitModel extends AbstractBaseModel{
 	/**
 	 * 
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderUnitModelList.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/TmCylinderUnitModelList.java

@@ -6,7 +6,7 @@ import java.util.List;
 import lombok.Data;
 
 @Data
-public class CylinderUnitModelList  implements Serializable{
+public class TmCylinderUnitModelList implements Serializable{
 	/**
 	 * <pre>
 	 * 
@@ -14,5 +14,5 @@ public class CylinderUnitModelList  implements Serializable{
 	 */
 	private static final long serialVersionUID = -8502490582467436049L;
 
-	private List<CylinderUnitModel> unit;
+	private List<TmCylinderUnitModel> unit;
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/CylinderFillingCheckMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmCylinderFillingCheckMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingCheck;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingCheck;
 
 /**
  * 
@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingCheck;
  * @author gwb
  * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
  */
-public interface CylinderFillingCheckMapper extends BaseMapper<CylinderFillingCheck> {
+public interface TmCylinderFillingCheckMapper extends BaseMapper<TmCylinderFillingCheck> {
 
 }
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/CylinderFillingExamineMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmCylinderFillingExamineMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingExamine;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingExamine;
 
 /**
  * 
@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingExamine;
  * @author gwb
  * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
  */
-public interface CylinderFillingExamineMapper extends BaseMapper<CylinderFillingExamine> {
+public interface TmCylinderFillingExamineMapper extends BaseMapper<TmCylinderFillingExamine> {
 
 }
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/CylinderFillingMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmCylinderFillingMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFilling;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFilling;
 
 /**
  * 
@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFilling;
  * @author gwb
  * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
  */
-public interface CylinderFillingMapper extends BaseMapper<CylinderFilling> {
+public interface TmCylinderFillingMapper extends BaseMapper<TmCylinderFilling> {
 
 }
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/CylinderFillingRecordMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmCylinderFillingRecordMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingRecord;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingRecord;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  * @author gwb
  * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
  */
-public interface CylinderFillingRecordMapper extends BaseMapper<CylinderFillingRecord> {
+public interface TmCylinderFillingRecordMapper extends BaseMapper<TmCylinderFillingRecord> {
 
 
     @Select("select date_format(`t`.`sync_date`,'%Y-%m-%d') AS `sync_time`  from tm_cylinder_filling_record t GROUP BY date_format(`t`.`sync_date`,'%Y-%m-%d') ")

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/CylinderInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmCylinderInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInfo;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInfo;
 
 /**
  * 
@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInfo;
  * @author gwb
  * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
  */
-public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> {
+public interface TmCylinderInfoMapper extends BaseMapper<TmCylinderInfo> {
 
 }
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/CylinderInspectionMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmCylinderInspectionMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInspection;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInspection;
 
 /**
  * 
@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInspection;
  * @author gwb
  * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
  */
-public interface CylinderInspectionMapper extends BaseMapper<CylinderInspection> {
+public interface TmCylinderInspectionMapper extends BaseMapper<TmCylinderInspection> {
 
 }
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/CylinderTagsMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmCylinderTagsMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderTags;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderTags;
 
 /**
  * 
@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderTags;
  * @author gwb
  * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
  */
-public interface CylinderTagsMapper extends BaseMapper<CylinderTags> {
+public interface TmCylinderTagsMapper extends BaseMapper<TmCylinderTags> {
 
 }
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/CylinderUnitMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmCylinderUnitMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderUnit;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderUnit;
 
 /**
  * 
@@ -12,6 +12,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderUnit;
  * @author gwb
  * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
  */
-public interface CylinderUnitMapper extends BaseMapper<CylinderUnit> {
+public interface TmCylinderUnitMapper extends BaseMapper<TmCylinderUnit>
+{
 
 }
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderFilling.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TmCylinderFilling.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tm_cylinder_filling")
-public class CylinderFilling  extends AbstractBaseEntity{/**
+public class TmCylinderFilling extends AbstractBaseEntity{/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderFillingCheck.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TmCylinderFillingCheck.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tm_cylinder_filling_check")
-public class CylinderFillingCheck  extends AbstractBaseEntity{/**
+public class TmCylinderFillingCheck extends AbstractBaseEntity{/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderFillingExamine.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TmCylinderFillingExamine.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tm_cylinder_filling_examine")
-public class CylinderFillingExamine  extends AbstractBaseEntity{/**
+public class TmCylinderFillingExamine extends AbstractBaseEntity{/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderFillingRecord.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TmCylinderFillingRecord.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tm_cylinder_filling_record")
-public class CylinderFillingRecord  extends AbstractBaseEntity{/**
+public class TmCylinderFillingRecord extends AbstractBaseEntity{/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TmCylinderInfo.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tm_cylinder_info")
-public class CylinderInfo  extends AbstractBaseEntity{
+public class TmCylinderInfo extends AbstractBaseEntity{
 	/**
 	 * 
 	 */

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderInspection.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TmCylinderInspection.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tm_cylinder_inspection")
-public class CylinderInspection  extends AbstractBaseEntity{/**
+public class TmCylinderInspection extends AbstractBaseEntity{/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderTags.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TmCylinderTags.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tm_cylinder_tags")
-public class CylinderTags  extends AbstractBaseEntity{/**
+public class TmCylinderTags extends AbstractBaseEntity{/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/CylinderUnit.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/TmCylinderUnit.java

 package com.yeejoin.amos.api.openapi.face.orm.entity;
 
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("tm_cylinder_unit")
-public class CylinderUnit  extends AbstractBaseEntity{/**
+public class TmCylinderUnit extends AbstractBaseEntity{/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;

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

@@ -8,15 +8,16 @@ import com.yeejoin.amos.api.openapi.face.model.CylinderDateInfoModel;
 import com.yeejoin.amos.api.openapi.face.model.CylinderTableModel;
 import com.yeejoin.amos.api.openapi.face.orm.dao.CylinderDateInfoMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderDateInfo;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFilling;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingCheck;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingExamine;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingRecord;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInfo;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInspection;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderTags;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderUnit;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFilling;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingCheck;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingExamine;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingRecord;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInfo;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInspection;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderTags;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderUnit;
 import com.yeejoin.amos.api.openapi.face.orm.entity.OpenapiBizToken;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -48,21 +49,21 @@ public class CylinderDateInfoService extends BaseService<CylinderDateInfoModel,
     @Autowired
     private RedisTemplate redisTemplate;
 	@Autowired
-	private CylinderUnitService cylinderUnitService;
+	private TmCylinderUnitService cylinderUnitService;
 	@Autowired
-	private CylinderFillingCheckService cylinderFillingCheckService;
+	private TmCylinderFillingCheckService cylinderFillingCheckService;
 	@Autowired
-	private CylinderFillingExamineService cylinderFillingExamineService;
+	private TmCylinderFillingExamineService cylinderFillingExamineService;
 	@Autowired
-	private CylinderFillingRecordService cylinderFillingRecordService;
+	private TmCylinderFillingRecordService cylinderFillingRecordService;
 	@Autowired
-	private CylinderFillingService cylinderFillingService;
+	private TmCylinderFillingService cylinderFillingService;
 	@Autowired
-	private CylinderInfoService cylinderInfoService;
+	private TmCylinderInfoService cylinderInfoService;
 	@Autowired
-	private CylinderInspectionService cylinderInspectionService;
+	private TmCylinderInspectionService cylinderInspectionService;
 	@Autowired
-	private CylinderTagsService cylinderTagsService;
+	private TmCylinderTagsService cylinderTagsService;
 	@Autowired
 	private OpenapiBizTokenService openapiBizTokenService;
 
@@ -98,14 +99,22 @@ public class CylinderDateInfoService extends BaseService<CylinderDateInfoModel,
 						temp.setAppId(appid);
 						temp.setDeveloperAgency(s);
 						// 获取气瓶基本信息
-						Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId,appid).between(CylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,appid).between(CylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId,appid).between(CylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId,appid).between(CylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId,appid).between(CylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId,appid).between(CylinderFillingRecord::getSyncDate,todayStr+ " 00:00:00",todayStr + " 23:59:59"));
-						Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId,appid).between(CylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId,appid).between(CylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<TmCylinderInfo>().eq(TmCylinderInfo::getAppId,appid).between(
+								TmCylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<TmCylinderUnit>().eq(
+								TmCylinderUnit::getAppId,appid).between(TmCylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<TmCylinderTags>().eq(TmCylinderTags::getAppId,appid).between(
+								TmCylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<TmCylinderInspection>().eq(
+								TmCylinderInspection::getAppId,appid).between(TmCylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<TmCylinderFilling>().eq(
+                TmCylinderFilling::getAppId,appid).between(TmCylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<TmCylinderFillingRecord>().eq(
+								TmCylinderFillingRecord::getAppId,appid).between(TmCylinderFillingRecord::getSyncDate,todayStr+ " 00:00:00",todayStr + " 23:59:59"));
+						Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<TmCylinderFillingCheck>().eq(
+								TmCylinderFillingCheck::getAppId,appid).between(TmCylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<TmCylinderFillingExamine>().eq(
+								TmCylinderFillingExamine::getAppId,appid).between(TmCylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
 						Integer total = cylinder + cylinderUnit + tags + inspection+filling+fillingRecord+fillingCheck+examine;
 						temp.setCylinderExamineInfo(examine);
 						temp.setCylinderUnit(cylinderUnit);
@@ -121,14 +130,22 @@ public class CylinderDateInfoService extends BaseService<CylinderDateInfoModel,
 						list.forEach( info -> {
 							String appid = token.getAppId();
 							// 获取气瓶基本信息
-							Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId,appid).between(CylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,appid).between(CylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId,appid).between(CylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId,appid).between(CylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId,appid).between(CylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId,appid).between(CylinderFillingRecord::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId,appid).between(CylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId,appid).between(CylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<TmCylinderInfo>().eq(TmCylinderInfo::getAppId,appid).between(
+									TmCylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<TmCylinderUnit>().eq(
+									TmCylinderUnit::getAppId,appid).between(TmCylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<TmCylinderTags>().eq(TmCylinderTags::getAppId,appid).between(
+									TmCylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<TmCylinderInspection>().eq(
+									TmCylinderInspection::getAppId,appid).between(TmCylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<TmCylinderFilling>().eq(
+                  TmCylinderFilling::getAppId,appid).between(TmCylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<TmCylinderFillingRecord>().eq(
+									TmCylinderFillingRecord::getAppId,appid).between(TmCylinderFillingRecord::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<TmCylinderFillingCheck>().eq(
+									TmCylinderFillingCheck::getAppId,appid).between(TmCylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<TmCylinderFillingExamine>().eq(
+									TmCylinderFillingExamine::getAppId,appid).between(TmCylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
 							Integer total = cylinder + cylinderUnit + tags + inspection+filling+fillingRecord+fillingCheck+examine;
 							info.setCylinderExamineInfo(examine);
 							info.setCylinderUnit(cylinderUnit);
@@ -362,14 +379,23 @@ public class CylinderDateInfoService extends BaseService<CylinderDateInfoModel,
 					temp.setAppId(appid);
 					temp.setDeveloperAgency(s);
 					// 获取气瓶基本信息
-					Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId,appid).between(CylinderInfo::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
-					Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,appid).between(CylinderUnit::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
-					Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId,appid).between(CylinderTags::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
-					Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId,appid).between(CylinderInspection::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
-					Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId,appid).between(CylinderFilling::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
-					Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId,appid).between(CylinderFillingRecord::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
-					Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId,appid).between(CylinderFillingCheck::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
-					Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId,appid).between(CylinderFillingExamine::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
+					Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<TmCylinderInfo>().eq(TmCylinderInfo::getAppId,appid).between(
+							TmCylinderInfo::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
+					Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<TmCylinderUnit>().eq(TmCylinderUnit::getAppId,appid).between(
+							TmCylinderUnit::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
+					Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<TmCylinderTags>().eq(TmCylinderTags::getAppId,appid).between(
+							TmCylinderTags::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
+					Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<TmCylinderInspection>().eq(
+							TmCylinderInspection::getAppId,appid).between(TmCylinderInspection::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
+					Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<TmCylinderFilling>().eq(
+              TmCylinderFilling::getAppId,appid).between(TmCylinderFilling::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
+					Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<TmCylinderFillingRecord>().eq(
+							TmCylinderFillingRecord::getAppId,appid).between(TmCylinderFillingRecord::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
+					Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<TmCylinderFillingCheck>().eq(
+							TmCylinderFillingCheck::getAppId,appid).between(TmCylinderFillingCheck::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
+					Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<TmCylinderFillingExamine>().eq(
+							TmCylinderFillingExamine::getAppId,appid).between(
+							TmCylinderFillingExamine::getSyncDate,d + " 00:00:00",d + " 23:59:59"));
 					Integer total = cylinder + cylinderUnit + tags + inspection+filling+fillingRecord+fillingCheck+examine;
 					temp.setCylinderExamineInfo(examine);
 					temp.setCylinderUnit(cylinderUnit);
@@ -417,14 +443,22 @@ public class CylinderDateInfoService extends BaseService<CylinderDateInfoModel,
 						temp.setAppId(appid);
 						temp.setDeveloperAgency(s);
 						// 获取气瓶基本信息
-						Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId,appid).between(CylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,appid).between(CylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId,appid).between(CylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId,appid).between(CylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId,appid).between(CylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId,appid).between(CylinderFillingRecord::getSyncDate,todayStr+ " 00:00:00",todayStr + " 23:59:59"));
-						Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId,appid).between(CylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-						Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId,appid).between(CylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<TmCylinderInfo>().eq(TmCylinderInfo::getAppId,appid).between(
+								TmCylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<TmCylinderUnit>().eq(
+								TmCylinderUnit::getAppId,appid).between(TmCylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<TmCylinderTags>().eq(TmCylinderTags::getAppId,appid).between(
+								TmCylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<TmCylinderInspection>().eq(
+								TmCylinderInspection::getAppId,appid).between(TmCylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<TmCylinderFilling>().eq(
+                TmCylinderFilling::getAppId,appid).between(TmCylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<TmCylinderFillingRecord>().eq(
+								TmCylinderFillingRecord::getAppId,appid).between(TmCylinderFillingRecord::getSyncDate,todayStr+ " 00:00:00",todayStr + " 23:59:59"));
+						Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<TmCylinderFillingCheck>().eq(
+								TmCylinderFillingCheck::getAppId,appid).between(TmCylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+						Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<TmCylinderFillingExamine>().eq(
+								TmCylinderFillingExamine::getAppId,appid).between(TmCylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
 						Integer total = cylinder + cylinderUnit + tags + inspection+filling+fillingRecord+fillingCheck+examine;
 						temp.setCylinderExamineInfo(examine);
 						temp.setCylinderUnit(cylinderUnit);
@@ -440,14 +474,22 @@ public class CylinderDateInfoService extends BaseService<CylinderDateInfoModel,
 						list.forEach( info -> {
 							String appid = token.getAppId();
 							// 获取气瓶基本信息
-							Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId,appid).between(CylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,appid).between(CylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId,appid).between(CylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId,appid).between(CylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId,appid).between(CylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId,appid).between(CylinderFillingRecord::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId,appid).between(CylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
-							Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId,appid).between(CylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<TmCylinderInfo>().eq(TmCylinderInfo::getAppId,appid).between(
+									TmCylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<TmCylinderUnit>().eq(
+									TmCylinderUnit::getAppId,appid).between(TmCylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<TmCylinderTags>().eq(TmCylinderTags::getAppId,appid).between(
+									TmCylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<TmCylinderInspection>().eq(
+									TmCylinderInspection::getAppId,appid).between(TmCylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<TmCylinderFilling>().eq(
+                  TmCylinderFilling::getAppId,appid).between(TmCylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<TmCylinderFillingRecord>().eq(
+									TmCylinderFillingRecord::getAppId,appid).between(TmCylinderFillingRecord::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<TmCylinderFillingCheck>().eq(
+									TmCylinderFillingCheck::getAppId,appid).between(TmCylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
+							Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<TmCylinderFillingExamine>().eq(
+									TmCylinderFillingExamine::getAppId,appid).between(TmCylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59"));
 							Integer total = cylinder + cylinderUnit + tags + inspection+filling+fillingRecord+fillingCheck+examine;
 							info.setCylinderExamineInfo(examine);
 							info.setCylinderUnit(cylinderUnit);

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

@@ -33,7 +33,7 @@ public class CylinderFillingDataValidationService {
      * @param unitData
      * @return
      */
-    public boolean validatEcylinderUnit(List<CylinderUnitModel> unitData) {
+    public boolean validatEcylinderUnit(List<TmCylinderUnitModel> unitData) {
         JSONArray jsonArray = JSONArray.fromObject(unitData);
         // 1.必填校验
         List<String> errorRows = validateRequired(CylinderUnitFieldEnum.getAllRequireKeys(), jsonArray);
@@ -60,7 +60,7 @@ public class CylinderFillingDataValidationService {
      * @param infoData
      * @return
      */
-    public boolean validateCylinderInfo(List<CylinderInfoModel> infoData) {
+    public boolean validateCylinderInfo(List<TmCylinderInfoModel> infoData) {
         JSONArray jsonArray = JSONArray.fromObject(infoData);
         // 1.必填校验
         List<String> errorRows = validateRequired(CylinderInfoFieldEnum.getAllRequireKeys(), jsonArray);
@@ -92,7 +92,7 @@ public class CylinderFillingDataValidationService {
      * @param tagData
      * @return
      */
-    public boolean validateCylinderTag(List<CylinderTagsModel> tagData) {
+    public boolean validateCylinderTag(List<TmCylinderTagsModel> tagData) {
         JSONArray jsonArray = JSONArray.fromObject(tagData);
         // 1.必填校验
         List<String> errorRows = validateRequired(CylinderTagFieldEnum.getAllRequireKeys(), jsonArray);
@@ -119,7 +119,7 @@ public class CylinderFillingDataValidationService {
      * @param inspectionData
      * @return
      */
-    boolean validateCylinderInspection(List<CylinderInspectionModel> inspectionData) {
+    boolean validateCylinderInspection(List<TmCylinderInspectionModel> inspectionData) {
         JSONArray jsonArray = JSONArray.fromObject(inspectionData);
         // 1.必填校验
         List<String> errorRows = validateRequired(CylinderInspectionFieldEnum.getAllRequireKeys(), jsonArray);
@@ -147,7 +147,7 @@ public class CylinderFillingDataValidationService {
      * @param inspectionData
      * @return
      */
-    boolean validateCylinderFillingExamineModel(List<CylinderFillingExamineModel> inspectionData) {
+    boolean validateCylinderFillingExamineModel(List<TmCylinderFillingExamineModel> inspectionData) {
         JSONArray jsonArray = JSONArray.fromObject(inspectionData);
         // 1.必填校验
         List<String> errorRows = validateRequired(CylinderFillingAuditFieldEnum.getAllRequireKeys(), jsonArray);

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

+package com.yeejoin.amos.api.openapi.face.service;
+
+import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderUnit;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderUnitVideo;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderUnitMapper;
+
+import java.util.List;
+
+@Component
+public class SyncCylinderDataService
+//    extends ServiceImpl implements IService
+{
+  @DS("tzs")
+  public void syncCylinderUnit(List<CylinderUnitDto> cylinderUnitDto) {
+//    List<CylinderUnit> cylinderUnits = Bean.toModels(cylinderUnitDto,CylinderUnit.class);
+//    LambdaQueryWrapper<CylinderUnit> wrapper = new LambdaQueryWrapper<>();
+//    List<CylinderUnit> cylinderUnitList = this.getBaseMapper().selectList(wrapper);
+  }
+}

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

@@ -10,16 +10,13 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.cache.Redis;
 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 com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingCheckModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModel;
-import com.yeejoin.amos.api.openapi.face.orm.dao.CylinderFillingCheckMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingCheck;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingCheckModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.TmCylinderFillingCheckMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingCheck;
 
 
 /**
@@ -32,16 +29,16 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingCheck;
  * @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
  */
 @Component
-public class CylinderFillingCheckService extends BaseService<CylinderFillingCheckModel,CylinderFillingCheck,CylinderFillingCheckMapper> {
+public class TmCylinderFillingCheckService extends BaseService<TmCylinderFillingCheckModel, TmCylinderFillingCheck, TmCylinderFillingCheckMapper> {
     @Autowired
     private RedisTemplate redisTemplate;
     @Transactional(rollbackFor= {Exception.class})
-	public String createCylinderFillingAfter(List<CylinderFillingCheckModel> model) {
+	public String createCylinderFillingAfter(List<TmCylinderFillingCheckModel> model) {
 		// TODO Auto-generated method stub
 //		if (ValidationUtil.isEmpty(model))
 //			throw new BadRequest("气瓶标签信息为空.");
     	
-		for (CylinderFillingCheckModel cylinderFillingCheckModel : model) {
+		for (TmCylinderFillingCheckModel cylinderFillingCheckModel : model) {
 			cylinderFillingCheckModel.setRecDate(new Date());
 			cylinderFillingCheckModel.setAppId(getAppId());
 			this.createWithModel(cylinderFillingCheckModel);

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

@@ -16,10 +16,9 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingExamineModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModel;
-import com.yeejoin.amos.api.openapi.face.orm.dao.CylinderFillingExamineMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingExamine;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingExamineModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.TmCylinderFillingExamineMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingExamine;
 
 
 /**
@@ -32,16 +31,16 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingExamine;
  * @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
  */
 @Component
-public class CylinderFillingExamineService extends BaseService<CylinderFillingExamineModel,CylinderFillingExamine,CylinderFillingExamineMapper> {
+public class TmCylinderFillingExamineService extends BaseService<TmCylinderFillingExamineModel, TmCylinderFillingExamine, TmCylinderFillingExamineMapper> {
     @Autowired
     private RedisTemplate redisTemplate;
     @Transactional(rollbackFor= {Exception.class})
-	public String createCylinderFillingExamine(List<CylinderFillingExamineModel> model) {
+	public String createCylinderFillingExamine(List<TmCylinderFillingExamineModel> model) {
 		// TODO Auto-generated method stub
 		if (ValidationUtil.isEmpty(model))
 			throw new BadRequest("液化气体气瓶充装信息审核为空.");
     	
-		for (CylinderFillingExamineModel cylinderFillingExamineModel : model) {
+		for (TmCylinderFillingExamineModel cylinderFillingExamineModel : model) {
 			cylinderFillingExamineModel.setRecDate(new Date());
 			cylinderFillingExamineModel.setAppId(getAppId());
 			this.createWithModel(cylinderFillingExamineModel);

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

@@ -10,16 +10,13 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.cache.Redis;
 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 com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingRecordModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModel;
-import com.yeejoin.amos.api.openapi.face.orm.dao.CylinderFillingRecordMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingRecord;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingRecordModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.TmCylinderFillingRecordMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingRecord;
 
 
 /**
@@ -32,16 +29,16 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingRecord;
  * @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
  */
 @Component
-public class CylinderFillingRecordService extends BaseService<CylinderFillingRecordModel,CylinderFillingRecord,CylinderFillingRecordMapper> {
+public class TmCylinderFillingRecordService extends BaseService<TmCylinderFillingRecordModel, TmCylinderFillingRecord, TmCylinderFillingRecordMapper> {
     @Autowired
     private RedisTemplate redisTemplate;
     @Transactional(rollbackFor= {Exception.class})
-	public String createCylinderFilling(List<CylinderFillingRecordModel> model) {
+	public String createCylinderFilling(List<TmCylinderFillingRecordModel> model) {
 		// TODO Auto-generated method stub
 //		if (ValidationUtil.isEmpty(model))
 //			throw new BadRequest("气瓶标签信息为空.");
     	
-		for (CylinderFillingRecordModel cylinderFillingRecordModel : model) {
+		for (TmCylinderFillingRecordModel cylinderFillingRecordModel : model) {
 			cylinderFillingRecordModel.setRecDate(new Date());
 			cylinderFillingRecordModel.setAppId(getAppId());
 			this.createWithModel(cylinderFillingRecordModel);

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

@@ -10,16 +10,13 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.cache.Redis;
 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 com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModel;
-import com.yeejoin.amos.api.openapi.face.orm.dao.CylinderFillingMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFilling;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.TmCylinderFillingMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFilling;
 
 
 /**
@@ -32,16 +29,16 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFilling;
  * @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
  */
 @Component
-public class CylinderFillingService extends BaseService<CylinderFillingModel,CylinderFilling,CylinderFillingMapper> {
+public class TmCylinderFillingService extends BaseService<TmCylinderFillingModel, TmCylinderFilling, TmCylinderFillingMapper> {
     @Autowired
     private RedisTemplate redisTemplate;
     @Transactional(rollbackFor= {Exception.class})
-	public String createCylinderFillingBefore(List<CylinderFillingModel> model) {
+	public String createCylinderFillingBefore(List<TmCylinderFillingModel> model) {
 		// TODO Auto-generated method stub
 //		if (ValidationUtil.isEmpty(model))
 //			throw new BadRequest("气瓶标签信息为空.");
     	
-		for (CylinderFillingModel cylinderFillingModel : model) {
+		for (TmCylinderFillingModel cylinderFillingModel : model) {
 			cylinderFillingModel.setRecDate(new Date());
 			cylinderFillingModel.setAppId(getAppId());
 			this.createWithModel(cylinderFillingModel);

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

@@ -16,9 +16,9 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderInfoModel;
-import com.yeejoin.amos.api.openapi.face.orm.dao.CylinderInfoMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInfo;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderInfoModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.TmCylinderInfoMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInfo;
 
 
 /**
@@ -31,16 +31,16 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInfo;
  * @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
  */
 @Component
-public class CylinderInfoService extends BaseService<CylinderInfoModel,CylinderInfo,CylinderInfoMapper> {
+public class TmCylinderInfoService extends BaseService<TmCylinderInfoModel, TmCylinderInfo, TmCylinderInfoMapper> {
     @Autowired
     private RedisTemplate redisTemplate;
     @Transactional(rollbackFor= {Exception.class})
-	public String createCylinderInfo(List<CylinderInfoModel> model) {
+	public String createCylinderInfo(List<TmCylinderInfoModel> model) {
 		// TODO Auto-generated method stub
 		if (ValidationUtil.isEmpty(model))
 			throw new BadRequest("气瓶基本信息数据为空.");
     	
-		for (CylinderInfoModel cylinderInfoModel : model) {
+		for (TmCylinderInfoModel cylinderInfoModel : model) {
 			cylinderInfoModel.setRecDate(new Date());
 			cylinderInfoModel.setAppId(getAppId());
 			this.createWithModel(cylinderInfoModel);

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

@@ -16,10 +16,9 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderInspectionModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModel;
-import com.yeejoin.amos.api.openapi.face.orm.dao.CylinderInspectionMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInspection;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderInspectionModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.TmCylinderInspectionMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInspection;
 
 
 /**
@@ -32,15 +31,15 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInspection;
  * @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
  */
 @Component
-public class CylinderInspectionService extends BaseService<CylinderInspectionModel,CylinderInspection,CylinderInspectionMapper> {
+public class TmCylinderInspectionService extends BaseService<TmCylinderInspectionModel, TmCylinderInspection, TmCylinderInspectionMapper> {
     @Autowired
     private RedisTemplate redisTemplate;
     @Transactional(rollbackFor= {Exception.class})
-	public String createCylinderInspection(List<CylinderInspectionModel> model) {
+	public String createCylinderInspection(List<TmCylinderInspectionModel> model) {
 		if (ValidationUtil.isEmpty(model))
 			throw new BadRequest("气瓶检验信息为空.");
     	
-		for (CylinderInspectionModel cylinderInspectionModel : model) {
+		for (TmCylinderInspectionModel cylinderInspectionModel : model) {
 			cylinderInspectionModel.setRecDate(new Date());
 			cylinderInspectionModel.setAppId(getAppId());
 			this.createWithModel(cylinderInspectionModel);

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

@@ -16,10 +16,9 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderFillingModelList;
-import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModel;
-import com.yeejoin.amos.api.openapi.face.orm.dao.CylinderTagsMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderTags;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderTagsModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.TmCylinderTagsMapper;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderTags;
 
 
 /**
@@ -32,16 +31,16 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderTags;
  * @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
  */
 @Component
-public class CylinderTagsService extends BaseService<CylinderTagsModel,CylinderTags,CylinderTagsMapper> {
+public class TmCylinderTagsService extends BaseService<TmCylinderTagsModel, TmCylinderTags, TmCylinderTagsMapper> {
     @Autowired
     private RedisTemplate redisTemplate;
     @Transactional(rollbackFor= {Exception.class})
-	public String createCylinderTag(List<CylinderTagsModel> model) {
+	public String createCylinderTag(List<TmCylinderTagsModel> model) {
 		// TODO Auto-generated method stub
 		if (ValidationUtil.isEmpty(model))
 			throw new BadRequest("气瓶标签信息为空.");
     	
-		for (CylinderTagsModel cylinderTagsModel : model) {
+		for (TmCylinderTagsModel cylinderTagsModel : model) {
 			cylinderTagsModel.setRecDate(new Date());
 			cylinderTagsModel.setAppId(getAppId());
 			this.createWithModel(cylinderTagsModel);

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

@@ -10,15 +10,18 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.component.cache.Redis;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 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 com.yeejoin.amos.api.openapi.constant.Constant;
 import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
-import com.yeejoin.amos.api.openapi.face.model.CylinderUnitModel;
-import com.yeejoin.amos.api.openapi.face.orm.dao.CylinderUnitMapper;
-import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderUnit;
+import com.yeejoin.amos.api.openapi.face.model.TmCylinderUnitModel;
+import com.yeejoin.amos.api.openapi.face.orm.dao.TmCylinderUnitMapper;
+//import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderUnit;
+import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderUnit;
+import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto;
 
 
 /**
@@ -31,21 +34,27 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderUnit;
  * @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
  */
 @Component
-public class CylinderUnitService extends BaseService<CylinderUnitModel,CylinderUnit,CylinderUnitMapper> {
+public class TmCylinderUnitService extends BaseService<TmCylinderUnitModel, TmCylinderUnit, TmCylinderUnitMapper> {
     @Autowired
     private RedisTemplate redisTemplate;
+	@Autowired
+	private SyncCylinderDataService syncCylinderDataService;
     @Transactional(rollbackFor= {Exception.class})
-	public String createCylinderUnit(List<CylinderUnitModel> model) {
+	public String createCylinderUnit(List<TmCylinderUnitModel> model) {
 		if (ValidationUtil.isEmpty(model))
 			throw new BadRequest("气瓶企业信息数据为空.");
     	
-		for (CylinderUnitModel cylinderUnitModel : model) {
+		for (TmCylinderUnitModel cylinderUnitModel : model) {
 			cylinderUnitModel.setRecDate(new Date());
 			cylinderUnitModel.setAppId(getAppId());
 			this.createWithModel(cylinderUnitModel);
 		}
 		return "OK";
 	}
+	private void syncCylinderUnitModel(List<TmCylinderUnitModel> model ) {
+			List<CylinderUnitDto> cylinderUnitDto = Bean.toModels(model,CylinderUnitDto.class);
+		  syncCylinderDataService.syncCylinderUnit(cylinderUnitDto);
+	}
 	private String getAppId() {
 		String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX,RequestContext.getToken());
     	BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/JyjcServiceFeignClient.java

 package com.yeejoin.amos.api.openapi.feign;
 
 
-import com.yeejoin.amos.api.openapi.config.FeignConfiguration;
 import com.yeejoin.amos.api.openapi.face.dto.JyjcInspectionResultDataModel;
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsAccessFeignService.java

 package com.yeejoin.amos.api.openapi.feign;
 
-import com.yeejoin.amos.api.openapi.config.FeignConfiguration;
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsServiceFeignClient.java

 package com.yeejoin.amos.api.openapi.feign;
 
 
-import com.yeejoin.amos.api.openapi.config.FeignConfiguration;
 import com.yeejoin.amos.api.openapi.face.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.api.openapi.face.dto.EquipmentInfoDto;
 import com.yeejoin.amos.api.openapi.face.model.InspectionDetectionInfoModel;
 import com.yeejoin.amos.api.openapi.face.model.UnitLicenceModel;
 import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo;
 import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo;
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsTcmServiceFeignClient.java

 package com.yeejoin.amos.api.openapi.feign;
 
 
-import com.yeejoin.amos.api.openapi.config.FeignConfiguration;
+import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;