Commit 18c97b41 authored by 刘林's avatar 刘林

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

parents c422cd79 87fcd234
...@@ -186,7 +186,13 @@ ...@@ -186,7 +186,13 @@
<artifactId>tablesaw-excel</artifactId> <artifactId>tablesaw-excel</artifactId>
<version>0.43.1</version> <version>0.43.1</version>
</dependency> </dependency>
</dependencies> <dependency>
<groupId>com.amosframework.boot</groupId>
<artifactId>amos-boot-module-cylinder-api</artifactId>
<version>1.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -16,6 +16,7 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient; ...@@ -16,6 +16,7 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
...@@ -40,9 +41,15 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler; ...@@ -40,9 +41,15 @@ import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
@EnableAsync @EnableAsync
@EnableEurekaClient @EnableEurekaClient
@EnableScheduling @EnableScheduling
@MapperScan(value = { "org.typroject.tyboot.*.*.face.orm.dao", "com.yeejoin.amos.api.*.face.orm.dao", "org.typroject.tyboot.face.*.orm.dao*", @MapperScan(value = { "org.typroject.tyboot.*.*.face.orm.dao",
"com.yeejoin.amos.api.*.face.orm.dao",
"org.typroject.tyboot.face.*.orm.dao*",
"com.yeejoin.amos.boot.module.cylinder.api.mapper",
"com.yeejoin.amos.boot.biz.common.dao.mapper" }) "com.yeejoin.amos.boot.biz.common.dao.mapper" })
@ComponentScan({ "org.typroject", "com.yeejoin.amos" }) @ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" }, excludeFilters = @ComponentScan.Filter(
type = FilterType.REGEX,
pattern = "com.yeejoin.amos.boot.biz.common.controller.*|com.yeejoin.amos.boot.module.common.api.core.framework.*"
))
public class OpenapiApplication { public class OpenapiApplication {
private static final Logger logger = LogManager.getLogger(OpenapiApplication.class); private static final Logger logger = LogManager.getLogger(OpenapiApplication.class);
......
...@@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRequest; ...@@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRequest;
@Aspect @Aspect
@Component @Component
@Order(value = 0) @Order(value = 0)
public class ControllerAop { public class OpenApiControllerAop {
private static final Logger logger = LogManager.getLogger(ControllerAop.class); private static final Logger logger = LogManager.getLogger(OpenApiControllerAop.class);
@Autowired @Autowired
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
......
package com.yeejoin.amos.api.openapi.config; //package com.yeejoin.amos.api.openapi.config;
//
import feign.codec.Encoder; //import feign.codec.Encoder;
import feign.form.spring.SpringFormEncoder; //import feign.form.spring.SpringFormEncoder;
import org.springframework.beans.factory.ObjectFactory; //import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters; //import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.cloud.openfeign.support.SpringEncoder; //import org.springframework.cloud.openfeign.support.SpringEncoder;
import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
//
/** ///**
* @author DELL // * @author DELL
*/ // */
@Configuration //@Configuration
public class FeignConfiguration { //public class FeignConfiguration {
//
/** // /**
* 创建Feign请求拦截器,在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用 // * 创建Feign请求拦截器,在发送请求前设置认证的token,各个微服务将token设置到环境变量中来达到通用
* @return // * @return
*/ // */
@Bean // @Bean
public FeignAuthRequestInterceptor basicAuthRequestInterceptor() { // public FeignAuthRequestInterceptor basicAuthRequestInterceptor() {
return new FeignAuthRequestInterceptor(); // return new FeignAuthRequestInterceptor();
} // }
//
@Autowired // @Autowired
private ObjectFactory<HttpMessageConverters> messageConverters; // private ObjectFactory<HttpMessageConverters> messageConverters;
//
@Bean // @Bean
public Encoder feignComFormEncoder() { // public Encoder feignComFormEncoder() {
return new SpringFormEncoder(new SpringEncoder(messageConverters)); // return new SpringFormEncoder(new SpringEncoder(messageConverters));
} // }
//
//
} //}
...@@ -15,7 +15,7 @@ import org.springframework.web.context.request.RequestContextListener; ...@@ -15,7 +15,7 @@ import org.springframework.web.context.request.RequestContextListener;
* @Description: * @Description:
* @Date: 2020/3/30 16:26 * @Date: 2020/3/30 16:26
*/ */
@Configuration //@Configuration
public class MultipartSupportConfig { public class MultipartSupportConfig {
@Autowired @Autowired
......
...@@ -4,6 +4,8 @@ import java.util.HashMap; ...@@ -4,6 +4,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.yeejoin.amos.api.openapi.face.model.*;
import com.yeejoin.amos.api.openapi.face.service.*;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,28 +22,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest; ...@@ -20,28 +22,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import com.yeejoin.amos.api.common.restful.utils.ResponseHelper; import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
import com.yeejoin.amos.api.common.restful.utils.ResponseModel; import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
import com.yeejoin.amos.api.openapi.face.model.CylinderFillingCheckModel;
import com.yeejoin.amos.api.openapi.face.model.CylinderFillingExamineModel;
import com.yeejoin.amos.api.openapi.face.model.CylinderFillingExamineModelList;
import com.yeejoin.amos.api.openapi.face.model.CylinderFillingModel;
import com.yeejoin.amos.api.openapi.face.model.CylinderFillingModelList;
import com.yeejoin.amos.api.openapi.face.model.CylinderFillingRecordModel;
import com.yeejoin.amos.api.openapi.face.model.CylinderInfoModel;
import com.yeejoin.amos.api.openapi.face.model.CylinderInfoModelList;
import com.yeejoin.amos.api.openapi.face.model.CylinderInspectionModel;
import com.yeejoin.amos.api.openapi.face.model.CylinderInspectionModelList;
import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModel;
import com.yeejoin.amos.api.openapi.face.model.CylinderTagsModelList;
import com.yeejoin.amos.api.openapi.face.model.CylinderUnitModel;
import com.yeejoin.amos.api.openapi.face.model.CylinderUnitModelList;
import com.yeejoin.amos.api.openapi.face.service.CylinderFillingCheckService;
import com.yeejoin.amos.api.openapi.face.service.CylinderFillingExamineService;
import com.yeejoin.amos.api.openapi.face.service.CylinderFillingRecordService;
import com.yeejoin.amos.api.openapi.face.service.CylinderFillingService;
import com.yeejoin.amos.api.openapi.face.service.CylinderInfoService;
import com.yeejoin.amos.api.openapi.face.service.CylinderInspectionService;
import com.yeejoin.amos.api.openapi.face.service.CylinderTagsService;
import com.yeejoin.amos.api.openapi.face.service.CylinderUnitService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -53,27 +33,27 @@ import net.sf.json.JSONObject; ...@@ -53,27 +33,27 @@ import net.sf.json.JSONObject;
public class CylinderController { public class CylinderController {
private static final Logger logger = LogManager.getLogger(CylinderController.class); private static final Logger logger = LogManager.getLogger(CylinderController.class);
@Autowired @Autowired
private CylinderUnitService cylinderUnitService; private TmCylinderUnitService cylinderUnitService;
@Autowired @Autowired
private CylinderFillingCheckService cylinderFillingCheckService; private TmCylinderFillingCheckService cylinderFillingCheckService;
@Autowired @Autowired
private CylinderFillingExamineService cylinderFillingExamineService; private TmCylinderFillingExamineService cylinderFillingExamineService;
@Autowired @Autowired
private CylinderFillingRecordService cylinderFillingRecordService; private TmCylinderFillingRecordService cylinderFillingRecordService;
@Autowired @Autowired
private CylinderFillingService cylinderFillingService; private TmCylinderFillingService cylinderFillingService;
@Autowired @Autowired
private CylinderInfoService cylinderInfoService; private TmCylinderInfoService cylinderInfoService;
@Autowired @Autowired
private CylinderInspectionService cylinderInspectionService; private TmCylinderInspectionService cylinderInspectionService;
@Autowired @Autowired
private CylinderTagsService cylinderTagsService; private TmCylinderTagsService cylinderTagsService;
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "气瓶企业信息") @ApiOperation(value = "气瓶企业信息")
@PostMapping(value = "/unit") @PostMapping(value = "/unit")
@RestEventTrigger(value = "openapiLogEventHandler") @RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderUnit(@RequestBody List<CylinderUnitModel> unitData) throws Exception { public ResponseModel<String> cylinderUnit(@RequestBody List<TmCylinderUnitModel> unitData) throws Exception {
return ResponseHelper.buildResponse(cylinderUnitService.createCylinderUnit(unitData)); return ResponseHelper.buildResponse(cylinderUnitService.createCylinderUnit(unitData));
} }
...@@ -81,7 +61,7 @@ public class CylinderController { ...@@ -81,7 +61,7 @@ public class CylinderController {
@ApiOperation(value = "气瓶基础数据") @ApiOperation(value = "气瓶基础数据")
@PostMapping(value = "/info") @PostMapping(value = "/info")
@RestEventTrigger(value = "openapiLogEventHandler") @RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderInfo(@RequestBody List<CylinderInfoModel> infoData) throws Exception { public ResponseModel<String> cylinderInfo(@RequestBody List<TmCylinderInfoModel> infoData) throws Exception {
return ResponseHelper.buildResponse(cylinderInfoService.createCylinderInfo(infoData)); return ResponseHelper.buildResponse(cylinderInfoService.createCylinderInfo(infoData));
} }
...@@ -89,7 +69,7 @@ public class CylinderController { ...@@ -89,7 +69,7 @@ public class CylinderController {
@ApiOperation(value = "气瓶标签数据") @ApiOperation(value = "气瓶标签数据")
@PostMapping(value = "/tag") @PostMapping(value = "/tag")
@RestEventTrigger(value = "openapiLogEventHandler") @RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderTagInfo(@RequestBody List<CylinderTagsModel> tagData) throws Exception { public ResponseModel<String> cylinderTagInfo(@RequestBody List<TmCylinderTagsModel> tagData) throws Exception {
return ResponseHelper.buildResponse(cylinderTagsService.createCylinderTag(tagData)); return ResponseHelper.buildResponse(cylinderTagsService.createCylinderTag(tagData));
} }
...@@ -97,7 +77,7 @@ public class CylinderController { ...@@ -97,7 +77,7 @@ public class CylinderController {
@ApiOperation(value = "气瓶检验数据") @ApiOperation(value = "气瓶检验数据")
@PostMapping(value = "/inspection") @PostMapping(value = "/inspection")
@RestEventTrigger(value = "openapiLogEventHandler") @RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderInspectionInfo(@RequestBody List<CylinderInspectionModel> inspectionData) throws Exception { public ResponseModel<String> cylinderInspectionInfo(@RequestBody List<TmCylinderInspectionModel> inspectionData) throws Exception {
return ResponseHelper.buildResponse(cylinderInspectionService.createCylinderInspection(inspectionData)); return ResponseHelper.buildResponse(cylinderInspectionService.createCylinderInspection(inspectionData));
} }
...@@ -111,15 +91,15 @@ public class CylinderController { ...@@ -111,15 +91,15 @@ public class CylinderController {
logger.info("气瓶充装数据"+fillingData); logger.info("气瓶充装数据"+fillingData);
JSONObject jsonobject = JSONObject.fromObject(fillingData); JSONObject jsonobject = JSONObject.fromObject(fillingData);
Map<String, Class> classMap = new HashMap<String, Class>(); Map<String, Class> classMap = new HashMap<String, Class>();
classMap.put("fillingBefore", CylinderFillingModel.class); classMap.put("fillingBefore", TmCylinderFillingModel.class);
classMap.put("filling", CylinderFillingRecordModel.class); classMap.put("filling", TmCylinderFillingRecordModel.class);
classMap.put("fillingAfter", CylinderFillingCheckModel.class); classMap.put("fillingAfter", TmCylinderFillingCheckModel.class);
CylinderFillingModelList cylinderFillingModelList = (CylinderFillingModelList) JSONObject.toBean(jsonobject, TmCylinderFillingModelList cylinderFillingModelList = (TmCylinderFillingModelList) JSONObject.toBean(jsonobject,
CylinderFillingModelList.class, classMap); TmCylinderFillingModelList.class, classMap);
List<CylinderFillingModel> fillingBefores = cylinderFillingModelList.getFillingBefore(); List<TmCylinderFillingModel> fillingBefores = cylinderFillingModelList.getFillingBefore();
List<CylinderFillingRecordModel> fillings = cylinderFillingModelList.getFilling(); List<TmCylinderFillingRecordModel> fillings = cylinderFillingModelList.getFilling();
List<CylinderFillingCheckModel> fillingAfters = cylinderFillingModelList.getFillingAfter(); List<TmCylinderFillingCheckModel> fillingAfters = cylinderFillingModelList.getFillingAfter();
if (ValidationUtil.isEmpty(fillingBefores) && ValidationUtil.isEmpty(fillings) && ValidationUtil.isEmpty(fillingAfters)) { if (ValidationUtil.isEmpty(fillingBefores) && ValidationUtil.isEmpty(fillings) && ValidationUtil.isEmpty(fillingAfters)) {
throw new BadRequest("液化气体气瓶充装信息-充装前检查信息、液化气体气瓶充装信息-充装记录信息、液化气体气瓶充装信息-充装后复查信息为空."); throw new BadRequest("液化气体气瓶充装信息-充装前检查信息、液化气体气瓶充装信息-充装记录信息、液化气体气瓶充装信息-充装后复查信息为空.");
} }
...@@ -141,7 +121,7 @@ public class CylinderController { ...@@ -141,7 +121,7 @@ public class CylinderController {
@ApiOperation(value = "气瓶充装审核数据") @ApiOperation(value = "气瓶充装审核数据")
@PostMapping(value = "/fillingAudit") @PostMapping(value = "/fillingAudit")
@RestEventTrigger(value = "openapiLogEventHandler") @RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> cylinderFillingAudit(@RequestBody List<CylinderFillingExamineModel> fillingAuditData) throws Exception { public ResponseModel<String> cylinderFillingAudit(@RequestBody List<TmCylinderFillingExamineModel> fillingAuditData) throws Exception {
return ResponseHelper.buildResponse(cylinderFillingExamineService.createCylinderFillingExamine(fillingAuditData)); return ResponseHelper.buildResponse(cylinderFillingExamineService.createCylinderFillingExamine(fillingAuditData));
} }
......
...@@ -28,21 +28,21 @@ import java.util.List; ...@@ -28,21 +28,21 @@ import java.util.List;
public class CylinderPageController { public class CylinderPageController {
private static final Logger logger = LogManager.getLogger(CylinderPageController.class); private static final Logger logger = LogManager.getLogger(CylinderPageController.class);
@Autowired @Autowired
private CylinderUnitService cylinderUnitService; private TmCylinderUnitService cylinderUnitService;
@Autowired @Autowired
private CylinderFillingCheckService cylinderFillingCheckService; private TmCylinderFillingCheckService cylinderFillingCheckService;
@Autowired @Autowired
private CylinderFillingExamineService cylinderFillingExamineService; private TmCylinderFillingExamineService cylinderFillingExamineService;
@Autowired @Autowired
private CylinderFillingRecordService cylinderFillingRecordService; private TmCylinderFillingRecordService cylinderFillingRecordService;
@Autowired @Autowired
private CylinderFillingService cylinderFillingService; private TmCylinderFillingService cylinderFillingService;
@Autowired @Autowired
private CylinderInfoService cylinderInfoService; private TmCylinderInfoService cylinderInfoService;
@Autowired @Autowired
private CylinderInspectionService cylinderInspectionService; private TmCylinderInspectionService cylinderInspectionService;
@Autowired @Autowired
private CylinderTagsService cylinderTagsService; private TmCylinderTagsService cylinderTagsService;
@Autowired @Autowired
private OpenapiBizTokenService openapiBizTokenService; private OpenapiBizTokenService openapiBizTokenService;
@Autowired @Autowired
......
package com.yeejoin.amos.api.openapi.controller; package com.yeejoin.amos.api.openapi.controller;
import java.util.HashMap;
import java.util.Map;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.doc.TycloudResource;
import com.yeejoin.amos.api.common.restful.utils.ResponseHelper; import com.yeejoin.amos.api.common.restful.utils.ResponseHelper;
import com.yeejoin.amos.api.common.restful.utils.ResponseModel; import com.yeejoin.amos.api.common.restful.utils.ResponseModel;
import com.yeejoin.amos.api.openapi.constant.Constant;
import com.yeejoin.amos.api.openapi.face.model.InspectionModel;
import com.yeejoin.amos.api.openapi.face.model.InspectionModelList;
import com.yeejoin.amos.api.openapi.face.service.ElevatorStatusService;
import com.yeejoin.amos.api.openapi.face.service.OpenapiBizTokenService; import com.yeejoin.amos.api.openapi.face.service.OpenapiBizTokenService;
import com.yeejoin.amos.feign.privilege.util.DesUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import net.sf.json.JSONObject;
/** /**
* *
......
...@@ -3,7 +3,6 @@ package com.yeejoin.amos.api.openapi.controller; ...@@ -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.ResponseHelper;
import com.yeejoin.amos.api.common.restful.utils.ResponseModel; 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.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.EnterpriseInfoModel;
import com.yeejoin.amos.api.openapi.face.model.InspectionDetectionInfoModel; import com.yeejoin.amos.api.openapi.face.model.InspectionDetectionInfoModel;
import com.yeejoin.amos.api.openapi.face.model.InspectionInfoModel; import com.yeejoin.amos.api.openapi.face.model.InspectionInfoModel;
...@@ -11,18 +10,17 @@ import com.yeejoin.amos.api.openapi.face.model.ProduceInfoModel; ...@@ -11,18 +10,17 @@ 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.RegistrationInfoModel;
import com.yeejoin.amos.api.openapi.face.model.StaffQualifInfoModel; 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.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.DesignInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.EnclosureInfo; 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.MidMaintenanceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipOtherInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.StaffBaseInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.MidStaffBaseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipSuperviseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo; 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.ConstructionInfoService;
import com.yeejoin.amos.api.openapi.face.service.CreateCodeService; import com.yeejoin.amos.api.openapi.face.service.CreateCodeService;
import com.yeejoin.amos.api.openapi.face.service.DesignInfoService; import com.yeejoin.amos.api.openapi.face.service.DesignInfoService;
import com.yeejoin.amos.api.openapi.face.service.ElevatorTechInfoService;
import com.yeejoin.amos.api.openapi.face.service.EnclosureInfoService; import com.yeejoin.amos.api.openapi.face.service.EnclosureInfoService;
import com.yeejoin.amos.api.openapi.face.service.EnterpriseInfoService; import com.yeejoin.amos.api.openapi.face.service.EnterpriseInfoService;
import com.yeejoin.amos.api.openapi.face.service.InspectionInfoService; import com.yeejoin.amos.api.openapi.face.service.InspectionInfoService;
...@@ -84,8 +82,8 @@ public class SuperviseController { ...@@ -84,8 +82,8 @@ public class SuperviseController {
@Autowired @Autowired
private OtherInfoService otherInfoService; private OtherInfoService otherInfoService;
@Autowired // @Autowired
private ElevatorTechInfoService evatorTechInfoService; // private ElevatorTechInfoService evatorTechInfoService;
@Autowired @Autowired
private EnclosureInfoService enclosureInfoService; private EnclosureInfoService enclosureInfoService;
...@@ -131,7 +129,7 @@ public class SuperviseController { ...@@ -131,7 +129,7 @@ public class SuperviseController {
@ApiOperation(value = "新增施工信息") @ApiOperation(value = "新增施工信息")
@PostMapping(value = "/constructionInfo") @PostMapping(value = "/constructionInfo")
@RestEventTrigger(value = "openapiLogEventHandler") @RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveConstructionInfo(@RequestBody List<ConstructionInfo> constructionInfoList) { public ResponseModel<String> saveConstructionInfo(@RequestBody List<MidConstructionInfo> constructionInfoList) {
if (ValidationUtil.isEmpty(constructionInfoList)) { if (ValidationUtil.isEmpty(constructionInfoList)) {
throw new BadRequest("上送数据为空"); throw new BadRequest("上送数据为空");
} }
...@@ -150,7 +148,7 @@ public class SuperviseController { ...@@ -150,7 +148,7 @@ public class SuperviseController {
@ApiOperation(value = "新增使用信息") @ApiOperation(value = "新增使用信息")
@PostMapping(value = "/useInfo") @PostMapping(value = "/useInfo")
@RestEventTrigger(value = "openapiLogEventHandler") @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)); return ResponseHelper.buildResponse(useInfoService.saveUseInfo(useInfo));
} }
...@@ -158,7 +156,7 @@ public class SuperviseController { ...@@ -158,7 +156,7 @@ public class SuperviseController {
@ApiOperation(value = "新增维保单位信息") @ApiOperation(value = "新增维保单位信息")
@PostMapping(value = "/maintenanceInfo") @PostMapping(value = "/maintenanceInfo")
@RestEventTrigger(value = "openapiLogEventHandler") @RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveMaintenanceInfo(@RequestBody List<MaintenanceInfo> maintenanceInfoList) { public ResponseModel<String> saveMaintenanceInfo(@RequestBody List<MidMaintenanceInfo> maintenanceInfoList) {
if (ValidationUtil.isEmpty(maintenanceInfoList)) { if (ValidationUtil.isEmpty(maintenanceInfoList)) {
throw new BadRequest("上送数据为空"); throw new BadRequest("上送数据为空");
} }
...@@ -169,7 +167,7 @@ public class SuperviseController { ...@@ -169,7 +167,7 @@ public class SuperviseController {
@ApiOperation(value = "新增监督管理信息") @ApiOperation(value = "新增监督管理信息")
@PostMapping(value = "/superviseInfo") @PostMapping(value = "/superviseInfo")
@RestEventTrigger(value = "openapiLogEventHandler") @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)); return ResponseHelper.buildResponse(superviseInfoService.saveSuperviseInfo(superviseInfo));
} }
...@@ -177,17 +175,17 @@ public class SuperviseController { ...@@ -177,17 +175,17 @@ public class SuperviseController {
@ApiOperation(value = "新增其他信息") @ApiOperation(value = "新增其他信息")
@PostMapping(value = "/otherInfo") @PostMapping(value = "/otherInfo")
@RestEventTrigger(value = "openapiLogEventHandler") @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)); return ResponseHelper.buildResponse(otherInfoService.saveOtherInfo(otherInfo));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) // @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "新增电梯技术参数") // @ApiOperation(value = "新增电梯技术参数")
@PostMapping(value = "/elevatorTechInfo") // @PostMapping(value = "/elevatorTechInfo")
@RestEventTrigger(value = "openapiLogEventHandler") // @RestEventTrigger(value = "openapiLogEventHandler")
public ResponseModel<String> saveElevatorTechInfo(@RequestBody List<ElevatorTechInfoModel> elevatorTechInfo) throws Exception { // public ResponseModel<String> saveElevatorTechInfo(@RequestBody List<ElevatorTechInfoModel> elevatorTechInfo) throws Exception {
return ResponseHelper.buildResponse(evatorTechInfoService.saveElevatorTechInfo(elevatorTechInfo)); // return ResponseHelper.buildResponse(evatorTechInfoService.saveElevatorTechInfo(elevatorTechInfo));
} // }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "新增特种设备附件资料信息") @ApiOperation(value = "新增特种设备附件资料信息")
...@@ -209,7 +207,7 @@ public class SuperviseController { ...@@ -209,7 +207,7 @@ public class SuperviseController {
@ApiOperation(value = "新增人员基本信息") @ApiOperation(value = "新增人员基本信息")
@PostMapping(value = "/staffBaseInfo") @PostMapping(value = "/staffBaseInfo")
@RestEventTrigger(value = "openapiLogEventHandler") @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)); return ResponseHelper.buildResponse(staffBaseInfoService.saveStaffBaseInfo(staffBaseInfo));
} }
......
package com.yeejoin.amos.api.openapi.enums; package com.yeejoin.amos.api.openapi.enums;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamBoiler;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
......
package com.yeejoin.amos.api.openapi.face.dto; 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.DesignInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.MainParts; import com.yeejoin.amos.api.openapi.face.orm.entity.MiddMainParts;
import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.MidMaintenanceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipOtherInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.ProduceInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipProduceInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.ProtectionDevices; import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipProtectionDevices;
import com.yeejoin.amos.api.openapi.face.orm.entity.RegistrationInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipRegistrationInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipSuperviseInfo;
import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.MiddEquipUseInfo;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -23,7 +23,7 @@ public class EquipmentInfoDto { ...@@ -23,7 +23,7 @@ public class EquipmentInfoDto {
/** /**
* 使用信息 * 使用信息
*/ */
private UseInfo useInfo; private MiddEquipUseInfo useInfo;
/** /**
* 设计制造 * 设计制造
...@@ -33,36 +33,36 @@ public class EquipmentInfoDto { ...@@ -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;
/** /**
* 设备参数信息 * 设备参数信息
......
package com.yeejoin.amos.api.openapi.face.model; //package com.yeejoin.amos.api.openapi.face.model;
//
import java.io.Serializable; //import java.io.Serializable;
import java.util.Date; //import java.util.Date;
//
import lombok.Data; //import lombok.Data;
//
/** ///**
* // *
* <pre> // * <pre>
* 装备分类 model // * 装备分类 model
* </pre> // * </pre>
* // *
* @author gwb // * @author gwb
* @version $Id: EquipmentCategory.java, v 0.1 2021年10月15日 上午11:23:03 gwb Exp $ // * @version $Id: EquipmentCategory.java, v 0.1 2021年10月15日 上午11:23:03 gwb Exp $
*/ // */
@Data //@Data
public class EquipmentCategoryModel implements Serializable { //public class EquipmentCategoryModel implements Serializable {
//
/** // /**
* <pre> // * <pre>
* // *
* </pre> // * </pre>
*/ // */
private static final long serialVersionUID = 8586846201861760731L; // private static final long serialVersionUID = 8586846201861760731L;
//
/** // /**
* 主键 // * 主键
*/ // */
private Long id; // private Long id;
/** // /**
* // *
*/ // */
private String parentId; // private String parentId;
/** // /**
* 装备分类编码 // * 装备分类编码
*/ // */
private String code; // private String code;
/** // /**
* 装备分类名称 // * 装备分类名称
*/ // */
private String name; // private String name;
/** // /**
* 描述 // * 描述
*/ // */
private String description; // private String description;
/** // /**
* 备注 // * 备注
*/ // */
private String remark; // private String remark;
/** // /**
* // *
*/ // */
private Date createDate; // private Date createDate;
/** // /**
* 行业编码 // * 行业编码
*/ // */
private String industryCode; // private String industryCode;
//
} //}
//
...@@ -7,8 +7,7 @@ import lombok.Data; ...@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; 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; ...@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamBoilerDto", description="安全追溯-锅炉Dto") @ApiModel(value="MidEquipTechParamBoilerDto", description="安全追溯-锅炉Dto")
public class EquipTechParamBoilerModel extends AbstractBaseModel { public class MidEquipTechParamBoilerModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -7,8 +7,7 @@ import lombok.Data; ...@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; 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; ...@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamElevatorDto", description="安全追溯-电梯Dto") @ApiModel(value="MidEquipTechParamElevatorDto", description="安全追溯-电梯Dto")
public class EquipTechParamElevatorModel extends AbstractBaseModel { public class MidEquipTechParamElevatorModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -7,8 +7,7 @@ import lombok.Data; ...@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; 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; ...@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamLiftingDto", description="安全追溯-起重机械Dto") @ApiModel(value="MidEquipTechParamLiftingDto", description="安全追溯-起重机械Dto")
public class EquipTechParamLiftingModel extends AbstractBaseModel { public class MidEquipTechParamLiftingModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -7,8 +7,7 @@ import lombok.Data; ...@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; 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; ...@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamPipelineDto", description="安全追溯-压力管道Dto") @ApiModel(value="MidEquipTechParamPipelineDto", description="安全追溯-压力管道Dto")
public class EquipTechParamPipelineModel extends AbstractBaseModel { public class MidEquipTechParamPipelineModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -7,8 +7,7 @@ import lombok.Data; ...@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; 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; ...@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamRidesDto", description="安全追溯-游乐设施Dto") @ApiModel(value="MidEquipTechParamRidesDto", description="安全追溯-游乐设施Dto")
public class EquipTechParamRidesModel extends AbstractBaseModel { public class MidEquipTechParamRidesModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -7,8 +7,7 @@ import lombok.Data; ...@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; 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; ...@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamRopewayDto", description="安全追溯-索道Dto") @ApiModel(value="MidEquipTechParamRopewayDto", description="安全追溯-索道Dto")
public class EquipTechParamRopewayModel extends AbstractBaseModel { public class MidEquipTechParamRopewayModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -7,8 +7,7 @@ import lombok.Data; ...@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; 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; ...@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamVehicleDto", description="安全追溯-场内车辆Dto") @ApiModel(value="MidEquipTechParamVehicleDto", description="安全追溯-场内车辆Dto")
public class EquipTechParamVehicleModel extends AbstractBaseModel { public class MidEquipTechParamVehicleModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -7,8 +7,7 @@ import lombok.Data; ...@@ -7,8 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal; 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; ...@@ -18,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipTechParamVesselDto", description="安全追溯-压力容器Dto") @ApiModel(value="MidEquipTechParamVesselDto", description="安全追溯-压力容器Dto")
public class EquipTechParamVesselModel extends AbstractBaseModel { public class MidEquipTechParamVesselModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date; 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; ...@@ -16,7 +16,7 @@ import com.yeejoin.amos.api.openapi.face.model.AbstractBaseModel;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="MidEquipMaintenanceRecordInfoDto", description="安全追溯-维保备案信息表Dto") @ApiModel(value="MidEquipMaintenanceRecordInfoDto", description="安全追溯-维保备案信息表Dto")
public class MaintenanceInfoModel extends AbstractBaseModel { public class MidMaintenanceInfoModel extends AbstractBaseModel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.model; package com.yeejoin.amos.api.openapi.face.model;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderFillingCheckModel extends AbstractBaseModel{ public class TmCylinderFillingCheckModel extends AbstractBaseModel{
/** /**
* *
*/ */
......
package com.yeejoin.amos.api.openapi.face.model; package com.yeejoin.amos.api.openapi.face.model;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderFillingExamineModel extends AbstractBaseModel{ public class TmCylinderFillingExamineModel extends AbstractBaseModel{
/** /**
* *
*/ */
......
...@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode; ...@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderFillingExamineModelList extends AbstractBaseModel{ public class TmCylinderFillingExamineModelList extends AbstractBaseModel{
/** /**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private List<CylinderFillingExamineModel> fillingAudit; private List<TmCylinderFillingExamineModel> fillingAudit;
} }
package com.yeejoin.amos.api.openapi.face.model; package com.yeejoin.amos.api.openapi.face.model;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderFillingModel extends AbstractBaseModel{ public class TmCylinderFillingModel extends AbstractBaseModel{
/** /**
* *
*/ */
......
...@@ -8,14 +8,14 @@ import lombok.EqualsAndHashCode; ...@@ -8,14 +8,14 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderFillingModelList extends AbstractBaseModel{ public class TmCylinderFillingModelList extends AbstractBaseModel{
/** /**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String type; private String type;
private List<CylinderFillingModel> fillingBefore; private List<TmCylinderFillingModel> fillingBefore;
private List<CylinderFillingRecordModel> filling; private List<TmCylinderFillingRecordModel> filling;
private List<CylinderFillingCheckModel> fillingAfter; private List<TmCylinderFillingCheckModel> fillingAfter;
} }
package com.yeejoin.amos.api.openapi.face.model; package com.yeejoin.amos.api.openapi.face.model;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderFillingRecordModel extends AbstractBaseModel{ public class TmCylinderFillingRecordModel extends AbstractBaseModel{
/** /**
* *
*/ */
......
package com.yeejoin.amos.api.openapi.face.model; package com.yeejoin.amos.api.openapi.face.model;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderInfoModel extends AbstractBaseModel{ public class TmCylinderInfoModel extends AbstractBaseModel{
/** /**
* *
*/ */
......
...@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode; ...@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderInfoModelList extends AbstractBaseModel{ public class TmCylinderInfoModelList extends AbstractBaseModel{
/** /**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private List<CylinderInfoModel> info; private List<TmCylinderInfoModel> info;
} }
package com.yeejoin.amos.api.openapi.face.model; package com.yeejoin.amos.api.openapi.face.model;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderInspectionModel extends AbstractBaseModel{ public class TmCylinderInspectionModel extends AbstractBaseModel{
/** /**
* *
*/ */
......
...@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode; ...@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderInspectionModelList extends AbstractBaseModel{ public class TmCylinderInspectionModelList extends AbstractBaseModel{
/** /**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private List<CylinderInspectionModel> inspection; private List<TmCylinderInspectionModel> inspection;
} }
...@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; ...@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderTagsModel extends AbstractBaseModel{ public class TmCylinderTagsModel extends AbstractBaseModel{
/** /**
* *
*/ */
......
...@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode; ...@@ -8,11 +8,11 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderTagsModelList extends AbstractBaseModel{ public class TmCylinderTagsModelList extends AbstractBaseModel{
/** /**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private List<CylinderTagsModel> tag; private List<TmCylinderTagsModel> tag;
} }
package com.yeejoin.amos.api.openapi.face.model; package com.yeejoin.amos.api.openapi.face.model;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class CylinderUnitModel extends AbstractBaseModel{ public class TmCylinderUnitModel extends AbstractBaseModel{
/** /**
* *
*/ */
......
...@@ -6,7 +6,7 @@ import java.util.List; ...@@ -6,7 +6,7 @@ import java.util.List;
import lombok.Data; import lombok.Data;
@Data @Data
public class CylinderUnitModelList implements Serializable{ public class TmCylinderUnitModelList implements Serializable{
/** /**
* <pre> * <pre>
* *
...@@ -14,5 +14,5 @@ public class CylinderUnitModelList implements Serializable{ ...@@ -14,5 +14,5 @@ public class CylinderUnitModelList implements Serializable{
*/ */
private static final long serialVersionUID = -8502490582467436049L; private static final long serialVersionUID = -8502490582467436049L;
private List<CylinderUnitModel> unit; private List<TmCylinderUnitModel> unit;
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; //package com.yeejoin.amos.api.openapi.face.orm.dao;
//
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarm; //import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarm;
//
/** ///**
* <p> // * <p>
* 电梯故障表 Mapper 接口 // * 电梯故障表 Mapper 接口
* </p> // * </p>
* // *
* @author 子杨 // * @author 子杨
* @since 2021-09-27 // * @since 2021-09-27
*/ // */
public interface ElevatorAlarmMapper extends BaseMapper<ElevatorAlarm> { //public interface ElevatorAlarmMapper extends BaseMapper<ElevatorAlarm> {
//
} //}
\ No newline at end of file \ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; //package com.yeejoin.amos.api.openapi.face.orm.dao;
//
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarmType; //import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorAlarmType;
//
/** ///**
* // *
* <pre> // * <pre>
* 电梯故障类型表 Mapper 接口 // * 电梯故障类型表 Mapper 接口
* </pre> // * </pre>
* // *
* @author gwb // * @author gwb
* @version $Id: ElevatorAlarmTypeMapper.java, v 0.1 2021年10月15日 下午2:23:32 gwb Exp $ // * @version $Id: ElevatorAlarmTypeMapper.java, v 0.1 2021年10月15日 下午2:23:32 gwb Exp $
*/ // */
public interface ElevatorAlarmTypeMapper extends BaseMapper<ElevatorAlarmType> { //public interface ElevatorAlarmTypeMapper extends BaseMapper<ElevatorAlarmType> {
//
} //}
\ No newline at end of file \ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; //package com.yeejoin.amos.api.openapi.face.orm.dao;
//
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.Elevator; //import com.yeejoin.amos.api.openapi.face.orm.entity.Elevator;
//
/** ///**
* // *
* <pre> // * <pre>
* 电梯 Mapper 接口 // * 电梯 Mapper 接口
* </pre> // * </pre>
* // *
* @author gwb // * @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $ // * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/ // */
public interface ElevatorMapper extends BaseMapper<Elevator> { //public interface ElevatorMapper extends BaseMapper<Elevator> {
//
} //}
\ No newline at end of file \ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; //package com.yeejoin.amos.api.openapi.face.orm.dao;
//
import org.apache.ibatis.annotations.Param; //import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; //import org.apache.ibatis.annotations.Select;
//
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorStatus; //import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorStatus;
//
/** ///**
* <p> // * <p>
* 电梯运行状态表 Mapper 接口 // * 电梯运行状态表 Mapper 接口
* </p> // * </p>
* // *
* @author 子杨 // * @author 子杨
* @since 2021-09-27 // * @since 2021-09-27
*/ // */
public interface ElevatorStatusMapper extends BaseMapper<ElevatorStatus> { //public interface ElevatorStatusMapper extends BaseMapper<ElevatorStatus> {
//
//
@Select("SELECT " + // @Select("SELECT " +
" * " + // " * " +
" FROM " + // " FROM " +
" tz_elevator_status c " + // " tz_elevator_status c " +
" WHERE " + // " WHERE " +
" c.register_code = '${registerCode}' ORDER BY upload_date DESC LIMIT 1") // " c.register_code = '${registerCode}' ORDER BY upload_date DESC LIMIT 1")
ElevatorStatus getLatelyStatus(@Param("registerCode") String registerCode); // ElevatorStatus getLatelyStatus(@Param("registerCode") String registerCode);
} //}
\ No newline at end of file \ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; //package com.yeejoin.amos.api.openapi.face.orm.dao;
//
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorTechInfo; //import com.yeejoin.amos.api.openapi.face.orm.entity.ElevatorTechInfo;
//
/** ///**
* 电梯技术参数 Mapper 接口 // * 电梯技术参数 Mapper 接口
* // *
* @author Zhang Yingbin // * @author Zhang Yingbin
* @date 2022-07-19 // * @date 2022-07-19
*/ // */
public interface ElevatorTechInfoMapper extends BaseMapper<ElevatorTechInfo> { //public interface ElevatorTechInfoMapper extends BaseMapper<ElevatorTechInfo> {
//
} //}
package com.yeejoin.amos.api.openapi.face.orm.dao; //package com.yeejoin.amos.api.openapi.face.orm.dao;
//
import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipmentCategory; //import com.yeejoin.amos.api.openapi.face.orm.entity.EquipmentCategory;
//
/** ///**
* // *
* <pre> // * <pre>
* 装备分类 Mapper 接口 // * 装备分类 Mapper 接口
* </pre> // * </pre>
* // *
* @author gwb // * @author gwb
* @version $Id: EquipmentCategoryMapper.java, v 0.1 2021年10月15日 下午2:24:49 gwb Exp $ // * @version $Id: EquipmentCategoryMapper.java, v 0.1 2021年10月15日 下午2:24:49 gwb Exp $
*/ // */
public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> { //public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
//
} //}
\ No newline at end of file \ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 接口 * 特种设备基本信息-施工信息 Mapper 接口
...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo; ...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.ConstructionInfo;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface ConstructionInfoMapper extends BaseMapper<ConstructionInfo> { public interface MidConstructionInfoMapper extends BaseMapper<MidConstructionInfo> {
} }
...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo; ...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.DesignInfo;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface DesignInfoMapper extends BaseMapper<DesignInfo> { public interface MidDesignInfoMapper extends BaseMapper<DesignInfo> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 接口 * 特种设备基本信息-其他信息 Mapper 接口
...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo; ...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.OtherInfo;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface OtherInfoMapper extends BaseMapper<OtherInfo> { public interface MidEquipOtherInfoMapper extends BaseMapper<MidEquipOtherInfo> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 接口 * 特种设备基本信息-制造信息 Mapper 接口
...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.ProduceInfo; ...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.ProduceInfo;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface ProduceInfoMapper extends BaseMapper<ProduceInfo> { public interface MidEquipProduceInfoMapper extends BaseMapper<MidEquipProduceInfo> {
} }
...@@ -2,7 +2,7 @@ package com.yeejoin.amos.api.openapi.face.orm.dao; ...@@ -2,7 +2,7 @@ package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
...@@ -15,9 +15,9 @@ import java.util.Set; ...@@ -15,9 +15,9 @@ import java.util.Set;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface RegistrationInfoMapper extends BaseMapper<RegistrationInfo> { public interface MidEquipRegistrationInfoMapper extends BaseMapper<MidEquipRegistrationInfo> {
@DS("tzs") @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") @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);
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.EquipTechParamBoiler; import com.yeejoin.amos.api.openapi.face.orm.entity.MidEquipTechParamBoiler;
import lombok.Data;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface EquipTechParamBoilerMapper extends BaseMapper<EquipTechParamBoiler> { public interface MidEquipTechParamBoilerMapper extends BaseMapper<MidEquipTechParamBoiler> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 接口 * 特种设备基本信息-维保备案信息 Mapper 接口
...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo; ...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.MaintenanceInfo;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface MaintenanceInfoMapper extends BaseMapper<MaintenanceInfo> { public interface MidMaintenanceInfoMapper extends BaseMapper<MidMaintenanceInfo> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 接口 * 人员数据信息-基本信息 Mapper 接口
...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.StaffBaseInfo; ...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.StaffBaseInfo;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface StaffBaseInfoMapper extends BaseMapper<StaffBaseInfo> { public interface MidStaffBaseInfoMapper extends BaseMapper<MidStaffBaseInfo> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 接口 * 人员数据信息-资质信息 Mapper 接口
...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.StaffQualifInfo; ...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.StaffQualifInfo;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface StaffQualifInfoMapper extends BaseMapper<StaffQualifInfo> { public interface MidStaffQualifInfoMapper extends BaseMapper<MidStaffQualifInfo> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; 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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
...@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author duanwei * @author duanwei
* @date 2023-04-10 * @date 2023-04-10
*/ */
public interface MidEquipMainPartsMapper extends BaseMapper<MainParts> { public interface MiddEquipMainPartsMapper extends BaseMapper<MiddMainParts> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; 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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
...@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author duanwei * @author duanwei
* @date 2023-04-10 * @date 2023-04-10
*/ */
public interface MidEquipProtectionDevicesMapper extends BaseMapper<ProtectionDevices> { public interface MiddEquipProtectionDevicesMapper extends BaseMapper<MidEquipProtectionDevices> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 接口 * 特种设备基本信息-监督管理信息 Mapper 接口
...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo; ...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.SuperviseInfo;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface SuperviseInfoMapper extends BaseMapper<SuperviseInfo> { public interface MiddEquipSuperviseInfoMapper extends BaseMapper<MiddEquipSuperviseInfo> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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 接口 * 特种设备基本信息-使用信息 Mapper 接口
...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo; ...@@ -9,6 +9,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo;
* @author Zhang Yingbin * @author Zhang Yingbin
* @date 2022-07-19 * @date 2022-07-19
*/ */
public interface UseInfoMapper extends BaseMapper<UseInfo> { public interface MiddEquipUseInfoMapper extends BaseMapper<MiddEquipUseInfo> {
} }
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingCheck; import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingCheck;
/** /**
* *
...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingCheck; ...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingCheck;
* @author gwb * @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $ * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/ */
public interface CylinderFillingCheckMapper extends BaseMapper<CylinderFillingCheck> { public interface TmCylinderFillingCheckMapper extends BaseMapper<TmCylinderFillingCheck> {
} }
\ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingExamine; import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingExamine;
/** /**
* *
...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingExamine; ...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingExamine;
* @author gwb * @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $ * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/ */
public interface CylinderFillingExamineMapper extends BaseMapper<CylinderFillingExamine> { public interface TmCylinderFillingExamineMapper extends BaseMapper<TmCylinderFillingExamine> {
} }
\ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFilling; import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFilling;
/** /**
* *
...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFilling; ...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFilling;
* @author gwb * @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $ * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/ */
public interface CylinderFillingMapper extends BaseMapper<CylinderFilling> { public interface TmCylinderFillingMapper extends BaseMapper<TmCylinderFilling> {
} }
\ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderFillingRecord; import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderFillingRecord;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.util.List; import java.util.List;
...@@ -15,7 +15,7 @@ import java.util.List; ...@@ -15,7 +15,7 @@ import java.util.List;
* @author gwb * @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $ * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/ */
public interface CylinderFillingRecordMapper extends BaseMapper<CylinderFillingRecord> { public interface TmCylinderFillingRecordMapper extends BaseMapper<TmCylinderFillingRecord> {
@Select("select date_format(`t`.`sync_date`,'%Y-%m-%d') AS `sync_time` from tm_cylinder_filling_record t GROUP BY date_format(`t`.`sync_date`,'%Y-%m-%d') ") @Select("select date_format(`t`.`sync_date`,'%Y-%m-%d') AS `sync_time` from tm_cylinder_filling_record t GROUP BY date_format(`t`.`sync_date`,'%Y-%m-%d') ")
......
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInfo; import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInfo;
/** /**
* *
...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInfo; ...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInfo;
* @author gwb * @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $ * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/ */
public interface CylinderInfoMapper extends BaseMapper<CylinderInfo> { public interface TmCylinderInfoMapper extends BaseMapper<TmCylinderInfo> {
} }
\ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInspection; import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderInspection;
/** /**
* *
...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInspection; ...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderInspection;
* @author gwb * @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $ * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/ */
public interface CylinderInspectionMapper extends BaseMapper<CylinderInspection> { public interface TmCylinderInspectionMapper extends BaseMapper<TmCylinderInspection> {
} }
\ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderTags; import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderTags;
/** /**
* *
...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderTags; ...@@ -12,6 +12,6 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderTags;
* @author gwb * @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $ * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/ */
public interface CylinderTagsMapper extends BaseMapper<CylinderTags> { public interface TmCylinderTagsMapper extends BaseMapper<TmCylinderTags> {
} }
\ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.dao; package com.yeejoin.amos.api.openapi.face.orm.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderUnit; import com.yeejoin.amos.api.openapi.face.orm.entity.TmCylinderUnit;
/** /**
* *
...@@ -12,6 +12,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderUnit; ...@@ -12,6 +12,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.CylinderUnit;
* @author gwb * @author gwb
* @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $ * @version $Id: ElevatorMapper.java, v 0.1 2021年9月30日 下午3:28:31 gwb Exp $
*/ */
public interface CylinderUnitMapper extends BaseMapper<CylinderUnit> { public interface TmCylinderUnitMapper extends BaseMapper<TmCylinderUnit>
{
} }
\ No newline at end of file
package com.yeejoin.amos.api.openapi.face.orm.entity; //package com.yeejoin.amos.api.openapi.face.orm.entity;
//
import java.io.Serializable; //import java.io.Serializable;
import java.util.Date; //import java.util.Date;
//
import com.baomidou.mybatisplus.annotation.TableField; //import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; //import com.baomidou.mybatisplus.annotation.TableName;
//
import lombok.Data; //import lombok.Data;
//
/** ///**
* // *
* <pre> // * <pre>
* 装备分类 // * 装备分类
* </pre> // * </pre>
* // *
* @author gwb // * @author gwb
* @version $Id: EquipmentCategory.java, v 0.1 2021年10月15日 上午11:23:03 gwb Exp $ // * @version $Id: EquipmentCategory.java, v 0.1 2021年10月15日 上午11:23:03 gwb Exp $
*/ // */
@Data //@Data
@TableName("tz_equipment_category") //@TableName("tz_equipment_category")
public class EquipmentCategory implements Serializable { //public class EquipmentCategory implements Serializable {
//
//
/** // /**
* <pre> // * <pre>
* // *
* </pre> // * </pre>
*/ // */
private static final long serialVersionUID = 5715164115243510569L; // private static final long serialVersionUID = 5715164115243510569L;
/** // /**
* 主键 // * 主键
*/ // */
@TableField("id") // @TableField("id")
private Long id; // private Long id;
/** // /**
* // *
*/ // */
@TableField("parent_id") // @TableField("parent_id")
private String parentId; // private String parentId;
/** // /**
* 装备分类编码 // * 装备分类编码
*/ // */
@TableField("code") // @TableField("code")
private String code; // private String code;
/** // /**
* 装备分类名称 // * 装备分类名称
*/ // */
@TableField("name") // @TableField("name")
private String name; // private String name;
/** // /**
* 描述 // * 描述
*/ // */
@TableField("description") // @TableField("description")
private String description; // private String description;
/** // /**
* 备注 // * 备注
*/ // */
@TableField("remark") // @TableField("remark")
private String remark; // private String remark;
/** // /**
* // *
*/ // */
@TableField("create_date") // @TableField("create_date")
private Date createDate; // private Date createDate;
/** // /**
* 行业编码 // * 行业编码
*/ // */
@TableField("industry_code") // @TableField("industry_code")
private String industryCode; // private String industryCode;
//
} //}
//
...@@ -17,7 +17,7 @@ import java.util.Date; ...@@ -17,7 +17,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_construction_info") @TableName("mid_equip_construction_info")
public class ConstructionInfo extends AbstractEquipBaseEntity { public class MidConstructionInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -15,7 +15,7 @@ import lombok.experimental.Accessors; ...@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_other_info") @TableName("mid_equip_other_info")
public class OtherInfo extends AbstractEquipBaseEntity { public class MidEquipOtherInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String record; private String record;
......
...@@ -17,7 +17,7 @@ import java.util.Date; ...@@ -17,7 +17,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_factory_info") @TableName("mid_equip_factory_info")
public class ProduceInfo extends AbstractEquipBaseEntity { public class MidEquipProduceInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String record; private String record;
......
...@@ -19,7 +19,7 @@ import java.util.Date; ...@@ -19,7 +19,7 @@ import java.util.Date;
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value="MidEquipProtectionDevices对象", description="") @ApiModel(value="MidEquipProtectionDevices对象", description="")
@TableName(value = "mid_equip_protection_devices") @TableName(value = "mid_equip_protection_devices")
public class ProtectionDevices extends AbstractEquipBaseEntity { public class MidEquipProtectionDevices extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -17,7 +17,7 @@ import java.math.BigDecimal; ...@@ -17,7 +17,7 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_register_info") @TableName("mid_equip_register_info")
public class RegistrationInfo extends AbstractEquipBaseEntity { public class MidEquipRegistrationInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String record; private String record;
......
...@@ -18,7 +18,7 @@ import java.math.BigDecimal; ...@@ -18,7 +18,7 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_tech_param_boiler") @TableName("mid_equip_tech_param_boiler")
public class EquipTechParamBoiler extends AbstractEquipBaseEntity { public class MidEquipTechParamBoiler extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -17,7 +17,7 @@ import java.math.BigDecimal; ...@@ -17,7 +17,7 @@ import java.math.BigDecimal;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_tech_param_elevator") @TableName("mid_equip_tech_param_elevator")
public class EquipTechParamElevator extends AbstractEquipBaseEntity { public class MidEquipTechParamElevator extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String record; private String record;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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; ...@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_tech_param_lifting") @TableName("mid_equip_tech_param_lifting")
public class EquipTechParamLifting extends AbstractEquipBaseEntity { public class MidEquipTechParamLifting extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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; ...@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_tech_param_pipeline") @TableName("mid_equip_tech_param_pipeline")
public class EquipTechParamPipeline extends AbstractEquipBaseEntity { public class MidEquipTechParamPipeline extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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; ...@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_tech_param_rides") @TableName("mid_equip_tech_param_rides")
public class EquipTechParamRides extends AbstractEquipBaseEntity { public class MidEquipTechParamRides extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; 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.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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; ...@@ -22,7 +17,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName(value = "mid_equip_tech_param_ropeway") @TableName(value = "mid_equip_tech_param_ropeway")
public class EquipTechParamRopeway extends AbstractEquipBaseEntity{ public class MidEquipTechParamRopeway extends AbstractEquipBaseEntity{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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; ...@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_tech_param_vehicle") @TableName("mid_equip_tech_param_vehicle")
public class EquipTechParamVehicle extends AbstractEquipBaseEntity { public class MidEquipTechParamVehicle extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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; ...@@ -22,7 +19,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_tech_param_vessel") @TableName("mid_equip_tech_param_vessel")
public class EquipTechParamVessel extends AbstractEquipBaseEntity { public class MidEquipTechParamVessel extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -17,7 +17,7 @@ import java.util.Date; ...@@ -17,7 +17,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_maintenance_record_info") @TableName("mid_equip_maintenance_record_info")
public class MaintenanceInfo extends AbstractEquipBaseEntity { public class MidMaintenanceInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String record; private String record;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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; ...@@ -21,7 +18,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_staff_base_info") @TableName("mid_staff_base_info")
public class StaffBaseInfo extends AbstractEquipBaseEntity { public class MidStaffBaseInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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; ...@@ -21,7 +18,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.AbstractBaseEntity;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_staff_qualif_info") @TableName("mid_staff_qualif_info")
public class StaffQualifInfo extends AbstractEquipBaseEntity { public class MidStaffQualifInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -15,7 +15,7 @@ import lombok.experimental.Accessors; ...@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_supervision_info") @TableName("mid_equip_supervision_info")
public class SuperviseInfo extends AbstractEquipBaseEntity { public class MiddEquipSuperviseInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String record; private String record;
......
...@@ -18,7 +18,7 @@ import java.util.Date; ...@@ -18,7 +18,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("mid_equip_use_info") @TableName("mid_equip_use_info")
public class UseInfo extends AbstractEquipBaseEntity { public class MiddEquipUseInfo extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -20,7 +20,7 @@ import java.util.Date; ...@@ -20,7 +20,7 @@ import java.util.Date;
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value="MidEquipMainParts对象", description="") @ApiModel(value="MidEquipMainParts对象", description="")
@TableName(value = "mid_equip_main_parts") @TableName(value = "mid_equip_main_parts")
public class MainParts extends AbstractEquipBaseEntity { public class MiddMainParts extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; ...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("tm_cylinder_filling") @TableName("tm_cylinder_filling")
public class CylinderFilling extends AbstractBaseEntity{/** public class TmCylinderFilling extends AbstractBaseEntity{/**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; ...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("tm_cylinder_filling_check") @TableName("tm_cylinder_filling_check")
public class CylinderFillingCheck extends AbstractBaseEntity{/** public class TmCylinderFillingCheck extends AbstractBaseEntity{/**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; ...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("tm_cylinder_filling_examine") @TableName("tm_cylinder_filling_examine")
public class CylinderFillingExamine extends AbstractBaseEntity{/** public class TmCylinderFillingExamine extends AbstractBaseEntity{/**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; ...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("tm_cylinder_filling_record") @TableName("tm_cylinder_filling_record")
public class CylinderFillingRecord extends AbstractBaseEntity{/** public class TmCylinderFillingRecord extends AbstractBaseEntity{/**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -16,7 +13,7 @@ import lombok.EqualsAndHashCode; ...@@ -16,7 +13,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("tm_cylinder_info") @TableName("tm_cylinder_info")
public class CylinderInfo extends AbstractBaseEntity{ public class TmCylinderInfo extends AbstractBaseEntity{
/** /**
* *
*/ */
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; ...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("tm_cylinder_inspection") @TableName("tm_cylinder_inspection")
public class CylinderInspection extends AbstractBaseEntity{/** public class TmCylinderInspection extends AbstractBaseEntity{/**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; ...@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("tm_cylinder_tags") @TableName("tm_cylinder_tags")
public class CylinderTags extends AbstractBaseEntity{/** public class TmCylinderTags extends AbstractBaseEntity{/**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.orm.entity; package com.yeejoin.amos.api.openapi.face.orm.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode; ...@@ -15,7 +13,7 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("tm_cylinder_unit") @TableName("tm_cylinder_unit")
public class CylinderUnit extends AbstractBaseEntity{/** public class TmCylinderUnit extends AbstractBaseEntity{/**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
package com.yeejoin.amos.api.openapi.face.service;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.yeejoin.amos.boot.module.cylinder.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.cylinder.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.cylinder.api.mapper.TzBaseEnterpriseInfoMapper;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import java.util.List;
import java.util.Set;
@DS("tzs")
@Component
public class BaseEnterpriseInfoService extends AppBaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper> {
public List<TzBaseEnterpriseInfoDto> getEnterpriseInfoByCreditCode(@Condition(Operator.in) Set<String> useCode) {
return this.queryForList("", false, useCode);
}
}
package com.yeejoin.amos.api.openapi.face.service; package com.yeejoin.amos.api.openapi.face.service;
import com.yeejoin.amos.api.openapi.face.model.ConstructionInfoModel; import com.yeejoin.amos.api.openapi.face.model.ConstructionInfoModel;
import com.yeejoin.amos.api.openapi.face.orm.dao.ConstructionInfoMapper; 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 com.yeejoin.amos.api.openapi.feign.TzsServiceFeignClient;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
...@@ -22,7 +22,7 @@ import java.util.List; ...@@ -22,7 +22,7 @@ import java.util.List;
* @date 2022-07-19 * @date 2022-07-19
*/ */
@Component @Component
public class ConstructionInfoService extends AppBaseService<ConstructionInfoModel, ConstructionInfo, ConstructionInfoMapper> { public class ConstructionInfoService extends AppBaseService<ConstructionInfoModel, MidConstructionInfo, MidConstructionInfoMapper> {
private static final Logger logger = LogManager.getLogger(ConstructionInfoService.class); private static final Logger logger = LogManager.getLogger(ConstructionInfoService.class);
@Autowired @Autowired
...@@ -32,7 +32,7 @@ public class ConstructionInfoService extends AppBaseService<ConstructionInfoMode ...@@ -32,7 +32,7 @@ public class ConstructionInfoService extends AppBaseService<ConstructionInfoMode
* @param constructionInfo 施工信息 * @param constructionInfo 施工信息
* @return "OK" * @return "OK"
*/ */
public String saveConstructionInfo(ConstructionInfo constructionInfo) { public String saveConstructionInfo(MidConstructionInfo constructionInfo) {
try { try {
tzsServiceFeignClient.saveConstructionInfo(constructionInfo); tzsServiceFeignClient.saveConstructionInfo(constructionInfo);
} catch (Exception e) { } catch (Exception e) {
...@@ -51,12 +51,12 @@ public class ConstructionInfoService extends AppBaseService<ConstructionInfoMode ...@@ -51,12 +51,12 @@ public class ConstructionInfoService extends AppBaseService<ConstructionInfoMode
* @return 成功返回“OK” * @return 成功返回“OK”
*/ */
@Transactional(rollbackFor= {Exception.class}) @Transactional(rollbackFor= {Exception.class})
public String saveConstructionInfo(List<ConstructionInfo> model) { public String saveConstructionInfo(List<MidConstructionInfo> model) {
//TODO Auto-generated method stub //TODO Auto-generated method stub
if (ValidationUtil.isEmpty(model)) { if (ValidationUtil.isEmpty(model)) {
throw new BadRequest("施工信息为空."); throw new BadRequest("施工信息为空.");
} }
for (ConstructionInfo models : model) { for (MidConstructionInfo models : model) {
// checkModel(models); // checkModel(models);
models.setRecDate(new Date()); models.setRecDate(new Date());
models.setAppId(getAppId()); models.setAppId(getAppId());
......
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