Skip to content

A
amos-boot-biz
Commit 84d0639a authored by tianbo's avatar tianbo
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

# Conflicts: # amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderAreaDataServiceImpl.java
parents 8aafabca 2fe72a68
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1203 additions and 513 deletions
amos-boot-data/amos-boot-data-openapi/pom.xml
View file @ 84d0639a
......@@ -19,19 +19,19 @@
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<!-- druid -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.10</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.alibaba</groupId>-->
<!-- <artifactId>druid-spring-boot-starter</artifactId>-->
<!-- <version>1.1.10</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-jdbc</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>3.1.0</version>
<version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/OpenapiApplication.java
View file @ 84d0639a
......@@ -41,14 +41,15 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
@EnableAsync
@EnableEurekaClient
@EnableScheduling
@MapperScan(value = { "org.typroject.tyboot.*.*.face.orm.dao",
@MapperScan(basePackages = { "org.typroject.tyboot.*.*.face.orm.dao",
"com.yeejoin.amos.api.*.face.orm.dao",
"org.typroject.tyboot.face.*.orm.dao*",
"com.yeejoin.amos.boot.module.cylinder.api.mapper",
"com.yeejoin.amos.boot.module.cylinder.flc.api.mapper",
"com.yeejoin.amos.boot.biz.common.dao.mapper" })
@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.*"
pattern = "com.yeejoin.amos.component.config.TransactionalUntil|com.yeejoin.amos.boot.biz.common.controller.*|com.yeejoin.amos.boot.module.common.api.core.framework.*"
))
public class OpenapiApplication {
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/config/DataSourceConfig.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import javax.sql.DataSource;
@Configuration
public class DataSourceConfig {
@Bean
public DataSourceTransactionManager transactionManager(DataSource dataSource) {
return new DataSourceTransactionManager(dataSource);
}
}
//package com.yeejoin.amos.api.openapi.config;
//
//import org.springframework.beans.factory.annotation.Qualifier;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.context.annotation.Primary;
//import org.springframework.jdbc.datasource.DataSourceTransactionManager;
//
//import javax.sql.DataSource;
//
//
//@Configuration
//public class DataSourceConfig {
//// @Bean
//// public DataSourceTransactionManager transactionManager(DataSource dataSource) {
//// return new DataSourceTransactionManager(dataSource);
//// }
//
//// @Bean
//// @Primary
//// public DataSourceTransactionManager openapiTransactionManager(@Qualifier("openapiDataSource") DataSource openapiDataSource) {
//// return new DataSourceTransactionManager(openapiDataSource);
//// }
////
//// @Bean(name = "tzsTransactionManager")
//// public DataSourceTransactionManager tzsTransactionManager(@Qualifier("tzsDataSource") DataSource tzsDataSource) {
//// return new DataSourceTransactionManager(tzsDataSource);
//// }
//}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/config/ElasticSearchClientConfig.java 0 → 100644
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.config;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Arrays;
@Configuration
public class ElasticSearchClientConfig {
@Value("${spring.elasticsearch.rest.uris}")
private String uris;
@Value("${elasticsearch.username}")
private String username;
@Value("${elasticsearch.password}")
private String password;
@Bean(destroyMethod = "close")
@Qualifier("highLevelClient")
public RestHighLevelClient restHighLevelClient() {
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(AuthScope.ANY,
new UsernamePasswordCredentials(username, password));
try {
HttpHost[] httpHosts = Arrays.stream(uris.split(",")).map(HttpHost::create).toArray(HttpHost[]::new);
RestClientBuilder builder = RestClient.builder(httpHosts);
builder.setHttpClientConfigCallback(httpClientBuilder -> {
httpClientBuilder.disableAuthCaching();
return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
});
// 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
builder.setRequestConfigCallback(requestConfigBuilder -> {
// 连接超时（默认为1秒）
return requestConfigBuilder.setConnectTimeout(5000 * 1000)
// 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
.setSocketTimeout(6000 * 1000);
});
return new RestHighLevelClient(builder);
} catch (Exception e) {
throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
}
}
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/CylinderController.java
View file @ 84d0639a
......@@ -48,12 +48,15 @@ public class CylinderController {
private TmCylinderInspectionService cylinderInspectionService;
@Autowired
private TmCylinderTagsService cylinderTagsService;
@Autowired
private CylinderFillingDataValidationService cylinderFillingDataValidationService;
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "气瓶企业信息")
@PostMapping(value = "/unit")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderUnit(@RequestBody List<TmCylinderUnitModel> unitData) throws Exception {
cylinderFillingDataValidationService.validatEcylinderUnit(unitData);
return ResponseHelper.buildResponse(cylinderUnitService.createCylinderUnit(unitData));
}
......@@ -62,6 +65,7 @@ public class CylinderController {
@PostMapping(value = "/info")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderInfo(@RequestBody List<TmCylinderInfoModel> infoData) throws Exception {
cylinderFillingDataValidationService.validateCylinderInfo(infoData);
return ResponseHelper.buildResponse(cylinderInfoService.createCylinderInfo(infoData));
}
......@@ -70,6 +74,7 @@ public class CylinderController {
@PostMapping(value = "/tag")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderTagInfo(@RequestBody List<TmCylinderTagsModel> tagData) throws Exception {
cylinderFillingDataValidationService.validateCylinderTag(tagData);
return ResponseHelper.buildResponse(cylinderTagsService.createCylinderTag(tagData));
}
......@@ -78,6 +83,7 @@ public class CylinderController {
@PostMapping(value = "/inspection")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderInspectionInfo(@RequestBody List<TmCylinderInspectionModel> inspectionData) throws Exception {
cylinderFillingDataValidationService.validateCylinderInspection(inspectionData);
return ResponseHelper.buildResponse(cylinderInspectionService.createCylinderInspection(inspectionData));
}
......@@ -88,8 +94,11 @@ public class CylinderController {
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderFillingInfo(@RequestBody String fillingData) throws Exception {
logger.info("气瓶充装数据"+fillingData);
// logger.info("气瓶充装数据"+fillingData);
JSONObject jsonobject = JSONObject.fromObject(fillingData);
cylinderFillingDataValidationService.validateFilling(jsonobject);
Map<String, Class> classMap = new HashMap<String, Class>();
classMap.put("fillingBefore", TmCylinderFillingModel.class);
classMap.put("filling", TmCylinderFillingRecordModel.class);
......@@ -122,6 +131,7 @@ public class CylinderController {
@PostMapping(value = "/fillingAudit")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderFillingAudit(@RequestBody List<TmCylinderFillingExamineModel> fillingAuditData) throws Exception {
cylinderFillingDataValidationService.validateCylinderFillingExamineModel(fillingAuditData);
return ResponseHelper.buildResponse(cylinderFillingExamineService.createCylinderFillingExamine(fillingAuditData));
}
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/SuperviseController.java
View file @ 84d0639a
......@@ -3,7 +3,6 @@ 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.face.dto.EquipmentInfoDto;
import com.yeejoin.amos.api.openapi.face.model.ElevatorTechInfoModel;
import com.yeejoin.amos.api.openapi.face.model.EnterpriseInfoModel;
import com.yeejoin.amos.api.openapi.face.model.InspectionDetectionInfoModel;
import com.yeejoin.amos.api.openapi.face.model.InspectionInfoModel;
......@@ -11,14 +10,14 @@ import com.yeejoin.amos.api.openapi.face.model.ProduceInfoModel;
import com.yeejoin.amos.api.openapi.face.model.RegistrationInfoModel;
import com.yeejoin.amos.api.openapi.face.model.StaffQualifInfoModel;
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.MidConstructionInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.EnclosureInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.StaffBaseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidMaintenanceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipOtherInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidStaffBaseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipSuperviseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipUseInfo;
import com.yeejoin.amos.api.openapi.face.service.ConstructionInfoService;
import com.yeejoin.amos.api.openapi.face.service.CreateCodeService;
import com.yeejoin.amos.api.openapi.face.service.DesignInfoService;
......@@ -130,7 +129,7 @@ public class SuperviseController {
@ApiOperation(value = "新增施工信息")
@PostMapping(value = "/constructionInfo")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveConstructionInfo(@RequestBody List<ConstructionInfo> constructionInfoList) {
public ResponseModel<String> saveConstructionInfo(@RequestBody List<MidConstructionInfo> constructionInfoList) {
if (ValidationUtil.isEmpty(constructionInfoList)) {
throw new BadRequest("上送数据为空");
}
......@@ -149,7 +148,7 @@ public class SuperviseController {
@ApiOperation(value = "新增使用信息")
@PostMapping(value = "/useInfo")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveUseInfo(@RequestBody List<UseInfo> useInfo) throws Exception {
public ResponseModel<String> saveUseInfo(@RequestBody List<MiddEquipUseInfo> useInfo) throws Exception {
return ResponseHelper.buildResponse(useInfoService.saveUseInfo(useInfo));
}
......@@ -157,7 +156,7 @@ public class SuperviseController {
@ApiOperation(value = "新增维保单位信息")
@PostMapping(value = "/maintenanceInfo")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveMaintenanceInfo(@RequestBody List<MaintenanceInfo> maintenanceInfoList) {
public ResponseModel<String> saveMaintenanceInfo(@RequestBody List<MidMaintenanceInfo> maintenanceInfoList) {
if (ValidationUtil.isEmpty(maintenanceInfoList)) {
throw new BadRequest("上送数据为空");
}
......@@ -168,7 +167,7 @@ public class SuperviseController {
@ApiOperation(value = "新增监督管理信息")
@PostMapping(value = "/superviseInfo")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveSuperviseInfo(@RequestBody List<SuperviseInfo> superviseInfo) throws Exception {
public ResponseModel<String> saveSuperviseInfo(@RequestBody List<MiddEquipSuperviseInfo> superviseInfo) throws Exception {
return ResponseHelper.buildResponse(superviseInfoService.saveSuperviseInfo(superviseInfo));
}
......@@ -176,7 +175,7 @@ public class SuperviseController {
@ApiOperation(value = "新增其他信息")
@PostMapping(value = "/otherInfo")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveOtherInfo(@RequestBody List<OtherInfo> otherInfo) throws Exception {
public ResponseModel<String> saveOtherInfo(@RequestBody List<MidEquipOtherInfo> otherInfo) throws Exception {
return ResponseHelper.buildResponse(otherInfoService.saveOtherInfo(otherInfo));
}
......@@ -208,7 +207,7 @@ public class SuperviseController {
@ApiOperation(value = "新增人员基本信息")
@PostMapping(value = "/staffBaseInfo")
@RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveStaffBaseInfo(@RequestBody List<StaffBaseInfo> staffBaseInfo) throws Exception {
public ResponseModel<String> saveStaffBaseInfo(@RequestBody List<MidStaffBaseInfo> staffBaseInfo) throws Exception {
return ResponseHelper.buildResponse(staffBaseInfoService.saveStaffBaseInfo(staffBaseInfo));
}
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/enums/EquipTypeEnum.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.enums;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamBoiler;
import lombok.AllArgsConstructor;
import lombok.Getter;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/dto/EquipmentInfoDto.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.dto;
import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MainParts;
import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.ProduceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.ProtectionDevices;
import com.yeejoin.amos.api.openapi.face.orm.entity.RegistrationInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddMainParts;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidMaintenanceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipOtherInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipProduceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipProtectionDevices;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipRegistrationInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipSuperviseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipUseInfo;
import lombok.Data;
import java.util.List;
......@@ -23,7 +23,7 @@ public class EquipmentInfoDto {
/**
* 使用信息
*/
private UseInfo useInfo;
private MiddEquipUseInfo useInfo;
/**
* 设计制造
......@@ -33,36 +33,36 @@ public class EquipmentInfoDto {
/**
* 制造信息
*/
private ProduceInfo factoryInfo;
private MidEquipProduceInfo factoryInfo;
/**
* 监管信息
*/
private SuperviseInfo supervisionInfo;
private MiddEquipSuperviseInfo supervisionInfo;
/**
* 注册登记
*/
private RegistrationInfo registerInfo;
private MidEquipRegistrationInfo registerInfo;
/**
* 维保备案
*/
private MaintenanceInfo maintenanceRecordInfo;
private MidMaintenanceInfo maintenanceRecordInfo;
/**
* 其他信息
*/
private OtherInfo otherInfo;
private MidEquipOtherInfo otherInfo;
/**
* 主要零部件
*/
private List<MainParts> mainParts;
private List<MiddMainParts> mainParts;
/**
* 保护装置
*/
private List<ProtectionDevices> protectionDevices;
private List<MidEquipProtectionDevices> protectionDevices;
/**
* 设备参数信息
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/AbstractBaseModel.java
View file @ 84d0639a
......@@ -14,8 +14,8 @@ public abstract class AbstractBaseModel extends BaseModel{
*
*/
private static final long serialVersionUID = 1L;
protected Date SyncDate;//同步时间 yyyy-MM-dd HH24:mi:ss
protected int SyncState;//同步状态（0-新增 1-更新 2-删除）
protected Date syncDate;//同步时间 yyyy-MM-dd HH24:mi:ss
protected int syncState;//同步状态（0-新增 1-更新 2-删除）
/**
* 对接公司编码
*/
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EquipmentCategoryModel.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.model;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
*
* <pre>
* 装备分类 model
* </pre>
*
* @author gwb
* @version $Id: EquipmentCategory.java, v 0.1 2021年10月15日 上午11:23:03 gwb Exp $
*/
@Data
public class EquipmentCategoryModel implements Serializable {
/**
* <pre>
*
* </pre>
*/
private static final long serialVersionUID = 8586846201861760731L;
/**
* 主键
*/
private Long id;
/**
*
*/
private String parentId;
/**
* 装备分类编码
*/
private String code;
/**
* 装备分类名称
*/
private String name;
/**
* 描述
*/
private String description;
/**
* 备注
*/
private String remark;
/**
*
*/
private Date createDate;
/**
* 行业编码
*/
private String industryCode;
}
//package com.yeejoin.amos.api.openapi.face.model;
//
//import java.io.Serializable;
//import java.util.Date;
//
//import lombok.Data;
//
///**
// *
// * <pre>
// * 装备分类 model
// * </pre>
// *
// * @author gwb
// * @version $Id: EquipmentCategory.java, v 0.1 2021年10月15日 上午11:23:03 gwb Exp $
// */
//@Data
//public class EquipmentCategoryModel implements Serializable {
//
// /**
// * <pre>
// *
// * </pre>
// */
// private static final long serialVersionUID = 8586846201861760731L;
//
// /**
// * 主键
// */
// private Long id;
// /**
// *
// */
// private String parentId;
// /**
// * 装备分类编码
// */
// private String code;
// /**
// * 装备分类名称
// */
// private String name;
// /**
// * 描述
// */
// private String description;
// /**
// * 备注
// */
// private String remark;
// /**
// *
// */
// private Date createDate;
// /**
// * 行业编码
// */
// private String industryCode;
//
//}
//
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EquipTechParamBoilerModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MidEquipTechParamBoilerModel.java
View file @ 84d0639a
......@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
/**
* 安全追溯-锅炉
*
......@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamBoilerDto", description="安全追溯-锅炉Dto")
public class EquipTechParamBoilerModel extends AbstractBaseModel {
public class MidEquipTechParamBoilerModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EquipTechParamElevatorModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MidEquipTechParamElevatorModel.java
View file @ 84d0639a
......@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
/**
* 安全追溯-电梯
*
......@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamElevatorDto", description="安全追溯-电梯Dto")
public class EquipTechParamElevatorModel extends AbstractBaseModel {
public class MidEquipTechParamElevatorModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EquipTechParamLiftingModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MidEquipTechParamLiftingModel.java
View file @ 84d0639a
......@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
/**
* 安全追溯-起重机械
*
......@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamLiftingDto", description="安全追溯-起重机械Dto")
public class EquipTechParamLiftingModel extends AbstractBaseModel {
public class MidEquipTechParamLiftingModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EquipTechParamPipelineModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MidEquipTechParamPipelineModel.java
View file @ 84d0639a
......@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
/**
* 安全追溯-压力管道
*
......@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamPipelineDto", description="安全追溯-压力管道Dto")
public class EquipTechParamPipelineModel extends AbstractBaseModel {
public class MidEquipTechParamPipelineModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EquipTechParamRidesModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MidEquipTechParamRidesModel.java
View file @ 84d0639a
......@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
/**
* 安全追溯-游乐设施
*
......@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamRidesDto", description="安全追溯-游乐设施Dto")
public class EquipTechParamRidesModel extends AbstractBaseModel {
public class MidEquipTechParamRidesModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EquipTechParamRopewayModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MidEquipTechParamRopewayModel.java
View file @ 84d0639a
......@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
/**
* 安全追溯-索道
*
......@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamRopewayDto", description="安全追溯-索道Dto")
public class EquipTechParamRopewayModel extends AbstractBaseModel {
public class MidEquipTechParamRopewayModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EquipTechParamVehicleModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MidEquipTechParamVehicleModel.java
View file @ 84d0639a
......@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
/**
* 安全追溯-场内车辆
*
......@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamVehicleDto", description="安全追溯-场内车辆Dto")
public class EquipTechParamVehicleModel extends AbstractBaseModel {
public class MidEquipTechParamVehicleModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/EquipTechParamVesselModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MidEquipTechParamVesselModel.java
View file @ 84d0639a
......@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
/**
* 安全追溯-压力容器
*
......@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamVesselDto", description="安全追溯-压力容器Dto")
public class EquipTechParamVesselModel extends AbstractBaseModel {
public class MidEquipTechParamVesselModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MaintenanceInfoModel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/MidMaintenanceInfoModel.java
View file @ 84d0639a
......@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
/**
* 安全追溯-维保备案信息表
*
......@@ -16,7 +16,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipMaintenanceRecordInfoDto", description="安全追溯-维保备案信息表Dto")
public class MaintenanceInfoModel extends AbstractBaseModel {
public class MidMaintenanceInfoModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ESCylinderFillingRecordRepository.java 0 → 100644
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ESCylinderFillingRecordRepository extends PagingAndSortingRepository<ESCylinderFillingRecordDto, Long> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ESCylinderInfoRepository.java 0 → 100644
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderInfoDto;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ESCylinderInfoRepository extends PagingAndSortingRepository<ESCylinderInfoDto, Long> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ESCylinderRepository.java 0 → 100644
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.yeejoin.amos.boot.module.cylinder.api.entity.EsCylinder;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;
/**
* @author fengwang
* @date 2021-09-26.
*/
@Repository
public interface ESCylinderRepository extends PagingAndSortingRepository<EsCylinder, Long> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipmentCategoryMapper.java
View file @ 84d0639a
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.EquipmentCategory;
/**
*
* <pre>
* 装备分类 Mapper 接口
* </pre>
*
* @author gwb
* @version $Id: EquipmentCategoryMapper.java, v 0.1 2021年10月15日 下午2:24:49 gwb Exp $
*/
public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
}
\ No newline at end of file
//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.EquipmentCategory;
//
///**
// *
// * <pre>
// * 装备分类 Mapper 接口
// * </pre>
// *
// * @author gwb
// * @version $Id: EquipmentCategoryMapper.java, v 0.1 2021年10月15日 下午2:24:49 gwb Exp $
// */
//public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
//
//}
\ No newline at end of file
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidConstructionInfoMapper.java
View file @ 84d0639a
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.ConstructionInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidConstructionInfo;
/**
* 特种设备基本信息-施工信息 Mapper 接口
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface MidConstructionInfoMapper extends BaseMapper<ConstructionInfo> {
public interface MidConstructionInfoMapper extends BaseMapper<MidConstructionInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/OtherInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipOtherInfoMapper.java
View file @ 84d0639a
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.OtherInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipOtherInfo;
/**
* 特种设备基本信息-其他信息 Mapper 接口
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface OtherInfoMapper extends BaseMapper<OtherInfo> {
public interface MidEquipOtherInfoMapper extends BaseMapper<MidEquipOtherInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/ProduceInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipProduceInfoMapper.java
View file @ 84d0639a
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.ProduceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipProduceInfo;
/**
* 特种设备基本信息-制造信息 Mapper 接口
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.ProduceInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface ProduceInfoMapper extends BaseMapper<ProduceInfo> {
public interface MidEquipProduceInfoMapper extends BaseMapper<MidEquipProduceInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/RegistrationInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipRegistrationInfoMapper.java
View file @ 84d0639a
......@@ -2,7 +2,7 @@ package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.RegistrationInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipRegistrationInfo;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
......@@ -15,9 +15,9 @@ import java.util.Set;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface RegistrationInfoMapper extends BaseMapper<RegistrationInfo> {
public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegistrationInfo> {
@DS("tzs")
@Query("SELECT DISTINCT r.* FROM idx_biz_jg_use_info i, idx_biz_jg_register_info r WHERE i.data_source = 'jg' AND i.RECORD = r.RECORD AND r.EQU_CODE IN :values")
List<RegistrationInfo> getUseInfoByEquipCode(@Param("values") Set<String> sequenceCodes);
List<MidEquipRegistrationInfo> getUseInfoByEquipCode(@Param("values") Set<String> sequenceCodes);
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamBoilerMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipTechParamBoilerMapper.java
View file @ 84d0639a
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.EquipTechParamBoiler;
import lombok.Data;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamBoiler;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface EquipTechParamBoilerMapper extends BaseMapper<EquipTechParamBoiler> {
public interface MidEquipTechParamBoilerMapper extends BaseMapper<MidEquipTechParamBoiler> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamElevatorMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipTechParamElevatorMapper.java
View file @ 84d0639a
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.EquipTechParamElevator;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamElevator;
public interface EquipTechParamElevatorMapper extends BaseMapper<EquipTechParamElevator> {
public interface MidEquipTechParamElevatorMapper extends BaseMapper<MidEquipTechParamElevator> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamLiftingMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipTechParamLiftingMapper.java
View file @ 84d0639a
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.EquipTechParamLifting;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamLifting;
public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLifting> {
public interface MidEquipTechParamLiftingMapper extends BaseMapper<MidEquipTechParamLifting> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamPipelineMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipTechParamPipelineMapper.java
View file @ 84d0639a
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.EquipTechParamPipeline;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamPipeline;
public interface EquipTechParamPipelineMapper extends BaseMapper<EquipTechParamPipeline> {
public interface MidEquipTechParamPipelineMapper extends BaseMapper<MidEquipTechParamPipeline> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamRidesMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipTechParamRidesMapper.java
View file @ 84d0639a
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.EquipTechParamRides;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamRides;
public interface EquipTechParamRidesMapper extends BaseMapper<EquipTechParamRides> {
public interface MidEquipTechParamRidesMapper extends BaseMapper<MidEquipTechParamRides> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamRopewayMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipTechParamRopewayMapper.java
View file @ 84d0639a
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.EquipTechParamRopeway;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamRopeway;
public interface EquipTechParamRopewayMapper extends BaseMapper<EquipTechParamRopeway> {
public interface MidEquipTechParamRopewayMapper extends BaseMapper<MidEquipTechParamRopeway> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamVehicleMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipTechParamVehicleMapper.java
View file @ 84d0639a
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.EquipTechParamVehicle;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamVehicle;
public interface EquipTechParamVehicleMapper extends BaseMapper<EquipTechParamVehicle> {
public interface MidEquipTechParamVehicleMapper extends BaseMapper<MidEquipTechParamVehicle> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipTechParamVesselMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipTechParamVesselMapper.java
View file @ 84d0639a
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.EquipTechParamVessel;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamVessel;
public interface EquipTechParamVesselMapper extends BaseMapper<EquipTechParamVessel> {
public interface MidEquipTechParamVesselMapper extends BaseMapper<MidEquipTechParamVessel> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MaintenanceInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidMaintenanceInfoMapper.java
View file @ 84d0639a
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.MaintenanceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidMaintenanceInfo;
/**
* 特种设备基本信息-维保备案信息 Mapper 接口
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface MaintenanceInfoMapper extends BaseMapper<MaintenanceInfo> {
public interface MidMaintenanceInfoMapper extends BaseMapper<MidMaintenanceInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/StaffBaseInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidStaffBaseInfoMapper.java
View file @ 84d0639a
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.StaffBaseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidStaffBaseInfo;
/**
* 人员数据信息-基本信息 Mapper 接口
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.StaffBaseInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface StaffBaseInfoMapper extends BaseMapper<StaffBaseInfo> {
public interface MidStaffBaseInfoMapper extends BaseMapper<MidStaffBaseInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/StaffQualifInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidStaffQualifInfoMapper.java
View file @ 84d0639a
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.StaffQualifInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidStaffQualifInfo;
/**
* 人员数据信息-资质信息 Mapper 接口
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.StaffQualifInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface StaffQualifInfoMapper extends BaseMapper<StaffQualifInfo> {
public interface MidStaffQualifInfoMapper extends BaseMapper<MidStaffQualifInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipMainPartsMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MiddEquipMainPartsMapper.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.yeejoin.amos.api.openapi.face.orm.entity.MainParts;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddMainParts;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
......@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author duanwei
* @date 2023-04-10
*/
public interface MidEquipMainPartsMapper extends BaseMapper<MainParts> {
public interface MiddEquipMainPartsMapper extends BaseMapper<MiddMainParts> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MidEquipProtectionDevicesMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MiddEquipProtectionDevicesMapper.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.yeejoin.amos.api.openapi.face.orm.entity.ProtectionDevices;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipProtectionDevices;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
......@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author duanwei
* @date 2023-04-10
*/
public interface MidEquipProtectionDevicesMapper extends BaseMapper<ProtectionDevices> {
public interface MiddEquipProtectionDevicesMapper extends BaseMapper<MidEquipProtectionDevices> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/SuperviseInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MiddEquipSuperviseInfoMapper.java
View file @ 84d0639a
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.SuperviseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipSuperviseInfo;
/**
* 特种设备基本信息-监督管理信息 Mapper 接口
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface SuperviseInfoMapper extends BaseMapper<SuperviseInfo> {
public interface MiddEquipSuperviseInfoMapper extends BaseMapper<MiddEquipSuperviseInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/UseInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/MiddEquipUseInfoMapper.java
View file @ 84d0639a
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.UseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipUseInfo;
/**
* 特种设备基本信息-使用信息 Mapper 接口
......@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo;
* @author Zhang Yingbin
* @date 2022-07-19
*/
public interface UseInfoMapper extends BaseMapper<UseInfo> {
public interface MiddEquipUseInfoMapper extends BaseMapper<MiddEquipUseInfo> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/CylinderDateInfoMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmCylinderDateInfoMapper.java
View file @ 84d0639a
......@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderDateInfo;
* @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/
public interface CylinderDateInfoMapper extends BaseMapper<CylinderDateInfo> {
public interface TmCylinderDateInfoMapper extends BaseMapper<CylinderDateInfo> {
}
\ No newline at end of file
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/EquipmentMapper.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/TmEquipmentMapper.java
View file @ 84d0639a
......@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.api.openapi.face.model.EquipmentModel;
import com.yeejoin.amos.api.openapi.face.orm.entity.Equipment;
public interface EquipmentMapper extends BaseMapper<Equipment> {
public interface TmEquipmentMapper extends BaseMapper<Equipment> {
IPage<EquipmentModel> page(Page<EquipmentModel> page, Date startTime,Date endTime);
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ESCylinderFillingRecordDto.java 0 → 100644
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
@Data
@Accessors(chain = true)
@Document(indexName = "cylinder_filling", shards = 6, replicas = 2)
public class ESCylinderFillingRecordDto {
@Id
private Long sequenceNbr;
//充装单位
@Field(type = FieldType.Text)
private String fillingUnitName;
//出厂编号
@Field(type = FieldType.Text)
private String factoryNum;
//气瓶品种code
@Field(type = FieldType.Integer)
private Integer cylinderVariety;
//气瓶品种名称
@Field(type = FieldType.Text)
private String cylinderVarietyName;
//二维码编号
@Field(type = FieldType.Text)
private String qrCode;
//电子标签编号
@Field(type = FieldType.Text)
private String electronicLabelCode;
//气瓶唯一标识
@Field(type = FieldType.Text)
private String sequenceCode;
//单位内部编号
@Field(type = FieldType.Text)
private String unitInnerCode;
//产权单位名称
@Field(type = FieldType.Text)
private String unitName;
//气瓶状态code
@Field(type = FieldType.Integer)
private Integer cylinderStatus;
//气瓶状态名称
@Field(type = FieldType.Text)
private String cylinderStatusStr;
//充装开始时间
@Field(type = FieldType.Text)
private String fillingStartTime;
//充装结束时间
@Field(type = FieldType.Text)
private String fillingEndTime;
//充装人员姓名
@Field(type = FieldType.Text)
private String fillingUser;
//充装量（Kg）
@Field(type = FieldType.Double)
private Double fillingQuantity;
//室温
@Field(type = FieldType.Double)
private Double temperature;
//异常情况
@Field(type = FieldType.Text)
private String abnormalStr;
//充装前检查人员姓名
@Field(type = FieldType.Text)
private String inspectorUser;
//充装前检查时间
@Field(type = FieldType.Text)
private String inspectionDate;
//充装前检查时间毫秒值
@Field(type = FieldType.Long)
private Long inspectionDateMs;
//充装前检查结果
@Field(type = FieldType.Text)
private String fillingResult;
//重装后检查人员姓名
@Field(type = FieldType.Text)
private String inspector;
//重装后检查时间
@Field(type = FieldType.Text)
private String inspectionDateAfter;
//充装前检查结果毫秒值
@Field(type = FieldType.Long)
private Long inspectionDateAfterMS;
//重装后检查结果
@Field(type = FieldType.Text)
private String checkResult;
//appid
@Field(type = FieldType.Text)
private String appId;
//统一社会信用代码
@Field(type = FieldType.Text)
private String creditCode;
//行政区划代码
@Field(type = FieldType.Text)
private String regionCode;
//appid+气瓶唯一标识
private String appIdAndSequenceCode;
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ESCylinderInfoDto.java 0 → 100644
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import lombok.Data;
import lombok.experimental.Accessors;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
@Data
@Accessors(chain = true)
@Document(indexName = "cylinder_info", shards = 6, replicas = 2)
public class ESCylinderInfoDto {
@Id
private Long sequenceNbr;
//产权单位名称
@Field(type = FieldType.Text)
private String unitName;
//出厂编号
@Field(type = FieldType.Text)
private String factoryNum;
//气瓶品种code
@Field(type = FieldType.Integer)
private Integer cylinderVariety;
//气瓶品种名称
@Field(type = FieldType.Text)
private String cylinderVarietyName;
//二维码标签
@Field(type = FieldType.Text)
private String qrCode;
//电子标签编号
@Field(type = FieldType.Text)
private String electronicLabelCode;
//气瓶状态code
@Field(type = FieldType.Integer)
private Integer cylinderStatus;
//气瓶状态名称
@Field(type = FieldType.Text)
private String cylinderStatusStr;
//充装介质
@Field(type = FieldType.Text)
private String fillingMediaName;
//公称压力
@Field(type = FieldType.Double)
private Double nominalWorkPressure;
//容积
@Field(type = FieldType.Double)
private Double volume;
//制造日期
@Field(type = FieldType.Text)
private String manufacturingDate;
//制造单位
@Field(type = FieldType.Text)
private String manufacturingUnit;
//检验日期
@Field(type = FieldType.Text)
private String inspectionDate;
//检验日期
@Field(type = FieldType.Long)
private Long inspectionDateMs;
//气瓶唯一标识
@Field(type = FieldType.Text)
private String sequenceCode;
//单位内部编号
@Field(type = FieldType.Text)
private String unitInnerCode;
//appid
@Field(type = FieldType.Text)
private String appId;
//统一社会信用代码
@Field(type = FieldType.Text)
private String creditCode;
@Field(type = FieldType.Text)
private String regionCode;
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipmentCategory.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
/**
*
* <pre>
* 装备分类
* </pre>
*
* @author gwb
* @version $Id: EquipmentCategory.java, v 0.1 2021年10月15日 上午11:23:03 gwb Exp $
*/
@Data
@TableName("tz_equipment_category")
public class EquipmentCategory implements Serializable {
/**
* <pre>
*
* </pre>
*/
private static final long serialVersionUID = 5715164115243510569L;
/**
* 主键
*/
@TableField("id")
private Long id;
/**
*
*/
@TableField("parent_id")
private String parentId;
/**
* 装备分类编码
*/
@TableField("code")
private String code;
/**
* 装备分类名称
*/
@TableField("name")
private String name;
/**
* 描述
*/
@TableField("description")
private String description;
/**
* 备注
*/
@TableField("remark")
private String remark;
/**
*
*/
@TableField("create_date")
private Date createDate;
/**
* 行业编码
*/
@TableField("industry_code")
private String industryCode;
}
//package com.yeejoin.amos.api.openapi.face.orm.entity;
//
//import java.io.Serializable;
//import java.util.Date;
//
//import com.baomidou.mybatisplus.annotation.TableField;
//import com.baomidou.mybatisplus.annotation.TableName;
//
//import lombok.Data;
//
///**
// *
// * <pre>
// * 装备分类
// * </pre>
// *
// * @author gwb
// * @version $Id: EquipmentCategory.java, v 0.1 2021年10月15日 上午11:23:03 gwb Exp $
// */
//@Data
//@TableName("tz_equipment_category")
//public class EquipmentCategory implements Serializable {
//
//
// /**
// * <pre>
// *
// * </pre>
// */
// private static final long serialVersionUID = 5715164115243510569L;
// /**
// * 主键
// */
// @TableField("id")
// private Long id;
// /**
// *
// */
// @TableField("parent_id")
// private String parentId;
// /**
// * 装备分类编码
// */
// @TableField("code")
// private String code;
// /**
// * 装备分类名称
// */
// @TableField("name")
// private String name;
// /**
// * 描述
// */
// @TableField("description")
// private String description;
// /**
// * 备注
// */
// @TableField("remark")
// private String remark;
// /**
// *
// */
// @TableField("create_date")
// private Date createDate;
// /**
// * 行业编码
// */
// @TableField("industry_code")
// private String industryCode;
//
//}
//
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EsCylinder.java 0 → 100644
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import lombok.Data;
import lombok.experimental.Accessors;
import org.elasticsearch.common.geo.GeoPoint;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
import org.springframework.data.elasticsearch.annotations.GeoPointField;
/**
* @author tb
* @date 2022-04-20.
*/
@Data
@Accessors(chain = true)
@Document(indexName = "cylinder", shards = 6, replicas = 2)
public class EsCylinder {
/**
* 主键
*/
@Id
private Long sequenceNbr;
/**
* 气瓶出厂编号
*/
@Field(type = FieldType.Text)
private String factoryNum;
// /**
// * 所属省
// */
// @Field(type = FieldType.Text)
// private String province;
//
// /**
// * 所属地市
// */
// @Field(type = FieldType.Text)
// private String city;
//
// /**
// * 所属区县
// */
// @Field(type = FieldType.Text)
// private String district;
//
/**
* 所属区域代码
*/
@Field(type = FieldType.Text, searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
private String regionCode;
/**
* 产权单位名称
*/
@Field(type = FieldType.Text)
private String unitName;
/**
* 经度
*/
@Field(type = FieldType.Double)
private Double longitude;
/**
* 纬度
*/
@Field(type = FieldType.Double)
private Double latitude;
/**
* 经纬度字段
*/
@GeoPointField
private GeoPoint location;
/**
* 地址
*/
@Field(type = FieldType.Text, searchAnalyzer = "ik_max_word", analyzer = "ik_max_word")
private String address;
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ConstructionInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidConstructionInfo.java
View file @ 84d0639a
......@@ -17,7 +17,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_construction_info")
public class ConstructionInfo extends AbstractEquipBaseEntity {
public class MidConstructionInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/OtherInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipOtherInfo.java
View file @ 84d0639a
......@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_other_info")
public class OtherInfo extends AbstractEquipBaseEntity {
public class MidEquipOtherInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ProduceInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipProduceInfo.java
View file @ 84d0639a
......@@ -17,7 +17,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_factory_info")
public class ProduceInfo extends AbstractEquipBaseEntity {
public class MidEquipProduceInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/ProtectionDevices.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipProtectionDevices.java
View file @ 84d0639a
......@@ -19,7 +19,7 @@ import java.util.Date;
@Accessors(chain = true)
@ApiModel(value="MidEquipProtectionDevices对象", description="")
@TableName(value = "mid_equip_protection_devices")
public class ProtectionDevices extends AbstractEquipBaseEntity {
public class MidEquipProtectionDevices extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/RegistrationInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipRegistrationInfo.java
View file @ 84d0639a
......@@ -17,7 +17,7 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_register_info")
public class RegistrationInfo extends AbstractEquipBaseEntity {
public class MidEquipRegistrationInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipTechParamBoiler.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipTechParamBoiler.java
View file @ 84d0639a
......@@ -18,7 +18,7 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_tech_param_boiler")
public class EquipTechParamBoiler extends AbstractEquipBaseEntity {
public class MidEquipTechParamBoiler extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipTechParamElevator.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipTechParamElevator.java
View file @ 84d0639a
......@@ -17,7 +17,7 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_tech_param_elevator")
public class EquipTechParamElevator extends AbstractEquipBaseEntity {
public class MidEquipTechParamElevator extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipTechParamLifting.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipTechParamLifting.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* 安全追溯-起重机械
*
......@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_tech_param_lifting")
public class EquipTechParamLifting extends AbstractEquipBaseEntity {
public class MidEquipTechParamLifting extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipTechParamPipeline.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipTechParamPipeline.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* 安全追溯-压力管道
*
......@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_tech_param_pipeline")
public class EquipTechParamPipeline extends AbstractEquipBaseEntity {
public class MidEquipTechParamPipeline extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipTechParamRides.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipTechParamRides.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* 安全追溯-游乐设施
*
......@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_tech_param_rides")
public class EquipTechParamRides extends AbstractEquipBaseEntity {
public class MidEquipTechParamRides extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipTechParamRopeway.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipTechParamRopeway.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* 安全追溯-索道
*
......@@ -22,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@Data
@Accessors(chain = true)
@TableName(value = "mid_equip_tech_param_ropeway")
public class EquipTechParamRopeway extends AbstractEquipBaseEntity{
public class MidEquipTechParamRopeway extends AbstractEquipBaseEntity{
private static final long serialVersionUID = 1L;
/**
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipTechParamVehicle.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipTechParamVehicle.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* 安全追溯-场内车辆
*
......@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_tech_param_vehicle")
public class EquipTechParamVehicle extends AbstractEquipBaseEntity {
public class MidEquipTechParamVehicle extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/EquipTechParamVessel.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidEquipTechParamVessel.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* 安全追溯-压力容器
*
......@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_tech_param_vessel")
public class EquipTechParamVessel extends AbstractEquipBaseEntity {
public class MidEquipTechParamVessel extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MaintenanceInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidMaintenanceInfo.java
View file @ 84d0639a
......@@ -17,7 +17,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_maintenance_record_info")
public class MaintenanceInfo extends AbstractEquipBaseEntity {
public class MidMaintenanceInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/StaffBaseInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidStaffBaseInfo.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* 人员数据信息-基本信息
*
......@@ -21,7 +18,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_staff_base_info")
public class StaffBaseInfo extends AbstractEquipBaseEntity {
public class MidStaffBaseInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/StaffQualifInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MidStaffQualifInfo.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
/**
* 人员数据信息-资质信息
*
......@@ -21,7 +18,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_staff_qualif_info")
public class StaffQualifInfo extends AbstractEquipBaseEntity {
public class MidStaffQualifInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/SuperviseInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MiddEquipSuperviseInfo.java
View file @ 84d0639a
......@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_supervision_info")
public class SuperviseInfo extends AbstractEquipBaseEntity {
public class MiddEquipSuperviseInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
private String record;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/UseInfo.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MiddEquipUseInfo.java
View file @ 84d0639a
......@@ -18,7 +18,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("mid_equip_use_info")
public class UseInfo extends AbstractEquipBaseEntity {
public class MiddEquipUseInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MainParts.java → amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/entity/MiddMainParts.java
View file @ 84d0639a
......@@ -20,7 +20,7 @@ import java.util.Date;
@Accessors(chain = true)
@ApiModel(value="MidEquipMainParts对象", description="")
@TableName(value = "mid_equip_main_parts")
public class MainParts extends AbstractEquipBaseEntity {
public class MiddMainParts extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/BaseEnterpriseInfoService.java
View file @ 84d0639a
......@@ -15,7 +15,7 @@ import java.util.Set;
@DS("tzs")
@Component
public class BaseEnterpriseInfoService extends AppBaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper> {
@DS("tzs")
public List<TzBaseEnterpriseInfoDto> getEnterpriseInfoByCreditCode(@Condition(Operator.in) Set<String> useCode) {
return this.queryForList("", false, useCode);
}
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ConstructionInfoService.java
View file @ 84d0639a
......@@ -2,7 +2,7 @@ package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.ConstructionInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidConstructionInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidConstructionInfo;
import com.yeejoin.amos.api.openapi.feign.TzsServiceFeignClient;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
......@@ -22,7 +22,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class ConstructionInfoService extends AppBaseService<ConstructionInfoModel, ConstructionInfo, MidConstructionInfoMapper> {
public class ConstructionInfoService extends AppBaseService<ConstructionInfoModel, MidConstructionInfo, MidConstructionInfoMapper> {
private static final Logger logger = LogManager.getLogger(ConstructionInfoService.class);
@Autowired
......@@ -32,7 +32,7 @@ public class ConstructionInfoService extends AppBaseService<ConstructionInfoMode
* @param constructionInfo 施工信息
* @return "OK"
*/
public String saveConstructionInfo(ConstructionInfo constructionInfo) {
public String saveConstructionInfo(MidConstructionInfo constructionInfo) {
try {
tzsServiceFeignClient.saveConstructionInfo(constructionInfo);
} catch (Exception e) {
......@@ -51,12 +51,12 @@ public class ConstructionInfoService extends AppBaseService<ConstructionInfoMode
* @return 成功返回“OK”
*/
@Transactional(rollbackFor= {Exception.class})
public String saveConstructionInfo(List<ConstructionInfo> model) {
public String saveConstructionInfo(List<MidConstructionInfo> model) {
//TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model)) {
throw new BadRequest("施工信息为空.");
}
for (ConstructionInfo models : model) {
for (MidConstructionInfo models : model) {
// checkModel(models);
models.setRecDate(new Date());
models.setAppId(getAppId());
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/CylinderDateInfoService.java
View file @ 84d0639a
......@@ -6,7 +6,7 @@ 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.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.dao.TmCylinderDateInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderDateInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFilling;
import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingCheck;
......@@ -45,7 +45,7 @@ import java.util.List;
* @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
*/
@Component
public class CylinderDateInfoService extends BaseService<CylinderDateInfoModel, CylinderDateInfo, CylinderDateInfoMapper> {
public class CylinderDateInfoService extends BaseService<CylinderDateInfoModel, CylinderDateInfo, TmCylinderDateInfoMapper> {
@Autowired
private RedisTemplate redisTemplate;
@Autowired
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamBoilerService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.EquipTechParamBoilerModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamBoilerMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamBoiler;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.api.openapi.face.model.MidEquipTechParamBoilerModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipTechParamBoilerMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamBoiler;
public class EquipTechParamBoilerService extends AppBaseService<EquipTechParamBoilerModel, EquipTechParamBoiler, EquipTechParamBoilerMapper>{
public class EquipTechParamBoilerService extends AppBaseService<MidEquipTechParamBoilerModel, MidEquipTechParamBoiler, MidEquipTechParamBoilerMapper>{
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamElevatorService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamElevatorMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamElevator;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipTechParamElevatorMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamElevator;
public class EquipTechParamElevatorService extends AppBaseService<EquipTechParamElevatorMapper, EquipTechParamElevator,EquipTechParamElevatorMapper> {
public class EquipTechParamElevatorService extends AppBaseService<MidEquipTechParamElevatorMapper, MidEquipTechParamElevator, MidEquipTechParamElevatorMapper> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamLiftingService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.EquipTechParamLiftingModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamLiftingMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamLifting;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.api.openapi.face.model.MidEquipTechParamLiftingModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipTechParamLiftingMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamLifting;
public class EquipTechParamLiftingService extends AppBaseService<EquipTechParamLiftingModel, EquipTechParamLifting, EquipTechParamLiftingMapper> {
public class EquipTechParamLiftingService extends AppBaseService<MidEquipTechParamLiftingModel, MidEquipTechParamLifting, MidEquipTechParamLiftingMapper> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamPipelineService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.EquipTechParamPipelineModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamPipelineMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamPipeline;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.api.openapi.face.model.MidEquipTechParamPipelineModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipTechParamPipelineMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamPipeline;
public class EquipTechParamPipelineService extends AppBaseService<EquipTechParamPipelineModel, EquipTechParamPipeline, EquipTechParamPipelineMapper>{
public class EquipTechParamPipelineService extends AppBaseService<MidEquipTechParamPipelineModel, MidEquipTechParamPipeline, MidEquipTechParamPipelineMapper>{
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamRidesService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.EquipTechParamRidesModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamRidesMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRides;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.api.openapi.face.model.MidEquipTechParamRidesModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipTechParamRidesMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamRides;
public class EquipTechParamRidesService extends AppBaseService<EquipTechParamRidesModel, EquipTechParamRides, EquipTechParamRidesMapper>{
public class EquipTechParamRidesService extends AppBaseService<MidEquipTechParamRidesModel, MidEquipTechParamRides, MidEquipTechParamRidesMapper>{
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamRopewayService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.EquipTechParamRopewayModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamRopewayMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRopeway;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.api.openapi.face.model.MidEquipTechParamRopewayModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipTechParamRopewayMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamRopeway;
public class EquipTechParamRopewayService extends AppBaseService<EquipTechParamRopewayModel, EquipTechParamRopeway, EquipTechParamRopewayMapper> {
public class EquipTechParamRopewayService extends AppBaseService<MidEquipTechParamRopewayModel, MidEquipTechParamRopeway, MidEquipTechParamRopewayMapper> {
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamVehicleService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.EquipTechParamVehicleModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamVehicleMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVehicle;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.api.openapi.face.model.MidEquipTechParamVehicleModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipTechParamVehicleMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamVehicle;
public class EquipTechParamVehicleService extends AppBaseService<EquipTechParamVehicleModel, EquipTechParamVehicle,EquipTechParamVehicleMapper>{
public class EquipTechParamVehicleService extends AppBaseService<MidEquipTechParamVehicleModel, MidEquipTechParamVehicle, MidEquipTechParamVehicleMapper>{
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipTechParamVesselService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.EquipTechParamVesselModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamVesselMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamVessel;
import org.springframework.stereotype.Service;
import com.yeejoin.amos.api.openapi.face.model.MidEquipTechParamVesselModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipTechParamVesselMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamVessel;
public class EquipTechParamVesselService extends AppBaseService<EquipTechParamVesselModel, EquipTechParamVessel, EquipTechParamVesselMapper>{
public class EquipTechParamVesselService extends AppBaseService<MidEquipTechParamVesselModel, MidEquipTechParamVessel, MidEquipTechParamVesselMapper>{
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipmentCategoryService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import java.util.List;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.yeejoin.amos.api.openapi.face.model.EquipmentCategoryModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipmentCategoryMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipmentCategory;
/**
*
* <pre>
* 装备分类 服务类
* </pre>
*
* @author gwb
* @version $Id: EquipmentCategoryService.java, v 0.1 2021年10月15日 下午2:28:29 gwb Exp $
*/
@Component
public class EquipmentCategoryService extends
BaseService<EquipmentCategoryModel, EquipmentCategory, EquipmentCategoryMapper>
{
/**
*
* <pre>
* 查询所有装备分类
* </pre>
*
* @return
*/
public List<EquipmentCategoryModel> queryAllForlist()
{
return this.queryForList("id", true);
}
}
//package com.yeejoin.amos.api.openapi.face.service;
//
//import java.util.List;
//
//import org.springframework.stereotype.Component;
//import org.typroject.tyboot.core.rdbms.service.BaseService;
//
//import com.yeejoin.amos.api.openapi.face.model.EquipmentCategoryModel;
//import com.yeejoin.amos.api.openapi.face.orm.dao.EquipmentCategoryMapper;
//import com.yeejoin.amos.api.openapi.face.orm.entity.EquipmentCategory;
//
///**
// *
// * <pre>
// * 装备分类 服务类
// * </pre>
// *
// * @author gwb
// * @version $Id: EquipmentCategoryService.java, v 0.1 2021年10月15日 下午2:28:29 gwb Exp $
// */
//@Component
//public class EquipmentCategoryService extends
// BaseService<EquipmentCategoryModel, EquipmentCategory, EquipmentCategoryMapper>
//{
//
// /**
// *
// * <pre>
// * 查询所有装备分类
// * </pre>
// *
// * @return
// */
// public List<EquipmentCategoryModel> queryAllForlist()
// {
// return this.queryForList("id", true);
// }
//
//}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EquipmentService.java
View file @ 84d0639a
......@@ -8,15 +8,15 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.api.openapi.face.model.EquipmentModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipmentMapper;
import com.yeejoin.amos.api.openapi.face.orm.dao.TmEquipmentMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.Equipment;
import com.yeejoin.amos.api.openapi.face.orm.entity.PageParam;
@Service
public class EquipmentService extends AppBaseService<EquipmentModel, Equipment, EquipmentMapper> {
public class EquipmentService extends AppBaseService<EquipmentModel, Equipment, TmEquipmentMapper> {
@Autowired
EquipmentMapper equipmentMapper;
TmEquipmentMapper equipmentMapper;
public IPage<EquipmentModel> page(PageParam pageParam, Date startTime,Date endTime) {
Page<EquipmentModel> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/MainPartsServiceImpl.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.MainPartsModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipMainPartsMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MainParts;
import com.yeejoin.amos.api.openapi.face.orm.dao.MiddEquipMainPartsMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddMainParts;
/**
* 服务实现类
......@@ -10,6 +10,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.MainParts;
* @author duanwei
* @date 2023-04-10
*/
public class MainPartsServiceImpl extends AppBaseService<MainPartsModel, MainParts, MidEquipMainPartsMapper>{
public class MainPartsServiceImpl extends AppBaseService<MainPartsModel, MiddMainParts, MiddEquipMainPartsMapper>{
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/MaintenanceInfoService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.MaintenanceInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MaintenanceInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo;
import com.yeejoin.amos.api.openapi.face.model.MidMaintenanceInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidMaintenanceInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidMaintenanceInfo;
import com.yeejoin.amos.api.openapi.feign.TzsServiceFeignClient;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
......@@ -24,7 +24,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class MaintenanceInfoService extends AppBaseService<MaintenanceInfoModel, MaintenanceInfo, MaintenanceInfoMapper> {
public class MaintenanceInfoService extends AppBaseService<MidMaintenanceInfoModel, MidMaintenanceInfo, MidMaintenanceInfoMapper> {
private static final Logger logger = LogManager.getLogger(ConstructionInfoService.class);
......@@ -41,7 +41,7 @@ public class MaintenanceInfoService extends AppBaseService<MaintenanceInfoModel,
* @return 成功返回“OK”
*/
@Transactional(rollbackFor = {Exception.class})
public String saveMaintenanceInfo(MaintenanceInfo maintenanceInfo) {
public String saveMaintenanceInfo(MidMaintenanceInfo maintenanceInfo) {
try {
tzsServiceFeignClient.saveMaintenanceRecordInfo(maintenanceInfo);
} catch (Exception e) {
......@@ -58,18 +58,18 @@ public class MaintenanceInfoService extends AppBaseService<MaintenanceInfoModel,
* @return 成功返回“OK”
*/
@Transactional(rollbackFor = {Exception.class})
public String saveMaintenanceInfo(List<MaintenanceInfoModel> model) {
public String saveMaintenanceInfo(List<MidMaintenanceInfoModel> model) {
// TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model)) {
throw new BadRequest("维保备案信息为空.");
}
List<MaintenanceInfo> mainList = new ArrayList<>();
List<MidMaintenanceInfo> mainList = new ArrayList<>();
// List<JgFile> fileList = new ArrayList<>();
// List<JgFile> repairInformList;
for (MaintenanceInfoModel models : model) {
MaintenanceInfo maintenanceInfo = new MaintenanceInfo();
for (MidMaintenanceInfoModel models : model) {
MidMaintenanceInfo maintenanceInfo = new MidMaintenanceInfo();
// checkModel(models);
models.setRecDate(new Date());
models.setAppId(getAppId());
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/OtherInfoService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.OtherInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.OtherInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipOtherInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipOtherInfo;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......@@ -18,7 +18,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class OtherInfoService extends AppBaseService<OtherInfoModel, OtherInfo, OtherInfoMapper> {
public class OtherInfoService extends AppBaseService<OtherInfoModel, MidEquipOtherInfo, MidEquipOtherInfoMapper> {
/**
*
......@@ -28,13 +28,13 @@ public class OtherInfoService extends AppBaseService<OtherInfoModel, OtherInfo,
* @return 成功返回“OK”
*/
@Transactional(rollbackFor= {Exception.class})
public String saveOtherInfo(List<OtherInfo> model) {
public String saveOtherInfo(List<MidEquipOtherInfo> model) {
// TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model)) {
throw new BadRequest("其他信息为空.");
}
for (OtherInfo models : model) {
for (MidEquipOtherInfo models : model) {
// checkModel(models);
models.setRecDate(new Date());
models.setAppId(getAppId());
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ProduceInfoService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
import com.yeejoin.amos.api.openapi.face.model.ProduceInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.ProduceInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.JgFile;
import com.yeejoin.amos.api.openapi.face.orm.entity.ProduceInfo;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipProduceInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipProduceInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -23,7 +18,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class ProduceInfoService extends AppBaseService<ProduceInfoModel, ProduceInfo, ProduceInfoMapper> {
public class ProduceInfoService extends AppBaseService<ProduceInfoModel, MidEquipProduceInfo, MidEquipProduceInfoMapper> {
@Autowired
private JgFileService fileService;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ProtectionDevicesServiceImpl.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.ProtectionDevicesModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipProtectionDevicesMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ProtectionDevices;
import com.yeejoin.amos.api.openapi.face.orm.dao.MiddEquipProtectionDevicesMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipProtectionDevices;
/**
* 服务实现类
......@@ -10,6 +10,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.ProtectionDevices;
* @author duanwei
* @date 2023-04-10
*/
public class ProtectionDevicesServiceImpl extends AppBaseService<ProtectionDevicesModel, ProtectionDevices, MidEquipProtectionDevicesMapper>{
public class ProtectionDevicesServiceImpl extends AppBaseService<ProtectionDevicesModel, MidEquipProtectionDevices, MiddEquipProtectionDevicesMapper>{
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/RegistrationInfoService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
import com.yeejoin.amos.api.openapi.face.model.RegistrationInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.RegistrationInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.JgFile;
import com.yeejoin.amos.api.openapi.face.orm.entity.RegistrationInfo;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidEquipRegistrationInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipRegistrationInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -24,7 +19,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class RegistrationInfoService extends AppBaseService<RegistrationInfoModel, RegistrationInfo, RegistrationInfoMapper> {
public class RegistrationInfoService extends AppBaseService<RegistrationInfoModel, MidEquipRegistrationInfo, MidEquipRegistrationInfoMapper> {
@Autowired
private JgFileService fileService;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/StaffBaseInfoService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.StaffBaseInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.StaffBaseInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.StaffBaseInfo;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidStaffBaseInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidStaffBaseInfo;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......@@ -18,7 +18,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class StaffBaseInfoService extends AppBaseService<StaffBaseInfoModel, StaffBaseInfo, StaffBaseInfoMapper> {
public class StaffBaseInfoService extends AppBaseService<StaffBaseInfoModel, MidStaffBaseInfo, MidStaffBaseInfoMapper> {
/**
*
......@@ -28,13 +28,13 @@ public class StaffBaseInfoService extends AppBaseService<StaffBaseInfoModel, Sta
* @return 成功返回“OK”
*/
@Transactional(rollbackFor= {Exception.class})
public String saveStaffBaseInfo(List<StaffBaseInfo> model) {
public String saveStaffBaseInfo(List<MidStaffBaseInfo> model) {
// TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model)) {
throw new BadRequest("人员基本信息为空.");
}
for (StaffBaseInfo models : model) {
for (MidStaffBaseInfo models : model) {
// checkModel(models);
models.setRecDate(new Date());
models.setAppId(getAppId());
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/StaffQualifInfoService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
import com.yeejoin.amos.api.openapi.face.model.StaffQualifInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.StaffQualifInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.JgFile;
import com.yeejoin.amos.api.openapi.face.orm.entity.StaffQualifInfo;
import com.yeejoin.amos.api.openapi.face.orm.dao.MidStaffQualifInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MidStaffQualifInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -24,7 +19,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class StaffQualifInfoService extends AppBaseService<StaffQualifInfoModel, StaffQualifInfo, StaffQualifInfoMapper> {
public class StaffQualifInfoService extends AppBaseService<StaffQualifInfoModel, MidStaffQualifInfo, MidStaffQualifInfoMapper> {
@Autowired
private JgFileService fileService;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SuperviseInfoService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.SuperviseInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.SuperviseInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo;
import com.yeejoin.amos.api.openapi.face.orm.dao.MiddEquipSuperviseInfoMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipSuperviseInfo;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......@@ -18,7 +18,7 @@ import java.util.List;
* @date 2022-07-19
*/
@Component
public class SuperviseInfoService extends AppBaseService<SuperviseInfoModel, SuperviseInfo, SuperviseInfoMapper> {
public class SuperviseInfoService extends AppBaseService<SuperviseInfoModel, MiddEquipSuperviseInfo, MiddEquipSuperviseInfoMapper> {
/**
*
......@@ -28,12 +28,12 @@ public class SuperviseInfoService extends AppBaseService<SuperviseInfoModel, Sup
* @return 成功返回“OK”
*/
@Transactional(rollbackFor= {Exception.class})
public String saveSuperviseInfo(List<SuperviseInfo> model) {
public String saveSuperviseInfo(List<MiddEquipSuperviseInfo> model) {
// TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model)) {
throw new BadRequest("监督管理信息为空.");
}
for (SuperviseInfo models : model) {
for (MiddEquipSuperviseInfo models : model) {
// checkModel(models);
models.setRecDate(new Date());
models.setAppId(getAppId());
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TechInfoService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.common.restful.utils.ApplicationContextUtils;
import com.yeejoin.amos.api.openapi.constant.Constant;
import com.yeejoin.amos.api.openapi.enums.EightCategorySubformEnum;
import com.yeejoin.amos.api.openapi.enums.EquipTypeEnum;
import com.yeejoin.amos.api.openapi.face.model.BizTokenModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.EquipTechParamBoilerMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractEquipBaseEntity;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamRopeway;
import net.sf.json.JSONObject;
import org.apache.catalina.core.ApplicationContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.ui.context.support.UiApplicationContextUtils;
import org.typroject.tyboot.component.cache.Redis;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingCheckService.java
View file @ 84d0639a
......@@ -4,12 +4,16 @@ package com.yeejoin.amos.api.openapi.face.service;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderFillingCheckDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderFillingDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
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.rdbms.service.BaseService;
import com.yeejoin.amos.api.openapi.constant.Constant;
......@@ -32,12 +36,15 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingCheck;
public class TmCylinderFillingCheckService extends BaseService<TmCylinderFillingCheckModel, TmCylinderFillingCheck, TmCylinderFillingCheckMapper> {
@Autowired
private RedisTemplate redisTemplate;
@Transactional(rollbackFor= {Exception.class})
@Autowired
private SyncCylinderDataService syncCylinderDataService;
@DSTransactional
public String createCylinderFillingAfter(List<TmCylinderFillingCheckModel> model) {
// TODO Auto-generated method stub
// if (ValidationUtil.isEmpty(model))
// throw new BadRequest("气瓶标签信息为空.");
syncCylinderFillingAfter(model);
for (TmCylinderFillingCheckModel cylinderFillingCheckModel : model) {
cylinderFillingCheckModel.setRecDate(new Date());
cylinderFillingCheckModel.setAppId(getAppId());
......@@ -46,6 +53,10 @@ public class TmCylinderFillingCheckService extends BaseService<TmCylinderFilling
return "OK";
}
private void syncCylinderFillingAfter(List<TmCylinderFillingCheckModel> model) {
syncCylinderDataService.syncCylinderFillingAfter(model);
}
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/face/service/TmCylinderFillingExamineService.java
View file @ 84d0639a
......@@ -4,12 +4,17 @@ package com.yeejoin.amos.api.openapi.face.service;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderUnitModel;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderFillingExamineDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
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;
......@@ -34,12 +39,16 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingExamine;
public class TmCylinderFillingExamineService extends BaseService<TmCylinderFillingExamineModel, TmCylinderFillingExamine, TmCylinderFillingExamineMapper> {
@Autowired
private RedisTemplate redisTemplate;
@Transactional(rollbackFor= {Exception.class})
@Autowired
private SyncCylinderDataService syncCylinderDataService;
@DSTransactional
public String createCylinderFillingExamine(List<TmCylinderFillingExamineModel> model) {
// TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model))
throw new BadRequest("液化气体气瓶充装信息审核为空.");
syncCylinderFillingExamine(model);
for (TmCylinderFillingExamineModel cylinderFillingExamineModel : model) {
cylinderFillingExamineModel.setRecDate(new Date());
cylinderFillingExamineModel.setAppId(getAppId());
......@@ -53,4 +62,8 @@ public class TmCylinderFillingExamineService extends BaseService<TmCylinderFilli
BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);
return bizTokenModel.getAppId();
}
private void syncCylinderFillingExamine(List<TmCylinderFillingExamineModel> model ) {
syncCylinderDataService.syncCylinderFillingExamine(model);
}
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingRecordService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderFillingRecordRepository;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderFillingRecordDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderFillingRecordDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.entity.CylinderFillingRecord;
import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderFillingRecordMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
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.rdbms.service.BaseService;
import com.yeejoin.amos.api.openapi.constant.Constant;
......@@ -32,12 +47,22 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingRecord;
public class TmCylinderFillingRecordService extends BaseService<TmCylinderFillingRecordModel, TmCylinderFillingRecord, TmCylinderFillingRecordMapper> {
@Autowired
private RedisTemplate redisTemplate;
@Transactional(rollbackFor= {Exception.class})
@Autowired
CylinderFillingRecordMapper cylinderFillingRecordMapper;
@Autowired
ESCylinderFillingRecordRepository esCylinderFillingRecordRepository;
@Autowired
private SyncCylinderDataService syncCylinderDataService;
@DSTransactional
public String createCylinderFilling(List<TmCylinderFillingRecordModel> model) {
// TODO Auto-generated method stub
// if (ValidationUtil.isEmpty(model))
// throw new BadRequest("气瓶标签信息为空.");
syncCylinderFilling(model);
for (TmCylinderFillingRecordModel cylinderFillingRecordModel : model) {
cylinderFillingRecordModel.setRecDate(new Date());
cylinderFillingRecordModel.setAppId(getAppId());
......@@ -46,6 +71,14 @@ public class TmCylinderFillingRecordService extends BaseService<TmCylinderFillin
return "OK";
}
@DS("tzs")
private void syncCylinderFilling(List<TmCylinderFillingRecordModel> model) {
syncCylinderDataService.syncCylinderFillingRecord(model);
ArrayList<ESCylinderFillingRecordDto> models = Bean.toModels(model, ESCylinderFillingRecordDto.class);
syncCylinderDataService.createCylinderFillingRecord(models);
}
private String getAppId() {
String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX,RequestContext.getToken());
BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);
......@@ -55,4 +88,5 @@ public class TmCylinderFillingRecordService extends BaseService<TmCylinderFillin
public List<String> getDateList() {
return baseMapper.getDateList();
}
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingService.java
View file @ 84d0639a
......@@ -4,12 +4,18 @@ package com.yeejoin.amos.api.openapi.face.service;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderUnitModel;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderFillingDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInfoDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
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.rdbms.service.BaseService;
import com.yeejoin.amos.api.openapi.constant.Constant;
......@@ -32,12 +38,16 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFilling;
public class TmCylinderFillingService extends BaseService<TmCylinderFillingModel, TmCylinderFilling, TmCylinderFillingMapper> {
@Autowired
private RedisTemplate redisTemplate;
@Transactional(rollbackFor= {Exception.class})
@Autowired
private SyncCylinderDataService syncCylinderDataService;
@DSTransactional
public String createCylinderFillingBefore(List<TmCylinderFillingModel> model) {
// TODO Auto-generated method stub
// if (ValidationUtil.isEmpty(model))
// throw new BadRequest("气瓶标签信息为空.");
syncCylinderFillingBefore(model);
for (TmCylinderFillingModel cylinderFillingModel : model) {
cylinderFillingModel.setRecDate(new Date());
cylinderFillingModel.setAppId(getAppId());
......@@ -46,11 +56,15 @@ public class TmCylinderFillingService extends BaseService<TmCylinderFillingModel
return "OK";
}
private void syncCylinderFillingBefore(List<TmCylinderFillingModel> model) {
syncCylinderDataService.syncCylinderFillingBefore(model);
}
private String getAppId() {
String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX,RequestContext.getToken());
BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);
return bizTokenModel.getAppId();
}
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderInfoService.java
View file @ 84d0639a
package com.yeejoin.amos.api.openapi.face.service;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.google.common.collect.Lists;
import com.yeejoin.amos.api.openapi.face.model.TmCylinderUnitModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.ESCylinderInfoRepository;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.cylinder.api.entity.ESCylinderInfoDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInfoDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.mapper.CylinderInfoMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StopWatch;
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;
......@@ -31,25 +47,44 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInfo;
* @version $Id: ElevatorService.java, v 0.1 2021年9月30日 下午3:28:55 gwb Exp $
*/
@Component
@Slf4j
public class TmCylinderInfoService extends BaseService<TmCylinderInfoModel, TmCylinderInfo, TmCylinderInfoMapper> {
@Autowired
private RedisTemplate redisTemplate;
@Transactional(rollbackFor= {Exception.class})
@Autowired
CylinderInfoMapper cylinderInfoMapper;
@Autowired
private SyncCylinderDataService syncCylinderDataService;
@Autowired
ESCylinderInfoRepository esCylinderInfoRepository;
@DSTransactional
public String createCylinderInfo(List<TmCylinderInfoModel> model) {
// TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model))
throw new BadRequest("气瓶基本信息数据为空.");
syncCylinderInfo(model);
for (TmCylinderInfoModel cylinderInfoModel : model) {
cylinderInfoModel.setRecDate(new Date());
cylinderInfoModel.setAppId(getAppId());
syncCylinderDataService.createCylinderInfo2ES(cylinderInfoModel);
this.createWithModel(cylinderInfoModel);
}
return "OK";
}
private void syncCylinderInfo(List<TmCylinderInfoModel> model ) {
syncCylinderDataService.syncCylinderInfo(model);
}
private String getAppId() {
String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX,RequestContext.getToken());
BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);
return bizTokenModel.getAppId();
}
}
amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderInspectionService.java
View file @ 84d0639a
......@@ -4,12 +4,16 @@ package com.yeejoin.amos.api.openapi.face.service;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInspectionDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderUnitDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
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;
......@@ -34,11 +38,14 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInspection;
public class TmCylinderInspectionService extends BaseService<TmCylinderInspectionModel, TmCylinderInspection, TmCylinderInspectionMapper> {
@Autowired
private RedisTemplate redisTemplate;
@Transactional(rollbackFor= {Exception.class})
@Autowired
private SyncCylinderDataService syncCylinderDataService;
@DSTransactional
public String createCylinderInspection(List<TmCylinderInspectionModel> model) {
if (ValidationUtil.isEmpty(model))
throw new BadRequest("气瓶检验信息为空.");
syncCylinderInspectionModel(model);
for (TmCylinderInspectionModel cylinderInspectionModel : model) {
cylinderInspectionModel.setRecDate(new Date());
cylinderInspectionModel.setAppId(getAppId());
......@@ -47,6 +54,10 @@ public class TmCylinderInspectionService extends BaseService<TmCylinderInspectio
return "OK";
}
private void syncCylinderInspectionModel(List<TmCylinderInspectionModel> model) {
syncCylinderDataService.syncCylinderInspection(model);
}
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/face/service/TmCylinderTagsService.java
View file @ 84d0639a
......@@ -4,12 +4,16 @@ package com.yeejoin.amos.api.openapi.face.service;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderInspectionDto;
import com.yeejoin.amos.boot.module.cylinder.flc.api.dto.CylinderTagsDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
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;
......@@ -34,12 +38,15 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderTags;
public class TmCylinderTagsService extends BaseService<TmCylinderTagsModel, TmCylinderTags, TmCylinderTagsMapper> {
@Autowired
private RedisTemplate redisTemplate;
@Transactional(rollbackFor= {Exception.class})
@Autowired
private SyncCylinderDataService syncCylinderDataService;
@DSTransactional
public String createCylinderTag(List<TmCylinderTagsModel> model) {
// TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model))
throw new BadRequest("气瓶标签信息为空.");
syncCylinderTag(model);
for (TmCylinderTagsModel cylinderTagsModel : model) {
cylinderTagsModel.setRecDate(new Date());
cylinderTagsModel.setAppId(getAppId());
......@@ -48,6 +55,10 @@ public class TmCylinderTagsService extends BaseService<TmCylinderTagsModel, TmCy
return "OK";
}
private void syncCylinderTag(List<TmCylinderTagsModel> model) {
syncCylinderDataService.syncCylinderTag(model);
}
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/face/service/TmCylinderUnitService.java
View file @ 84d0639a
......@@ -4,6 +4,7 @@ package com.yeejoin.amos.api.openapi.face.service;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
......@@ -39,11 +40,12 @@ public class TmCylinderUnitService extends BaseService<TmCylinderUnitModel, TmCy
private RedisTemplate redisTemplate;
@Autowired
private SyncCylinderDataService syncCylinderDataService;
@Transactional(rollbackFor= {Exception.class})
@DSTransactional
public String createCylinderUnit(List<TmCylinderUnitModel> model) {
if (ValidationUtil.isEmpty(model))
throw new BadRequest("气瓶企业信息数据为空.");
syncCylinderUnitModel(model);
for (TmCylinderUnitModel cylinderUnitModel : model) {
cylinderUnitModel.setRecDate(new Date());
cylinderUnitModel.setAppId(getAppId());
......@@ -52,8 +54,7 @@ public class TmCylinderUnitService extends BaseService<TmCylinderUnitModel, TmCy
return "OK";
}
private void syncCylinderUnitModel(List<TmCylinderUnitModel> model ) {
List<CylinderUnitDto> cylinderUnitDto = Bean.toModels(model,CylinderUnitDto.class);
syncCylinderDataService.syncCylinderUnit(cylinderUnitDto);
syncCylinderDataService.syncCylinderUnit(model);
}
private String getAppId() {
String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX,RequestContext.getToken());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment