Skip to content

A
amos-boot-biz
Commit c3ec77b8 authored by 刘林's avatar 刘林
Browse files
Options

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

parents d821beed a7a0c2d5
Hide whitespace changes
Inline Side-by-side
Showing with 979 additions and 777 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgTransferNoticeDto.java
View file @ c3ec77b8
...@@ -166,6 +166,9 @@ public class JgTransferNoticeDto extends BaseDto { ...@@ -166,6 +166,9 @@ public class JgTransferNoticeDto extends BaseDto {
@ApiModelProperty(value = "委托书附件") @ApiModelProperty(value = "委托书附件")
private List<Map<String, Object>> powerOfAttorneyList; private List<Map<String, Object>> powerOfAttorneyList;
@ApiModelProperty(value = "其他附件")
private List<Map<String, Object>> otherAccessoriesList;
@ApiModelProperty(value = "施工合同附件") @ApiModelProperty(value = "施工合同附件")
private List<Map<String, Object>> constructionContractList; private List<Map<String, Object>> constructionContractList;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java
View file @ c3ec77b8
...@@ -44,7 +44,7 @@ public enum BusinessTypeEnum { ...@@ -44,7 +44,7 @@ public enum BusinessTypeEnum {
JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"), JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"),
JY_INSPECTION_APPLICATION_CHECK("117", "检验（含安全阀效验）"), JY_INSPECTION_APPLICATION_CHECK("117", "电梯检测"),
JG_VEHICLE_GAS_APPLICATION("118", "车用气瓶登记"); JG_VEHICLE_GAS_APPLICATION("118", "车用气瓶登记");
private final String code; private final String code;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgMaintainNoticeService.java
View file @ c3ec77b8
...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice; import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -64,7 +66,7 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> { ...@@ -64,7 +66,7 @@ public interface IJgMaintainNoticeService extends IService<JgMaintainNotice> {
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return pdf文件路径 * @return pdf文件路径
*/ */
String generateMaintainNoticeReport(Long sequenceNbr); void generateMaintainNoticeReport(Long sequenceNbr,HttpServletResponse response);
boolean deleteBySequenceNbr(Long[] sequenceNbr); boolean deleteBySequenceNbr(Long[] sequenceNbr);
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgReformNoticeService.java
View file @ c3ec77b8
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice; import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -65,5 +66,5 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> { ...@@ -65,5 +66,5 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> {
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return pdf文件路径 * @return pdf文件路径
*/ */
String generateInstallationNoticeReport(Long sequenceNbr); void generateInstallationNoticeReport(Long sequenceNbr,HttpServletResponse response);
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgTransferNoticeService.java
View file @ c3ec77b8
...@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto; ...@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice; import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
import jdk.nashorn.api.scripting.JSObject; import jdk.nashorn.api.scripting.JSObject;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -29,6 +30,6 @@ public interface IJgTransferNoticeService extends IService<JgTransferNotice> { ...@@ -29,6 +30,6 @@ public interface IJgTransferNoticeService extends IService<JgTransferNotice> {
List<JgTransferNotice> saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams); List<JgTransferNotice> saveNotice(String submitType, Map<String, Object> model, ReginParams reginParams);
String generateTransferNoticeReport(Long sequenceNbr); void generateTransferNoticeReport(Long sequenceNbr, HttpServletResponse response);
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintainNoticeController.java
View file @ c3ec77b8
...@@ -19,6 +19,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation; ...@@ -19,6 +19,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -140,7 +141,7 @@ public class JgMaintainNoticeController extends BaseController { ...@@ -140,7 +141,7 @@ public class JgMaintainNoticeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "维修告知列表全部数据查询", notes = "维修告知列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "维修告知列表全部数据查询", notes = "维修告知列表全部数据查询")
@GetMapping(value = "/generate-report") @GetMapping(value = "/generate-report")
public ResponseModel<String> generateReport(@RequestParam("sequenceNbr") Long sequenceNbr) { public void generateReport(HttpServletResponse response, @RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(iJgMaintainNoticeService.generateMaintainNoticeReport(sequenceNbr)); iJgMaintainNoticeService.generateMaintainNoticeReport(sequenceNbr,response);
} }
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformNoticeController.java
View file @ c3ec77b8
...@@ -18,6 +18,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation; ...@@ -18,6 +18,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
...@@ -140,7 +141,7 @@ public class JgReformNoticeController extends BaseController { ...@@ -140,7 +141,7 @@ public class JgReformNoticeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "改造告知列表全部数据查询", notes = "改造告知列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "改造告知列表全部数据查询", notes = "改造告知列表全部数据查询")
@GetMapping(value = "/generate-report") @GetMapping(value = "/generate-report")
public ResponseModel<String> generateReport(@RequestParam("sequenceNbr") Long sequenceNbr) { public void generateReport(HttpServletResponse response, @RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgReformNoticeService.generateInstallationNoticeReport(sequenceNbr)); jgReformNoticeService.generateInstallationNoticeReport(sequenceNbr,response);
} }
} }
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgTransferNoticeController.java
View file @ c3ec77b8
...@@ -167,8 +167,8 @@ public class JgTransferNoticeController extends BaseController { ...@@ -167,8 +167,8 @@ public class JgTransferNoticeController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "移装告知列表全部数据查询", notes = "移装造告知列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "移装告知列表全部数据查询", notes = "移装造告知列表全部数据查询")
@GetMapping(value = "/generate-report") @GetMapping(value = "/generate-report")
public ResponseModel<String> selectForList(@RequestParam("sequenceNbr") Long sequenceNbr) { public void selectForList(HttpServletResponse response,@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgTransferNoticeService.generateTransferNoticeReport(sequenceNbr)); jgTransferNoticeService.generateTransferNoticeReport(sequenceNbr,response);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintainNoticeServiceImpl.java
View file @ c3ec77b8
...@@ -53,6 +53,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService; ...@@ -53,6 +53,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -365,7 +366,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto ...@@ -365,7 +366,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
* @return pdf文件路径 * @return pdf文件路径
*/ */
@Override @Override
public String generateMaintainNoticeReport(Long sequenceNbr) { public void generateMaintainNoticeReport(Long sequenceNbr, HttpServletResponse response) {
if (Objects.isNull(sequenceNbr)) { if (Objects.isNull(sequenceNbr)) {
throw new IllegalArgumentException("参数不能为空"); throw new IllegalArgumentException("参数不能为空");
} }
...@@ -377,11 +378,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto ...@@ -377,11 +378,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName().substring(0,2)); Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName().substring(0,2));
String tempFileName = "维修告知单_" + System.currentTimeMillis() + "_temp"; String tempFileName = "维修告知单_" + System.currentTimeMillis() + "_temp";
String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders); // String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
// 更新到数据库 // // 更新到数据库
JgMaintainNotice.setNoticeReportUrl(url); // JgMaintainNotice.setNoticeReportUrl(url);
this.updateById(JgMaintainNotice); // this.updateById(JgMaintainNotice);
return url; WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
} }
@Override @Override
...@@ -805,7 +806,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto ...@@ -805,7 +806,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId()); jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
jgMaintainNoticeMapper.updateById(jgMaintainNotice); jgMaintainNoticeMapper.updateById(jgMaintainNotice);
this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
} else { } else {
jgMaintainNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds()); jgMaintainNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
if (!ObjectUtils.isEmpty(jgMaintainNotice.getInstanceStatus())) { if (!ObjectUtils.isEmpty(jgMaintainNotice.getInstanceStatus())) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgReformNoticeServiceImpl.java
View file @ c3ec77b8
...@@ -51,6 +51,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService; ...@@ -51,6 +51,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -321,7 +322,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -321,7 +322,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
* @return pdf文件路径 * @return pdf文件路径
*/ */
@Override @Override
public String generateInstallationNoticeReport(Long sequenceNbr) { public void generateInstallationNoticeReport(Long sequenceNbr, HttpServletResponse response) {
if (Objects.isNull(sequenceNbr)) { if (Objects.isNull(sequenceNbr)) {
throw new IllegalArgumentException("参数不能为空"); throw new IllegalArgumentException("参数不能为空");
} }
...@@ -334,13 +335,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -334,13 +335,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName().substring(0, 2)); Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName().substring(0, 2));
String tempFileName = "改造告知单_" + System.currentTimeMillis() + "_temp"; String tempFileName = "改造告知单_" + System.currentTimeMillis() + "_temp";
String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders); // String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
//
// // 更新到数据库
// JgReformNotice.setNoticeReportUrl(url);
// this.updateById(JgReformNotice);
// 更新到数据库 WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
JgReformNotice.setNoticeReportUrl(url);
this.updateById(JgReformNotice);
return url;
} }
...@@ -754,7 +755,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -754,7 +755,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
jgReformNotice.setPromoter(""); jgReformNotice.setPromoter("");
this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED); this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED);
this.updateById(jgReformNotice); this.updateById(jgReformNotice);
this.generateInstallationNoticeReport(jgReformNotice.getSequenceNbr());
} else { } else {
jgReformNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds()); jgReformNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
if (!ObjectUtils.isEmpty(jgReformNotice.getInstanceStatus())) { if (!ObjectUtils.isEmpty(jgReformNotice.getInstanceStatus())) {
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java
View file @ c3ec77b8
...@@ -50,6 +50,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService; ...@@ -50,6 +50,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException; import java.text.ParseException;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -209,7 +210,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto ...@@ -209,7 +210,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
* @return pdf文件路径 * @return pdf文件路径
*/ */
@Override @Override
public String generateTransferNoticeReport(Long sequenceNbr) { public void generateTransferNoticeReport(Long sequenceNbr, HttpServletResponse response) {
if (Objects.isNull(sequenceNbr)) { if (Objects.isNull(sequenceNbr)) {
throw new IllegalArgumentException("参数不能为空"); throw new IllegalArgumentException("参数不能为空");
} }
...@@ -223,13 +224,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto ...@@ -223,13 +224,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_ADVICE_REMOVAL.getName().substring(0, 2)); Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_ADVICE_REMOVAL.getName().substring(0, 2));
String tempFileName = "移装告知单_" + System.currentTimeMillis() + "_temp"; String tempFileName = "移装告知单_" + System.currentTimeMillis() + "_temp";
String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders); // String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
//
// // 更新到数据库
// jgTransferNotice.setNoticeReportUrl(url);
// this.updateById(jgTransferNotice);
// 更新到数据库 WordTemplateUtils.templateToPdfDownload(tempFileName, "installation-notification-report.ftl", placeholders, response);
jgTransferNotice.setNoticeReportUrl(url);
this.updateById(jgTransferNotice);
return url;
} }
...@@ -573,8 +574,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto ...@@ -573,8 +574,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
if (!ValidationUtil.isEmpty(model.getPowerOfAttorneyList())) { if (!ValidationUtil.isEmpty(model.getPowerOfAttorneyList())) {
model.setPowerOfAttorney(JSON.toJSONString(model.getPowerOfAttorneyList())); model.setPowerOfAttorney(JSON.toJSONString(model.getPowerOfAttorneyList()));
} }
if (!ValidationUtil.isEmpty(model.getOtherAccessories())) { if (!ValidationUtil.isEmpty(model.getOtherAccessoriesList())) {
model.setOtherAccessories(JSON.toJSONString(model.getOtherAccessories())); model.setOtherAccessories(JSON.toJSONString(model.getOtherAccessoriesList()));
} }
// 分割省市区字段 // 分割省市区字段
String province = model.getProvince(); String province = model.getProvince();
...@@ -784,7 +785,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto ...@@ -784,7 +785,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds()); jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
jgTransferNoticeMapper.updateById(jgTransferNotice); jgTransferNoticeMapper.updateById(jgTransferNotice);
this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
} else { } else {
jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds()); jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BizTypeEnum.java
View file @ c3ec77b8
...@@ -20,8 +20,8 @@ import java.util.List; ...@@ -20,8 +20,8 @@ import java.util.List;
public enum BizTypeEnum { public enum BizTypeEnum {
SUPERVISE("supervise", "监督检验","115"), SUPERVISE("supervise", "监督检验","115"),
FIRST_INSPECTION("firstinspect", "定检","116"), FIRST_INSPECTION("firstinspect", "定(首)检","116"),
DETECTION("detection", "检测","117"), DETECTION("detection", "电梯检测","117"),
BUSINESS_OPEN("businessOpen", "检验检测业务开通","114"); BUSINESS_OPEN("businessOpen", "检验检测业务开通","114");
private String code; private String code;
...@@ -46,6 +46,15 @@ public enum BizTypeEnum { ...@@ -46,6 +46,15 @@ public enum BizTypeEnum {
return null; return null;
} }
public static BizTypeEnum getInstance(String code) {
for (BizTypeEnum c : BizTypeEnum.values()) {
if (c.getCode().equals(code)){
return c;
}
}
return null;
}
public static String getNumByCode(String code) { public static String getNumByCode(String code) {
for (BizTypeEnum c : BizTypeEnum.values()) { for (BizTypeEnum c : BizTypeEnum.values()) {
if (c.getCode().equals(code)){ if (c.getCode().equals(code)){
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BusinessTypeEnum.java
View file @ c3ec77b8
...@@ -44,7 +44,7 @@ public enum BusinessTypeEnum { ...@@ -44,7 +44,7 @@ public enum BusinessTypeEnum {
JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"), JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"),
JY_INSPECTION_APPLICATION_CHECK("117", "检验（含安全阀效验）"); JY_INSPECTION_APPLICATION_CHECK("117", "电梯检测");
private final String code; private final String code;
private final String name; private final String name;
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcBaseMapper.java
View file @ c3ec77b8
...@@ -30,4 +30,11 @@ public interface JyjcBaseMapper { ...@@ -30,4 +30,11 @@ public interface JyjcBaseMapper {
void updateBusinessData(String tableName, String assignee, String transferToUserIds, String instanceId, String nextTaskId,String key); void updateBusinessData(String tableName, String assignee, String transferToUserIds, String instanceId, String nextTaskId,String key);
List<TzsUserInfoDto> selectParentOrgUsers(@Param("parentOrgCodeList") Set<String> parentOrgCodeList); List<TzsUserInfoDto> selectParentOrgUsers(@Param("parentOrgCodeList") Set<String> parentOrgCodeList);
/**
* 按照公司编码查询公司下的人
* @param companyCodes
* @return List<TzsUserInfoDto>
*/
List<TzsUserInfoDto> selectUserByCompanyCodes(@Param("companyCodes") List<String> companyCodes);
} }
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcBaseMapper.xml
View file @ c3ec77b8
...@@ -52,6 +52,22 @@ ...@@ -52,6 +52,22 @@
</foreach> </foreach>
GROUP BY c.org_code GROUP BY c.org_code
</select> </select>
<select id="selectUserByCompanyCodes" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto">
SELECT
group_concat(u.user_id) as amos_user_id,
c.company_code as unitCode
FROM
"privilege_user_org_role" u,
"privilege_company" c
WHERE
u.company_seq = c.sequence_nbr
and
c.company_code in
<foreach collection="companyCodes" item="companyCode" open="(" close=")" separator=",">
#{companyCode}
</foreach>
GROUP BY c.company_code
</select>
</mapper> </mapper>
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/pom.xml
View file @ c3ec77b8
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
<groupId>net.javacrumbs.shedlock</groupId> <groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-spring</artifactId> <artifactId>shedlock-spring</artifactId>
</dependency> </dependency>
<dependency>
<groupId>net.javacrumbs.shedlock</groupId>
<artifactId>shedlock-provider-redis-spring</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/config/ShedLockConfig.java 0 → 100644
View file @ c3ec77b8
package com.yeejoin.amos.boot.module.jyjc.biz.config;
import net.javacrumbs.shedlock.core.LockProvider;
import net.javacrumbs.shedlock.provider.redis.spring.RedisLockProvider;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
/**
* @author Administrator
*/
@Configuration
public class ShedLockConfig {
@Bean
public LockProvider lockProvider(RedisConnectionFactory connectionFactory) {
return new RedisLockProvider(connectionFactory);
}
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java
View file @ c3ec77b8
package com.yeejoin.amos.boot.module.jyjc.biz.controller; package com.yeejoin.amos.boot.module.jyjc.biz.controller;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
...@@ -225,7 +224,7 @@ public class JyjcInspectionApplicationController extends BaseController { ...@@ -225,7 +224,7 @@ public class JyjcInspectionApplicationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "接收", notes = "接收") @ApiOperation(httpMethod = "POST", value = "接收", notes = "接收")
@PostMapping(value = "/flow/{type}/receive") @PostMapping(value = "/flow/{type}/receive")
public ResponseModel<HashMap<String, String>> execueFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) { public ResponseModel executeFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
params.put("type", type); params.put("type", type);
try { try {
jyjcInspectionApplicationServiceImpl.doReceive(params); jyjcInspectionApplicationServiceImpl.doReceive(params);
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/InspectionDetectionSaveToDbEvent.java
View file @ c3ec77b8
...@@ -10,7 +10,7 @@ import java.util.List; ...@@ -10,7 +10,7 @@ import java.util.List;
* @author Administrator * @author Administrator
*/ */
@Getter @Getter
public class InspectionDetectionSaveToDbEvent extends ApplicationEvent { public class InspectionDetectionSaveToDbEvent extends ApplicationEvent {
private List<JyjcInspectionResult> jyjcInspectionResultList; private List<JyjcInspectionResult> jyjcInspectionResultList;
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionApplicationPushEventListener.java
View file @ c3ec77b8
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.event.listener; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jyjc.biz.event.listener;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Sequence; import com.baomidou.mybatisplus.core.toolkit.Sequence;
...@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEven ...@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEven
import com.yeejoin.amos.boot.module.jyjc.biz.kafka.KafkaProducer; import com.yeejoin.amos.boot.module.jyjc.biz.kafka.KafkaProducer;
import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationEquipServiceImpl; import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationEquipServiceImpl;
import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationPushLogServiceImpl; import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationPushLogServiceImpl;
import com.yeejoin.amos.boot.module.jyjc.biz.util.JyjcConstant;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo; import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
...@@ -204,35 +206,55 @@ public class InspectionApplicationPushEventListener implements ApplicationListen ...@@ -204,35 +206,55 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
private Map<String, Object> populateEquipInfoWithTechParams(String equList, String record) { private Map<String, Object> populateEquipInfoWithTechParams(String equList, String record) {
EquipCategoryEnum productType = EquipCategoryEnum.of(Integer.parseInt(equList)); EquipCategoryEnum productType = EquipCategoryEnum.of(Integer.parseInt(equList));
Map<String, Object> echParamMap = new HashMap<>();
switch (Objects.requireNonNull(productType)) { switch (Objects.requireNonNull(productType)) {
// 锅炉 - 监管未调整
case IDX_BIZ_JG_TECH_PARAMS_BOILER: case IDX_BIZ_JG_TECH_PARAMS_BOILER:
return BeanUtil.beanToMap(equipTechParamBoilerMapper.queryTechParamInUse(record)); // 锅炉-已确认
// 压力容器 - 监管未调整 echParamMap = BeanUtil.beanToMap(equipTechParamBoilerMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_VESSEL: case IDX_BIZ_JG_TECH_PARAMS_VESSEL:
return BeanUtil.beanToMap(equipTechParamVesselMapper.queryTechParamInUse(record)); // 压力容器-待核对
// 电梯 echParamMap = BeanUtil.beanToMap(equipTechParamVesselMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_ELEVATOR: case IDX_BIZ_JG_TECH_PARAMS_ELEVATOR:
return BeanUtil.beanToMap(equipTechParamElevatorMapper.queryTechParamInUse(record)); // 电梯-已确认
// 起重机械 echParamMap = BeanUtil.beanToMap(equipTechParamElevatorMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_LIFTING: case IDX_BIZ_JG_TECH_PARAMS_LIFTING:
return BeanUtil.beanToMap(equipTechParamLiftingMapper.queryTechParamInUse(record)); // 起重机械-已确认
// 场（厂）内专用机动车辆 echParamMap = BeanUtil.beanToMap(equipTechParamLiftingMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_VEHICLE: case IDX_BIZ_JG_TECH_PARAMS_VEHICLE:
return BeanUtil.beanToMap(equipTechParamVehicleMapper.queryTechParamInUse(record)); // 场（厂）内专用机动车辆-已确认
// 大型游乐设施 echParamMap = BeanUtil.beanToMap(equipTechParamVehicleMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_RIDES: case IDX_BIZ_JG_TECH_PARAMS_RIDES:
return BeanUtil.beanToMap(equipTechParamRidesMapper.queryTechParamInUse(record)); // 大型游乐设施-已确认
// 压力管道 - 监管未调整 echParamMap = BeanUtil.beanToMap(equipTechParamRidesMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_PIPELINE: case IDX_BIZ_JG_TECH_PARAMS_PIPELINE:
return BeanUtil.beanToMap(equipTechParamPipelineMapper.queryTechParamInUse(record)); // 压力管道-已确认
// 客运索道 echParamMap = BeanUtil.beanToMap(equipTechParamPipelineMapper.queryTechParamInUse(record));
break;
case IDX_BIZ_JG_TECH_PARAMS_ROPEWAY: case IDX_BIZ_JG_TECH_PARAMS_ROPEWAY:
return BeanUtil.beanToMap(equipTechParamRopewayMapper.queryTechParamInUse(record)); // 客运索道-已确认
echParamMap = BeanUtil.beanToMap(equipTechParamRopewayMapper.queryTechParamInUse(record));
break;
default: default:
break; break;
} }
return null; this.castStr2JsonField(echParamMap);
return echParamMap;
}
private void castStr2JsonField(Map<String, Object> echParamMap) {
if(echParamMap != null){
echParamMap.forEach((k, v) -> {
if (JyjcConstant.TECH_PARAM_JSON_FIELDS.contains(k) && v != null) {
echParamMap.put(k, JSON.parse(v.toString()));
}
});
}
} }
private String getAddressByRecord(String equipUnicode) { private String getAddressByRecord(String equipUnicode) {
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/job/InspectionExpireRemindJob.java
View file @ c3ec77b8
...@@ -2,13 +2,10 @@ package com.yeejoin.amos.boot.module.jyjc.biz.job; ...@@ -2,13 +2,10 @@ package com.yeejoin.amos.boot.module.jyjc.biz.job;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper; import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
import com.yeejoin.amos.boot.module.jyjc.api.model.NeedTipEquipInfo; import com.yeejoin.amos.boot.module.jyjc.api.model.NeedTipEquipInfo;
import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto; import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.UseInfoModel; import com.yeejoin.amos.boot.module.ymt.api.dto.UseInfoModel;
import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum; import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
...@@ -20,7 +17,6 @@ import net.javacrumbs.shedlock.spring.annotation.SchedulerLock; ...@@ -20,7 +17,6 @@ import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*; import java.util.*;
...@@ -96,12 +92,14 @@ public class InspectionExpireRemindJob { ...@@ -96,12 +92,14 @@ public class InspectionExpireRemindJob {
// 使用单位 // 使用单位
List<String> allUnitCodes = needTipEquipList.stream().map(NeedTipEquipInfo::getUseUnitCreditCode).distinct().collect(Collectors.toList()); List<String> allUnitCodes = needTipEquipList.stream().map(NeedTipEquipInfo::getUseUnitCreditCode).distinct().collect(Collectors.toList());
// 查询使用单位下的人-数据库-批量查询 // 查询使用单位下的人-数据库-批量查询
List<TzsUserInfo> useUnitUserList = this.getUseUnitUserList(allUnitCodes); List<TzsUserInfoDto> useUnitUserList = this.getUseUnitUserList(allUnitCodes);
// 查询管辖单位下的人-数据库-批量查询 // 查询管辖单位下的人-数据库-批量查询
List<TzsUserInfoDto> superviseUnitUserList = this.getSuperviseUnitUserList(needTipEquipList); List<TzsUserInfoDto> superviseUnitUserList = this.getSuperviseUnitUserList(needTipEquipList);
// 以设备为维度，把 需要发送消息的人进行合并 // 以设备为维度，把 需要发送消息的人进行合并
needTipEquipList.forEach(e -> { needTipEquipList.forEach(e -> {
e.setReceiveUsers(useUnitUserList.stream().filter(u -> e.getUseUnitCreditCode().equals(u.getUnitCode())).map(TzsUserInfo::getAmosUserId).collect(Collectors.toSet())); // 本使用单位下的人
e.setReceiveUsers(useUnitUserList.stream().filter(u -> e.getUseUnitCreditCode().equals(u.getUnitCode())).map(TzsUserInfoDto::getAmosUserId).collect(Collectors.toSet()));
// 父级的人(所、区县、地市、省)
e.getReceiveUsers().addAll(superviseUnitUserList.stream().filter(u -> e.getParentOrgBranchCode().contains(u.getOrgCode())).map(TzsUserInfoDto::getAmosUserId).collect(Collectors.toSet())); e.getReceiveUsers().addAll(superviseUnitUserList.stream().filter(u -> e.getParentOrgBranchCode().contains(u.getOrgCode())).map(TzsUserInfoDto::getAmosUserId).collect(Collectors.toSet()));
}); });
// 人员去重，字符串可能为:元素1：8551496,8551496,8551496，元素2：8551496,8551497，需要转为8551496、8551497 // 人员去重，字符串可能为:元素1：8551496,8551496,8551496，元素2：8551496,8551497，需要转为8551496、8551497
...@@ -120,13 +118,8 @@ public class InspectionExpireRemindJob { ...@@ -120,13 +118,8 @@ public class InspectionExpireRemindJob {
return jyjcBaseMapper.selectParentOrgUsers(allParentOrgCodes); return jyjcBaseMapper.selectParentOrgUsers(allParentOrgCodes);
} }
private List<TzsUserInfo> getUseUnitUserList(List<String> allUnitCodes) { private List<TzsUserInfoDto> getUseUnitUserList(List<String> allUnitCodes) {
LambdaQueryWrapper<TzsUserInfo> queryWrapper = new LambdaQueryWrapper<>(); return jyjcBaseMapper.selectUserByCompanyCodes(allUnitCodes);
queryWrapper.select(TzsUserInfo::getAmosUserId, TzsUserInfo::getUnitCode);
queryWrapper.in(TzsUserInfo::getUnitCode, allUnitCodes);
queryWrapper.eq(BaseEntity::getIsDelete, false);
queryWrapper.isNotNull(TzsUserInfo::getAmosUserId);
return tzsUserInfoMapper.selectList(queryWrapper);
} }
private List<NeedTipEquipInfo> buildTipEquipInfoList(List<UseInfoModel> needTipEquipList) { private List<NeedTipEquipInfo> buildTipEquipInfoList(List<UseInfoModel> needTipEquipList) {
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @ c3ec77b8
package com.yeejoin.amos.boot.module.jyjc.biz.service.impl; package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder; import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -19,10 +18,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; ...@@ -19,10 +18,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService; import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto; import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.jyjc.api.entity.*; import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum; import com.yeejoin.amos.boot.module.jyjc.api.enums.*;
import com.yeejoin.amos.boot.module.jyjc.api.enums.DocumentEnum;
import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultTypeEnum;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper; import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper; import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
import com.yeejoin.amos.boot.module.jyjc.api.model.*; import com.yeejoin.amos.boot.module.jyjc.api.model.*;
...@@ -37,20 +33,22 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum; ...@@ -37,20 +33,22 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper; import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.model.TaskV2Model; import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
import com.yeejoin.amos.feign.workflow.Workflow; import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
import com.yeejoin.amos.feign.workflow.model.*; import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.exception.BaseException;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
...@@ -79,6 +77,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -79,6 +77,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
@Autowired @Autowired
EventPublisher eventPublisher; EventPublisher eventPublisher;
@Autowired
@Lazy
InspectionPlanServiceImpl inspectionPlanService;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -147,7 +149,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -147,7 +149,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
list.add(dto); list.add(dto);
actWorkflowBatchDTO.setProcess(list); actWorkflowBatchDTO.setProcess(list);
String[] inspectionUnit = model.getInspectionUnitCode().split("_"); String[] inspectionUnit = model.getInspectionUnitCode().split("_");
if(inspectionUnit.length == 2){ if (inspectionUnit.length == 2) {
model.setInspectionUnitCode(inspectionUnit[0]); model.setInspectionUnitCode(inspectionUnit[0]);
model.setInspectionUnitName(inspectionUnit[1]); model.setInspectionUnitName(inspectionUnit[1]);
} }
...@@ -174,7 +176,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -174,7 +176,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理 model.setStatus(String.valueOf(FlowStatusEnum.TO_SUBMITTED.getCode())); //6611 对应数据字典 检验流程状态 待受理
} else if (model.getOperationType().equals("1")) { // 工作台暂存、详情保存逻辑 } else if (model.getOperationType().equals("1")) { // 工作台暂存、详情保存逻辑
String[] inspectionUnit = model.getInspectionUnitCode().split("_"); String[] inspectionUnit = model.getInspectionUnitCode().split("_");
if(inspectionUnit.length == 2){ if (inspectionUnit.length == 2) {
model.setInspectionUnitCode(inspectionUnit[0]); model.setInspectionUnitCode(inspectionUnit[0]);
model.setInspectionUnitName(inspectionUnit[1]); model.setInspectionUnitName(inspectionUnit[1]);
} }
...@@ -487,7 +489,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -487,7 +489,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
} }
public Map<String, Object> selectBySeq(Long sequenceNbr) { public Map<String, Object> selectBySeq(Long sequenceNbr) {
JyjcInspectionApplicationModel model = this.getBaseMapper().selectDataBySeq(sequenceNbr); JyjcInspectionApplicationModel model = this.getBaseMapper().selectDataBySeq(sequenceNbr);
Map<String, Object> map = BeanUtil.beanToMap(model); Map<String, Object> map = BeanUtil.beanToMap(model);
List<Map<String, Object>> dataByApplicationSeq = jyjcInspectionApplicationAttachmentService.getBaseMapper().getDataByApplicationSeq(sequenceNbr); List<Map<String, Object>> dataByApplicationSeq = jyjcInspectionApplicationAttachmentService.getBaseMapper().getDataByApplicationSeq(sequenceNbr);
...@@ -523,9 +524,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -523,9 +524,15 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
map.put("equip", arrayList); map.put("equip", arrayList);
} }
map.putAll(attMap); map.putAll(attMap);
this.setPlanData(sequenceNbr, map);
return map; return map;
} }
private void setPlanData(Long sequenceNbr, Map<String, Object> map) {
JSONObject planData = inspectionPlanService.getDetail(String.valueOf(sequenceNbr));
map.put("planData", planData);
}
/** /**
* 接收 * 接收
* *
...@@ -542,7 +549,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -542,7 +549,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
LambdaQueryWrapper<JyjcInspectionApplication> lambda = new QueryWrapper<JyjcInspectionApplication>().lambda(); LambdaQueryWrapper<JyjcInspectionApplication> lambda = new QueryWrapper<JyjcInspectionApplication>().lambda();
lambda.eq(JyjcInspectionApplication::getSequenceNbr, sequenceNbr); lambda.eq(JyjcInspectionApplication::getSequenceNbr, sequenceNbr);
JyjcInspectionApplication entity = this.getBaseMapper().selectOne(lambda); JyjcInspectionApplication entity = this.getBaseMapper().selectOne(lambda);
String taskId = entity.getNextTaskId(); String taskId = entity.getNextTaskId();
//组装信息 //组装信息
TaskResultDTO task = new TaskResultDTO(); TaskResultDTO task = new TaskResultDTO();
...@@ -554,7 +560,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -554,7 +560,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
task.setVariable(map); task.setVariable(map);
//执行流程 //执行流程
task.setNextExecuteUserCompanyCode(entity.getInspectionUnitCode()); task.setNextExecuteUserCompanyCode(entity.getInspectionUnitCode());
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task); cmWorkflowService.complete(taskId, task);
entity.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode())); entity.setStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
JyjcInspectionApplicationModel model = new JyjcInspectionApplicationModel(); JyjcInspectionApplicationModel model = new JyjcInspectionApplicationModel();
model.setStatusName(FlowStatusEnum.TO_BE_FINISHED.getName()); model.setStatusName(FlowStatusEnum.TO_BE_FINISHED.getName());
...@@ -564,32 +570,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -564,32 +570,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
if (StringUtils.isNotBlank(processDescription)) { if (StringUtils.isNotBlank(processDescription)) {
entity.setProcessDescription(processDescription); entity.setProcessDescription(processDescription);
} }
List<String> persons = JSONArray.parseArray(JSON.toJSONString(params.get("inspectionChargePerson")), String.class);
if (CollectionUtil.isNotEmpty(persons)) {
List<String> personCodes = new ArrayList<>();
List<String> personNames = new ArrayList<>();
for (String person : persons) {
String[] s = person.split("_");
personCodes.add(s[0]);
personNames.add(s[1]);
}
String inspectionChargePerson = persons == null ? "" : String.join(",", persons);
if (StringUtils.isNotBlank(inspectionChargePerson)) {
entity.setInspectionChargePerson(String.join(",", personCodes));
entity.setInspectionChargePersonName(String.join(",", personNames));
}
}
String inspectionChargePhone = (String) params.get("inspectionChargePhone");
if (StringUtils.isNotBlank(inspectionChargePhone)) {
entity.setInspectionChargePhone(inspectionChargePhone);
}
this.updateById(entity); this.updateById(entity);
BeanUtils.copyProperties(entity, model); BeanUtils.copyProperties(entity, model);
updateTaskModel(model); updateTaskModel(model);
// 执行接收业务 // 执行接收业务
JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr); JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
...@@ -598,12 +581,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -598,12 +581,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
log.warn("JyjcInspectionApplicationModel Not Found！"); log.warn("JyjcInspectionApplicationModel Not Found！");
return; return;
} }
List<JyjcInspectionResult> resultModels = new ArrayList<>();
List<JyjcInspectionResult> resultModels = new ArrayList(applicationEquipModels.size());
List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size()).getResult(); List<String> codes = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.JG.getCode(), applicationEquipModels.size()).getResult();
for (int i = 0; i < applicationEquipModels.size(); i++) { for (int i = 0; i < applicationEquipModels.size(); i++) {
JyjcInspectionResult resultModel = new JyjcInspectionResult(); JyjcInspectionResult resultModel = new JyjcInspectionResult();
resultModel.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode()); resultModel.setInspectionUnitCode(inspectionApplicationModel.getInspectionUnitCode());
...@@ -613,7 +593,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -613,7 +593,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
resultModel.setApplicationUnitName(inspectionApplicationModel.getApplicationUnitName()); resultModel.setApplicationUnitName(inspectionApplicationModel.getApplicationUnitName());
resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode()); resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode());
resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate()); resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
resultModel.setResultType(inspectionApplicationModel.getResultType());
resultModel.setInspectionType(inspectionApplicationModel.getInspectionType()); resultModel.setInspectionType(inspectionApplicationModel.getInspectionType());
resultModel.setInspectionTypeName(this.getDictNameByCode(inspectionApplicationModel.getInspectionType())); resultModel.setInspectionTypeName(this.getDictNameByCode(inspectionApplicationModel.getInspectionType()));
// 解析设备 // 解析设备
...@@ -626,15 +606,44 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -626,15 +606,44 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
resultModel.setEquCategory(applicationEquipModels.get(i).getEquCategory()); resultModel.setEquCategory(applicationEquipModels.get(i).getEquCategory());
resultModel.setEquList(applicationEquipModels.get(i).getEquList()); resultModel.setEquList(applicationEquipModels.get(i).getEquList());
resultModel.setIsExistNc(false); resultModel.setIsExistNc(false);
this.setResultTypeByBizType(resultModel, inspectionApplicationModel.getBizType());
resultModels.add(resultModel); resultModels.add(resultModel);
} }
inspectionResultService.saveOrUpdateBatch(resultModels); inspectionResultService.saveOrUpdateBatch(resultModels);
this.pushInspectionApplication(inspectionApplicationModel); this.pushInspectionApplication(inspectionApplicationModel);
} }
private void setResultTypeByBizType(JyjcInspectionResult resultModel, String bizType) {
// 由于一个检验检测单位可以申请开通检验、检测两个申请，即确定一个 开通申请的维度为：单位编码 + 开通业务类型
// 但是表里面放的使用单位的公司编码，导致无法匹配到正确的开通申请,故按照单位编码+ 开通类型 + 状态查询开通申请
BizTypeEnum bizTypeEnum = BizTypeEnum.getInstance(bizType);
String openBizType = "";
assert bizTypeEnum != null;
switch (bizTypeEnum) {
case SUPERVISE:
case FIRST_INSPECTION:
openBizType = OpenBizTypeEnum.JY.getCode();
break;
case DETECTION:
openBizType = OpenBizTypeEnum.JC.getCode();
break;
default:
break;
}
LambdaQueryWrapper<JyjcOpeningApplication> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(JyjcOpeningApplication::getUnitCode, resultModel.getInspectionUnitCode());
queryWrapper.eq(JyjcOpeningApplication::getOpenBizType, openBizType);
queryWrapper.eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getCode());
queryWrapper.select(JyjcOpeningApplication::getResultType);
List<JyjcOpeningApplication> applicationList = jyjcOpeningApplicationService.list(queryWrapper);
if (applicationList.size() > 0) {
resultModel.setResultType(applicationList.get(0).getResultType());
}
}
private void pushInspectionApplication(JyjcInspectionApplicationModel inspectionApplicationModel) { private void pushInspectionApplication(JyjcInspectionApplicationModel inspectionApplicationModel) {
// 将检验检测申请信息推送至对应的检验机构 // 将检验检测申请信息推送至对应的检验机构
if(inspectionApplicationModel.getResultType().equals(ResultTypeEnum.INTEGRATED.getCode())){ if (inspectionApplicationModel.getResultType().equals(ResultTypeEnum.INTEGRATED.getCode())) {
InspectionApplicationPushEvent event = new InspectionApplicationPushEvent(this, inspectionApplicationModel); InspectionApplicationPushEvent event = new InspectionApplicationPushEvent(this, inspectionApplicationModel);
eventPublisher.publish(event); eventPublisher.publish(event);
} }
...@@ -676,7 +685,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -676,7 +685,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
//执行流程 //执行流程
task.setNextExecuteUserCompanyCode(entity.getInspectionUnitCode()); task.setNextExecuteUserCompanyCode(entity.getInspectionUnitCode());
ProcessTaskDTO processTaskDTO = cmWorkflowService.reject(taskId, task); ProcessTaskDTO processTaskDTO = cmWorkflowService.reject(taskId, task);
String taskCode = FlowStatusEnum.TO_SUBMITTED.getName();
String taskName1 = ""; String taskName1 = "";
String nextTaskId = ""; String nextTaskId = "";
this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll); this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll);
...@@ -693,7 +701,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -693,7 +701,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds(); String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
String executorRoleIds = workflowResultDtos.get(0).getExecutorRoleIds(); String executorRoleIds = workflowResultDtos.get(0).getExecutorRoleIds();
if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) { if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
taskCode = processTaskDTO.getNextTask().get(0).getKey();
taskName1 = processTaskDTO.getNextTask().get(0).getName(); taskName1 = processTaskDTO.getNextTask().get(0).getName();
nextTaskId = processTaskDTO.getNextTask().get(0).getId(); nextTaskId = processTaskDTO.getNextTask().get(0).getId();
} }
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/util/JyjcConstant.java
View file @ c3ec77b8
package com.yeejoin.amos.boot.module.jyjc.biz.util; package com.yeejoin.amos.boot.module.jyjc.biz.util;
import java.util.Arrays;
import java.util.List;
/** /**
* @author Administrator * @author Administrator
*/ */
...@@ -8,5 +11,5 @@ public class JyjcConstant { ...@@ -8,5 +11,5 @@ public class JyjcConstant {
/** /**
* 技术参数json类型字段 * 技术参数json类型字段
*/ */
public static final String[] TECH_PARAM_JSON_FIELDS = {"safetyAccessoriesAndRelatedDevices", "gasCylinderAccessories"}; public static final List<String> TECH_PARAM_JSON_FIELDS = Arrays.asList("safetyAccessoriesAndRelatedDevices", "gasCylinderAccessories", "pipeInfo");
} }
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/EquipTechParamLifting.java
View file @ c3ec77b8
...@@ -1044,5 +1044,17 @@ public class EquipTechParamLifting extends AbstractEquipBaseEntity { ...@@ -1044,5 +1044,17 @@ public class EquipTechParamLifting extends AbstractEquipBaseEntity {
@TableField(value = "\"MAIN_PART\"") @TableField(value = "\"MAIN_PART\"")
private String mainPart; private String mainPart;
/**
* 整机防爆标志
*/
@TableField("\"EXPLOSIONPROOF_SIGN_COMPLETE\"")
private String explosionproofSignComplete;
/**
* 燃爆物质
*/
@TableField("\"EXPLOSIVE_SUBSTANCE\"")
private String explosiveSubstance;
} }
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/EquipTechParamPipeline.java
View file @ c3ec77b8
...@@ -10,7 +10,7 @@ import java.math.BigDecimal; ...@@ -10,7 +10,7 @@ import java.math.BigDecimal;
/** /**
* 安全追溯-压力管道 * 安全追溯-压力管道
* *
* @author cpp * @author cpp
* @date 2023-04-06 15:21:22 * @date 2023-04-06 15:21:22
*/ */
...@@ -19,115 +19,148 @@ import java.math.BigDecimal; ...@@ -19,115 +19,148 @@ import java.math.BigDecimal;
@Accessors(chain = true) @Accessors(chain = true)
@TableName("idx_biz_jg_tech_params_pipeline") @TableName("idx_biz_jg_tech_params_pipeline")
public class EquipTechParamPipeline extends AbstractEquipBaseEntity { public class EquipTechParamPipeline extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* * $column.comments
*/
/**
* * $column.comments @TableField(value = "\"INSTANCE_ID\"")
* */ private String instanceId;
/**
@TableField(value ="\"INSTANCE_ID\"") * * $column.comments
private String instanceId; */
/**
* * $column.comments @TableField(value = "\"STATUS\"")
* */ private String status;
/**
@TableField(value ="\"STATUS\"") * * 工程(装置)名称
private String status; */
/**
* * 工程(装置)名称 @TableField(value = "\"DEVICE_NAME\"")
* */ private String deviceName;
/**
@TableField(value ="\"DEVICE_NAME\"") * * 管道类别
private String deviceName; */
/**
* * 管道类别 @TableField(value = "\"PIPELINE_CLASS\"")
* */ private String pipelineClass;
/**
@TableField(value ="\"PIPELINE_CLASS\"") * * 管道名称（登记单元）
private String pipelineClass; */
/**
* * 管道名称（登记单元） @TableField(value = "\"PIPE_NAME\"")
* */ private String pipeName;
/**
@TableField(value ="\"PIPE_NAME\"") * * 管道编号
private String pipeName; */
/**
* * 管道编号 @TableField(value = "\"PIPELINE_NUMBER\"")
* */ private String pipelineNumber;
/**
@TableField(value ="\"PIPELINE_NUMBER\"") * * 设备级别
private String pipelineNumber; */
/**
* * 设备级别 @TableField(value = "\"DEVICE_LEVEL\"")
* */ private String deviceLevel;
/**
@TableField(value ="\"DEVICE_LEVEL\"") * * 设计标准
private String deviceLevel; */
/**
* * 设计标准 @TableField(value = "\"DESIGN_STANDARD\"")
* */ private String designStandard;
/**
@TableField(value ="\"DESIGN_STANDARD\"") * * 管道图号
private String designStandard; */
/**
* * 管道图号 @TableField(value = "\"PIPE_DRAW_NUMBER\"")
* */ private String pipeDrawNumber;
/**
@TableField(value ="\"PIPE_DRAW_NUMBER\"") * * 公称直径
private String pipeDrawNumber; */
/**
* * 公称直径 @TableField(value = "\"NOMINAL_DIAMETER\"")
* */ private BigDecimal nominalDiameter;
/**
@TableField(value ="\"NOMINAL_DIAMETER\"") * * 公称壁厚
private BigDecimal nominalDiameter; */
/**
* * 公称壁厚 @TableField(value = "\"WALL_THICKNESS\"")
* */ private BigDecimal wallThickness;
/**
@TableField(value ="\"WALL_THICKNESS\"") * * 管道长度
private BigDecimal wallThickness; */
/**
* * 管道长度 @TableField(value = "\"PIPE_LENGTH\"")
* */ private BigDecimal pipeLength;
/**
@TableField(value ="\"PIPE_LENGTH\"") * * 起始位置起点
private BigDecimal pipeLength; */
/**
* * 起始位置起点 @TableField(value = "\"STARTE_POSITION\"")
* */ private String startePosition;
/**
@TableField(value ="\"STARTE_POSITION\"") * * 设计压力
private String startePosition; */
/**
* * 压力 @TableField(value = "\"PRESSURE\"")
* */ private String pressure;
/**
@TableField(value ="\"PRESSURE\"") * * 设计温度
private BigDecimal pressure; */
/**
* * 温度 @TableField(value = "\"TEMPERATURE\"")
* */ private String temperature;
/**
@TableField(value ="\"TEMPERATURE\"") * * 设计介质
private BigDecimal temperature; */
/**
* * 介质 @TableField(value = "\"MEDIUM\"")
* */ private String medium;
/**
@TableField(value ="\"MEDIUM\"") * * 设计备注
private String medium; */
/**
* * 备注 @TableField(value = "\"REMARKS\"")
* */ private String remarks;
@TableField(value ="\"REMARKS\"") /**
private String remarks; * 终点位置
*/
@TableField("\"END_POSITION\"")
private String endPosition;
/**
* 管道信息
*/
@TableField(value = "\"PIPE_INFO\"")
private String pipeInfo;
/**
* * 工作压力
*/
@TableField(value = "\"WORK_PRESSURE\"")
private String workPressure;
/**
* * 工作温度
*/
@TableField(value = "\"WORK_TEMPERATURE\"")
private String workTemperature;
/**
* * 工作介质
*/
@TableField(value = "\"WORK_MEDIUM\"")
private String workMedium;
/**
* * 工作备注
*/
@TableField(value = "\"WORK_REMARKS\"")
private String workRemarks;
} }
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/EquipTechParamVessel.java
View file @ c3ec77b8
...@@ -10,7 +10,7 @@ import java.math.BigDecimal; ...@@ -10,7 +10,7 @@ import java.math.BigDecimal;
/** /**
* 安全追溯-压力容器 * 安全追溯-压力容器
* *
* @author cpp * @author cpp
* @date 2023-04-06 15:21:21 * @date 2023-04-06 15:21:21
*/ */
...@@ -19,514 +19,529 @@ import java.math.BigDecimal; ...@@ -19,514 +19,529 @@ import java.math.BigDecimal;
@Accessors(chain = true) @Accessors(chain = true)
@TableName("idx_biz_jg_tech_params_vessel") @TableName("idx_biz_jg_tech_params_vessel")
public class EquipTechParamVessel extends AbstractEquipBaseEntity { public class EquipTechParamVessel extends AbstractEquipBaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
/** * * $column.comments
* * $column.comments * */
* */
/**
/** * * $column.comments
* * $column.comments */
* */
@TableField(value = "\"INSTANCE_ID\"")
@TableField(value ="\"INSTANCE_ID\"") private String instanceId;
private String instanceId; /**
/** * * $column.comments
* * $column.comments */
* */
@TableField(value = "\"STATUS\"")
@TableField(value ="\"STATUS\"") private String status;
private String status; /**
/** * * 额定质量
* * 额定质量 */
* */
@TableField(value = "\"RATED_QUALITY\"")
@TableField(value ="\"RATED_QUALITY\"") private BigDecimal ratedQuality;
private BigDecimal ratedQuality; /**
/** * * 使用环境温度
* * 使用环境温度 */
* */
@TableField(value = "\"AMBIENT_TEMPERATURE\"")
@TableField(value ="\"AMBIENT_TEMPERATURE\"") private BigDecimal ambientTemperature;
private BigDecimal ambientTemperature; /**
/** * * 型号
* * 型号 */
* */
@TableField(value = "\"MODEL_NUMBER\"")
@TableField(value ="\"MODEL_NUMBER\"") private String modelNumber;
private String modelNumber; /**
/** * * 数量
* * 数量 */
* */
@TableField(value = "\"NUM\"")
@TableField(value ="\"NUM\"") private Integer num;
private Integer num; /**
/** * * 单瓶容积
* * 单瓶容积 */
* */
@TableField(value = "\"SINGLE_BOTTLE_VOLUME\"")
@TableField(value ="\"SINGLE_BOTTLE_VOLUME\"") private BigDecimal singleBottleVolume;
private BigDecimal singleBottleVolume; /**
/** * * 总容积
* * 总容积 */
* */
@TableField(value = "\"TOTAL_VOLUME\"")
@TableField(value ="\"TOTAL_VOLUME\"") private BigDecimal totalVolume;
private BigDecimal totalVolume; /**
/** * * 充装介质
* * 充装介质 */
* */
@TableField(value = "\"CHARGING_MEDIUM\"")
@TableField(value ="\"CHARGING_MEDIUM\"") private String chargingMedium;
private String chargingMedium; /**
/** * * 规格
* * 规格 */
* */
@TableField(value = "\"SPECIFICATION\"")
@TableField(value ="\"SPECIFICATION\"") private String specification;
private String specification; /**
/** * * 外径
* * 外径 */
* */
@TableField(value = "\"OUTSIDE_DIAMETER\"")
@TableField(value ="\"OUTSIDE_DIAMETER\"") private BigDecimal outsideDiameter;
private BigDecimal outsideDiameter; /**
/** * * 壁厚
* * 壁厚 */
* */
@TableField(value = "\"WALL_THICKNESS\"")
@TableField(value ="\"WALL_THICKNESS\"") private BigDecimal wallThickness;
private BigDecimal wallThickness; /**
/** * * 长度
* * 长度 */
* */
@TableField(value = "\"LENGTH\"")
@TableField(value ="\"LENGTH\"") private BigDecimal length;
private BigDecimal length; /**
/** * * 公称工作压力
* * 公称工作压力 */
* */
@TableField(value = "\"NOMINAL_WORKING_PRESSURE\"")
@TableField(value ="\"NOMINAL_WORKING_PRESSURE\"") private BigDecimal nominalWorkingPressure;
private BigDecimal nominalWorkingPressure; /**
/** * * 材料（瓶体）
* * 材料（瓶体） */
* */
@TableField(value = "\"BOTTLE_BODY\"")
@TableField(value ="\"BOTTLE_BODY\"") private String bottleBody;
private String bottleBody; /**
/** * * 材料（端塞）
* * 材料（端塞） */
* */
@TableField(value = "\"END_PLUG\"")
@TableField(value ="\"END_PLUG\"") private String endPlug;
private String endPlug; /**
/** * * 材料（管路）
* * 材料（管路） */
* */
@TableField(value = "\"PIPING\"")
@TableField(value ="\"PIPING\"") private String piping;
private String piping; /**
/** * * 无损检测方法（气瓶）
* * 无损检测方法（气瓶） */
* */
@TableField(value = "\"QP_LOSSLESS\"")
@TableField(value ="\"QP_LOSSLESS\"") private String qpLossless;
private String qpLossless; /**
/** * * 无损检测方法（管路）
* * 无损检测方法（管路） */
* */
@TableField(value = "\"GL_LOSSLESS\"")
@TableField(value ="\"GL_LOSSLESS\"") private String glLossless;
private String glLossless; /**
/** * * 无损检测比例（气瓶）
* * 无损检测比例（气瓶） */
* */
@TableField(value = "\"QP_RATIO\"")
@TableField(value ="\"QP_RATIO\"") private BigDecimal qpRatio;
private BigDecimal qpRatio; /**
/** * * 无损检测比例（管路）
* * 无损检测比例（管路） */
* */
@TableField(value = "\"GL_RATIO\"")
@TableField(value ="\"GL_RATIO\"") private BigDecimal glRatio;
private BigDecimal glRatio; /**
/** * * 耐压试验压力（气瓶）
* * 耐压试验压力（气瓶） */
* */
@TableField(value = "\"QP_PRESSURE\"")
@TableField(value ="\"QP_PRESSURE\"") private BigDecimal qpPressure;
private BigDecimal qpPressure; /**
/** * * 耐压试验压力（管路）
* * 耐压试验压力（管路） */
* */
@TableField(value = "\"GL_PRESSURE\"")
@TableField(value ="\"GL_PRESSURE\"") private BigDecimal glPressure;
private BigDecimal glPressure; /**
/** * * 气密性试验压力（气瓶）
* * 气密性试验压力（气瓶） */
* */
@TableField(value = "\"QP_AIR_TIGHTNESS\"")
@TableField(value ="\"QP_AIR_TIGHTNESS\"") private BigDecimal qpAirTightness;
private BigDecimal qpAirTightness; /**
/** * * 气密性试验压力（管路）
* * 气密性试验压力（管路） */
* */
@TableField(value = "\"GL_AIR_TIGHTNESS\"")
@TableField(value ="\"GL_AIR_TIGHTNESS\"") private BigDecimal glAirTightness;
private BigDecimal glAirTightness; /**
/** * * 气体置换后压力
* * 气体置换后压力 */
* */
@TableField(value = "\"DISPLACEMENT_PRESSURE\"")
@TableField(value ="\"DISPLACEMENT_PRESSURE\"") private BigDecimal displacementPressure;
private BigDecimal displacementPressure; /**
/** * * 瓶体内含氧量
* * 瓶体内含氧量 */
* */
@TableField(value = "\"OXYGEN\"")
@TableField(value ="\"OXYGEN\"") private BigDecimal oxygen;
private BigDecimal oxygen; /**
/** * * 瓶体内含氧量
* * 瓶体内含氧量 */
* */
@TableField(value = "\"HEAT_TREATMENT_METHOD\"")
@TableField(value ="\"HEAT_TREATMENT_METHOD\"") private String heatTreatmentMethod;
private String heatTreatmentMethod; /**
/** * * 热处理温度
* * 热处理温度 */
* */
@TableField(value = "\"QP_HEAT_TREATMENT_TEMPERATURE\"")
@TableField(value ="\"QP_HEAT_TREATMENT_TEMPERATURE\"") private BigDecimal qpHeatTreatmentTemperature;
private BigDecimal qpHeatTreatmentTemperature; /**
/** * * 气瓶安装位置
* * 气瓶安装位置 */
* */
@TableField(value = "\"INSTALLATION_POSITION\"")
@TableField(value ="\"INSTALLATION_POSITION\"") private String installationPosition;
private String installationPosition; /**
/** * * 容器容积
* * 容器容积 */
* */
@TableField(value = "\"CONTAINER_VOLUME\"")
@TableField(value ="\"CONTAINER_VOLUME\"") private BigDecimal containerVolume;
private BigDecimal containerVolume; /**
/** * * 容器内径
* * 容器内径 */
* */
@TableField(value = "\"PRESSURE_VESSEL_DIAMETER\"")
@TableField(value ="\"PRESSURE_VESSEL_DIAMETER\"") private BigDecimal pressureVesselDiameter;
private BigDecimal pressureVesselDiameter; /**
/** * * 容器高(长)
* * 容器高(长) */
* */
@TableField(value = "\"HEIGHT\"")
@TableField(value ="\"HEIGHT\"") private BigDecimal height;
private BigDecimal height; /**
/** * * 材料（筒体(球壳)）
* * 材料（筒体(球壳)） */
* */
@TableField(value = "\"MATERIAL_CYLINDER_SHELL\"")
@TableField(value ="\"MATERIAL_CYLINDER_SHELL\"") private String materialCylinderShell;
private String materialCylinderShell; /**
/** * * 材料（封头）
* * 材料（封头） */
* */
@TableField(value = "\"PRESSURE_MATERIAL_HEAD\"")
@TableField(value ="\"PRESSURE_MATERIAL_HEAD\"") private String pressureMaterialHead;
private String pressureMaterialHead; /**
/** * * 材料（衬里）
* * 材料（衬里） */
* */
@TableField(value = "\"PRESSURE_MATERIAL_LINING\"")
@TableField(value ="\"PRESSURE_MATERIAL_LINING\"") private String pressureMaterialLining;
private String pressureMaterialLining; /**
/** * * 材料（夹套）
* * 材料（夹套） */
* */
@TableField(value = "\"MATERIAL_JACKET\"")
@TableField(value ="\"MATERIAL_JACKET\"") private String materialJacket;
private String materialJacket; /**
/** * * 厚度（筒体(球壳)）
* * 厚度（筒体(球壳)） */
* */
@TableField(value = "\"THICKNESS\"")
@TableField(value ="\"THICKNESS\"") private BigDecimal thickness;
private BigDecimal thickness; /**
/** * * 厚度（封头）
* * 厚度（封头） */
* */
@TableField(value = "\"FIXED_HEAD\"")
@TableField(value ="\"FIXED_HEAD\"") private BigDecimal fixedHead;
private BigDecimal fixedHead; /**
/** * * 厚度（衬里）
* * 厚度（衬里） */
* */
@TableField(value = "\"FIXED_LINING\"")
@TableField(value ="\"FIXED_LINING\"") private BigDecimal fixedLining;
private BigDecimal fixedLining; /**
/** * * 厚度（夹套）
* * 厚度（夹套） */
* */
@TableField(value = "\"FIXED_JACKET\"")
@TableField(value ="\"FIXED_JACKET\"") private BigDecimal fixedJacket;
private BigDecimal fixedJacket; /**
/** * * 容器自重
* * 容器自重 */
* */
@TableField(value = "\"SELF_WEIGHT\"")
@TableField(value ="\"SELF_WEIGHT\"") private BigDecimal selfWeight;
private BigDecimal selfWeight; /**
/** * * 盛装介质重量
* * 盛装介质重量 */
* */
@TableField(value = "\"MEDIUM_WEIGHT\"")
@TableField(value ="\"MEDIUM_WEIGHT\"") private BigDecimal mediumWeight;
private BigDecimal mediumWeight; /**
/** * * 设计压力（壳程）
* * 设计压力（壳程） */
* */
@TableField(value = "\"PRESSURE_HOUSING_PATH\"")
@TableField(value ="\"PRESSURE_HOUSING_PATH\"") private String pressureHousingPath;
private String pressureHousingPath; /**
/** * * 设计压力（管程）
* * 设计压力（管程） */
* */
@TableField(value = "\"PRESSURE_PIPE\"")
@TableField(value ="\"PRESSURE_PIPE\"") private String pressurePipe;
private String pressurePipe; /**
/** * * 设计压力（夹套）
* * 设计压力（夹套） */
* */
@TableField(value = "\"PRESSURE_JACKET\"")
@TableField(value ="\"PRESSURE_JACKET\"") private String pressureJacket;
private String pressureJacket; /**
/** * * 设计温度（壳程）
* * 设计温度（壳程） */
* */
@TableField(value = "\"TEMPERATURE_SHELL\"")
@TableField(value ="\"TEMPERATURE_SHELL\"") private BigDecimal temperatureShell;
private BigDecimal temperatureShell; /**
/** * * 设计温度（管程）
* * 设计温度（管程） */
* */
@TableField(value = "\"TEMPERATURE_PIPE\"")
@TableField(value ="\"TEMPERATURE_PIPE\"") private BigDecimal temperaturePipe;
private BigDecimal temperaturePipe; /**
/** * * 设计温度（夹套）
* * 设计温度（夹套） */
* */
@TableField(value = "\"TEMPERATURE_JACKET\"")
@TableField(value ="\"TEMPERATURE_JACKET\"") private BigDecimal temperatureJacket;
private BigDecimal temperatureJacket; /**
/** * * 最高允许工作压力（壳程）
* * 最高允许工作压力（壳程） */
* */
@TableField(value = "\"MAX_PRESSURE_SHELL\"")
@TableField(value ="\"MAX_PRESSURE_SHELL\"") private String maxPressureShell;
private String maxPressureShell; /**
/** * * 最高允许工作压力（管程）
* * 最高允许工作压力（管程） */
* */
@TableField(value = "\"MAX_PRESSURE_PIPE\"")
@TableField(value ="\"MAX_PRESSURE_PIPE\"") private String maxPressurePipe;
private String maxPressurePipe; /**
/** * * 最高允许工作压力（夹套）
* * 最高允许工作压力（夹套） */
* */
@TableField(value = "\"MAX_PRESSURE_JACKET\"")
@TableField(value ="\"MAX_PRESSURE_JACKET\"") private String maxPressureJacket;
private String maxPressureJacket; /**
/** * * 介质（壳程）
* * 介质（壳程） */
* */
@TableField(value = "\"MEDIUM_SHELL\"")
@TableField(value ="\"MEDIUM_SHELL\"") private String mediumShell;
private String mediumShell; /**
/** * * 介质（管程）
* * 介质（管程） */
* */
@TableField(value = "\"MEDIUM_PIPE\"")
@TableField(value ="\"MEDIUM_PIPE\"") private String mediumPipe;
private String mediumPipe; /**
/** * * 介质（夹套）
* * 介质（夹套） */
* */
@TableField(value = "\"MEDIUM_JACKET\"")
@TableField(value ="\"MEDIUM_JACKET\"") private String mediumJacket;
private String mediumJacket; /**
/** * * 主体结构型式
* * 主体结构型式 */
* */
@TableField(value = "\"MAIN_STRUCTURE_TYPE\"")
@TableField(value ="\"MAIN_STRUCTURE_TYPE\"") private String mainStructureType;
private String mainStructureType; /**
/** * * 支座型式
* * 支座型式 */
* */
@TableField(value = "\"SUPPORT\"")
@TableField(value ="\"SUPPORT\"") private String support;
private String support; /**
/** * * 安装型式
* * 安装型式 */
* */
@TableField(value = "\"INSTALLATION\"")
@TableField(value ="\"INSTALLATION\"") private String installation;
private String installation; /**
/** * * 保温绝热方式
* * 保温绝热方式 */
* */
@TableField(value = "\"INSULATION\"")
@TableField(value ="\"INSULATION\"") private String insulation;
private String insulation; /**
/** * * 无损检测方法
* * 无损检测方法 */
* */
@TableField(value = "\"CHECK_LOSSLESS\"")
@TableField(value ="\"CHECK_LOSSLESS\"") private String checkLossless;
private String checkLossless; /**
/** * * 耐压试验种类
* * 耐压试验种类 */
* */
@TableField(value = "\"WITHSTAND_VOLTAGE\"")
@TableField(value ="\"WITHSTAND_VOLTAGE\"") private String withstandVoltage;
private String withstandVoltage; /**
/** * * 泄漏试验种类
* * 泄漏试验种类 */
* */
@TableField(value = "\"LEAKAGE\"")
@TableField(value ="\"LEAKAGE\"") private String leakage;
private String leakage; /**
/** * * 耐压试验压力
* * 耐压试验压力 */
* */
@TableField(value = "\"WITHSTAND_PRESSURE_TEST\"")
@TableField(value ="\"WITHSTAND_PRESSURE_TEST\"") private BigDecimal withstandPressureTest;
private BigDecimal withstandPressureTest; /**
/** * * 泄漏试验压力
* * 泄漏试验压力 */
* */
@TableField(value = "\"LEAK_PRESSURE\"")
@TableField(value ="\"LEAK_PRESSURE\"") private BigDecimal leakPressure;
private BigDecimal leakPressure; /**
/** * * 容器型号
* * 容器型号 */
* */
@TableField(value = "\"CONTAINER\"")
@TableField(value ="\"CONTAINER\"") private String container;
private String container; /**
/** * * 罐车编号/车牌号
* * 罐车编号 */
* */
@TableField(value = "\"CAR_NUM\"")
@TableField(value ="\"CAR_NUM\"") private String carNum;
private String carNum; /**
/** * * 容积
* * 容积 */
* */
@TableField(value = "\"VOLUME\"")
@TableField(value ="\"VOLUME\"") private BigDecimal volume;
private BigDecimal volume; /**
/** * * 最大充装量
* * 最大充装量 */
* */
@TableField(value = "\"MAX_FILL\"")
@TableField(value ="\"MAX_FILL\"") private BigDecimal maxFill;
private BigDecimal maxFill; /**
/** * * 设计压力
* * 设计压力 */
* */
@TableField(value = "\"DESIGN_PRESSURE\"")
@TableField(value ="\"DESIGN_PRESSURE\"") private String designPressure;
private String designPressure; /**
/** * * 设计温度
* * 设计温度 */
* */
@TableField(value = "\"DESIGN_TEMPERATURE\"")
@TableField(value ="\"DESIGN_TEMPERATURE\"") private BigDecimal designTemperature;
private BigDecimal designTemperature; /**
/** * * 工作压力
* * 工作压力 */
* */
@TableField(value = "\"WORKING_PRESSURE\"")
@TableField(value ="\"WORKING_PRESSURE\"") private BigDecimal workingPressure;
private BigDecimal workingPressure; /**
/** * * 工作温度
* * 工作温度 */
* */
@TableField(value = "\"WORK_TEMPERATURE\"")
@TableField(value ="\"WORK_TEMPERATURE\"") private BigDecimal workTemperature;
private BigDecimal workTemperature; /**
/** * * 材料（筒体）
* * 材料（筒体） */
* */
@TableField(value = "\"MATERIAL_CYLINDER\"")
@TableField(value ="\"MATERIAL_CYLINDER\"") private String materialCylinder;
private String materialCylinder; /**
/** * * 厚度（筒体）
* * 厚度（筒体） */
* */
@TableField(value = "\"THICKNESS_CYLINDER\"")
@TableField(value ="\"THICKNESS_CYLINDER\"") private BigDecimal thicknessCylinder;
private BigDecimal thicknessCylinder; /**
/** * * 腐蚀裕量
* * 腐蚀裕量 */
* */
@TableField(value = "\"CORROSION_MARGIN\"")
@TableField(value ="\"CORROSION_MARGIN\"") private BigDecimal corrosionMargin;
private BigDecimal corrosionMargin; /**
/** * * 介质
* * 介质 */
* */
@TableField(value = "\"MEDIUM\"")
@TableField(value ="\"MEDIUM\"") private String medium;
private String medium; /**
/** * * 氧舱品种
* * 氧舱品种 */
* */
@TableField(value = "\"OXYGEN_CHAMBER\"")
@TableField(value ="\"OXYGEN_CHAMBER\"") private String oxygenChamber;
private String oxygenChamber; /**
/** * * 额定进舱人数
* * 额定进舱人数 */
* */
@TableField(value = "\"RATED_ENTRY_CAPACITY\"")
@TableField(value ="\"RATED_ENTRY_CAPACITY\"") private Integer ratedEntryCapacity;
private Integer ratedEntryCapacity; /**
/** * * 主体结构
* * 主体结构 */
* */
@TableField(value = "\"CHAMBER_MAIN\"")
@TableField(value ="\"CHAMBER_MAIN\"") private String chamberMain;
private String chamberMain; /**
/** * * 压力
* * 压力 */
* */
@TableField(value = "\"CHAMBER_PRESSURE\"")
@TableField(value ="\"CHAMBER_PRESSURE\"") private BigDecimal chamberPressure;
private BigDecimal chamberPressure; /**
/** * * 温度
* * 温度 */
* */
@TableField(value = "\"TEMPERATURE\"")
@TableField(value ="\"TEMPERATURE\"") private BigDecimal temperature;
private BigDecimal temperature; /**
/** * * 压力介质
* * 压力介质 */
* */
@TableField(value = "\"PRESSURE_MEDIUM\"")
@TableField(value ="\"PRESSURE_MEDIUM\"") private BigDecimal pressureMedium;
private BigDecimal pressureMedium; /**
/** * * 人均舱容
* * 人均舱容 */
* */
@TableField(value = "\"PER_CAPITA_CABIN_CAPACITY\"")
@TableField(value ="\"PER_CAPITA_CABIN_CAPACITY\"") private BigDecimal perCapitaCabinCapacity;
private BigDecimal perCapitaCabinCapacity;
/**
* 气瓶
*/
@TableField(value = "\"GAS_CYLINDER\"")
private String gasCylinder;
/**
* 气瓶安全附件
*/
@TableField(value = "\"GAS_CYLINDER_ACCESSORIES\"")
private String gasCylinderAccessories;
/**
* 车辆VIN码
*/
@TableField(value = "\"VIN\"")
private String vin;
} }
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsPipeline.java
View file @ c3ec77b8
...@@ -2,12 +2,10 @@ package com.yeejoin.amos.boot.module.ymt.api.entity; ...@@ -2,12 +2,10 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
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 com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity; import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.util.Date;
/** /**
* 安全追溯-压力管道 * 安全追溯-压力管道
...@@ -21,115 +19,152 @@ import java.util.Date; ...@@ -21,115 +19,152 @@ import java.util.Date;
@TableName("idx_biz_jg_tech_params_pipeline") @TableName("idx_biz_jg_tech_params_pipeline")
public class IdxBizJgTechParamsPipeline extends TzsBaseEntity { public class IdxBizJgTechParamsPipeline extends TzsBaseEntity {
/** /**
* *
*/ */
@TableField("\"RECORD\"") @TableField("\"RECORD\"")
private String record; private String record;
/** /**
* *
*/ */
@TableField("\"INSTANCE_ID\"") @TableField("\"INSTANCE_ID\"")
private String instanceId; private String instanceId;
/** /**
* *
*/ */
@TableField("\"STATUS\"") @TableField("\"STATUS\"")
private String status; private String status;
/** /**
* *
*/ */
@TableField("\"DEVICE_NAME\"") @TableField("\"DEVICE_NAME\"")
private String deviceName; private String deviceName;
/** /**
* *
*/ */
@TableField("\"PIPELINE_CLASS\"") @TableField("\"PIPELINE_CLASS\"")
private String pipelineClass; private String pipelineClass;
/** /**
* *
*/ */
@TableField("\"PIPE_NAME\"") @TableField("\"PIPE_NAME\"")
private String pipeName; private String pipeName;
/** /**
* *
*/ */
@TableField("\"PIPELINE_NUMBER\"") @TableField("\"PIPELINE_NUMBER\"")
private String pipelineNumber; private String pipelineNumber;
/** /**
* *
*/ */
@TableField("\"DEVICE_LEVEL\"") @TableField("\"DEVICE_LEVEL\"")
private String deviceLevel; private String deviceLevel;
/** /**
* *
*/ */
@TableField("\"DESIGN_STANDARD\"") @TableField("\"DESIGN_STANDARD\"")
private String designStandard; private String designStandard;
/** /**
* *
*/ */
@TableField("\"PIPE_DRAW_NUMBER\"") @TableField("\"PIPE_DRAW_NUMBER\"")
private String pipeDrawNumber; private String pipeDrawNumber;
/** /**
* *
*/ */
@TableField("\"NOMINAL_DIAMETER\"") @TableField("\"NOMINAL_DIAMETER\"")
private String nominalDiameter; private String nominalDiameter;
/** /**
* *
*/ */
@TableField("\"WALL_THICKNESS\"") @TableField("\"WALL_THICKNESS\"")
private String wallThickness; private String wallThickness;
/** /**
* *
*/ */
@TableField("\"PIPE_LENGTH\"") @TableField("\"PIPE_LENGTH\"")
private String pipeLength; private String pipeLength;
/** /**
* *
*/ */
@TableField("\"STARTE_POSITION\"") @TableField("\"STARTE_POSITION\"")
private String startePosition; private String startePosition;
/** /**
* 终点位置
*/
@TableField("\"END_POSITION\"")
private String endPosition;
/**
* *
*/ */
@TableField("\"PRESSURE\"") @TableField("\"PRESSURE\"")
private String pressure; private String pressure;
/** /**
* *
*/ */
@TableField("\"TEMPERATURE\"") @TableField("\"TEMPERATURE\"")
private String temperature; private String temperature;
/** /**
* *
*/ */
@TableField("\"MEDIUM\"") @TableField("\"MEDIUM\"")
private String medium; private String medium;
/** /**
* *
*/ */
@TableField("\"REMARKS\"") @TableField("\"REMARKS\"")
private String remarks; private String remarks;
/**
* 管道信息
*/
@TableField(value = "\"PIPE_INFO\"")
private String pipeInfo;
/**
* * 工作压力
*/
@TableField(value = "\"WORK_PRESSURE\"")
private String workPressure;
/**
* * 工作温度
*/
@TableField(value = "\"WORK_TEMPERATURE\"")
private String workTemperature;
/**
* * 工作介质
*/
@TableField(value = "\"WORK_MEDIUM\"")
private String workMedium;
/**
* * 工作备注
*/
@TableField(value = "\"WORK_REMARKS\"")
private String workRemarks;
} }
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsVessel.java
View file @ c3ec77b8
...@@ -528,4 +528,22 @@ public class IdxBizJgTechParamsVessel extends TzsBaseEntity { ...@@ -528,4 +528,22 @@ public class IdxBizJgTechParamsVessel extends TzsBaseEntity {
@TableField("\"PER_CAPITA_CABIN_CAPACITY\"") @TableField("\"PER_CAPITA_CABIN_CAPACITY\"")
private String perCapitaCabinCapacity; private String perCapitaCabinCapacity;
/**
* 气瓶
*/
@TableField(value = "\"GAS_CYLINDER\"")
private String gasCylinder;
/**
* 气瓶安全附件
*/
@TableField(value = "\"GAS_CYLINDER_ACCESSORIES\"")
private String gasCylinderAccessories;
/**
* 车辆VIN码
*/
@TableField(value = "\"VIN\"")
private String vin;
} }
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipTechParamLiftingMapper.java
View file @ c3ec77b8
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ymt.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamLifting; import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamLifting;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLifting> { public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLifting> {
...@@ -9,8 +10,9 @@ public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLi ...@@ -9,8 +10,9 @@ public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLi
/** /**
* 在用的最新需求整理的技术参数 * 在用的最新需求整理的技术参数
*
* @param record 设备唯一标识 * @param record 设备唯一标识
* @return EquipTechParamLifting * @return EquipTechParamLifting
*/ */
EquipTechParamLifting queryTechParamInUse(@Param("record") String record); IdxBizJgTechParamsLifting queryTechParamInUse(@Param("record") String record);
} }
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamLiftingMapper.xml
View file @ c3ec77b8
...@@ -2,13 +2,12 @@ ...@@ -2,13 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamLiftingMapper"> <mapper namespace="com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamLiftingMapper">
<select id="queryTechParamInUse" <select id="queryTechParamInUse"
resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamLifting"> resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting">
SELECT SELECT
"EXPLOSIONPROOF_GRADE", "EXPLOSIONPROOF_GRADE",
"EXPLOSIVE_SUBSTANCE", "EXPLOSIVE_SUBSTANCE",
"EXPLOSIONPROOF_SIGN_COMPLETE", "EXPLOSIONPROOF_SIGN_COMPLETE",
"CHECK_FINISHED_HEIGHT", "CHECK_FINISHED_HEIGHT",
"HEIGHT_FREE_END",
"RATED_LIFTING_SPEED", "RATED_LIFTING_SPEED",
"RATED_LOAD_CAPACITY", "RATED_LOAD_CAPACITY",
"WORK_STROKE_CAGE", "WORK_STROKE_CAGE",
...@@ -28,7 +27,6 @@ ...@@ -28,7 +27,6 @@
"RATED_LIFT_SPEED", "RATED_LIFT_SPEED",
"RATED_TRAVERSE_SPEED", "RATED_TRAVERSE_SPEED",
"BICYCLE_MAX_EXIT_TIME", "BICYCLE_MAX_EXIT_TIME",
"STORAGE_CAPACITY",
"CANTILEVER_LENGTH", "CANTILEVER_LENGTH",
"DERRICKING_SPEED", "DERRICKING_SPEED",
"BICYCLE_MAX_COME_TIME", "BICYCLE_MAX_COME_TIME",
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamPipelineMapper.xml
View file @ c3ec77b8
...@@ -6,19 +6,20 @@ ...@@ -6,19 +6,20 @@
SELECT SELECT
"DEVICE_NAME", "DEVICE_NAME",
"PIPELINE_CLASS", "PIPELINE_CLASS",
"PIPE_NAME", "STARTE_POSITION",
"PIPELINE_NUMBER", "END_POSITION",
"DEVICE_LEVEL",
"DESIGN_STANDARD",
"PIPE_DRAW_NUMBER",
"NOMINAL_DIAMETER", "NOMINAL_DIAMETER",
"WALL_THICKNESS", "WALL_THICKNESS",
"PIPE_LENGTH", "PIPE_LENGTH",
"STARTE_POSITION",
"PRESSURE", "PRESSURE",
"TEMPERATURE", "TEMPERATURE",
"MEDIUM", "MEDIUM",
"REMARKS" "REMARKS",
"WORK_PRESSURE",
"WORK_TEMPERATURE",
"WORK_MEDIUM",
"WORK_REMARKS",
"PIPE_INFO"
FROM FROM
idx_biz_jg_tech_params_pipeline idx_biz_jg_tech_params_pipeline
WHERE WHERE
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamRopewayMapper.xml
View file @ c3ec77b8
...@@ -10,16 +10,13 @@ ...@@ -10,16 +10,13 @@
"MAIN_MOTOR_MODEL", "MAIN_MOTOR_MODEL",
"MAIN_MOTOR_POWER", "MAIN_MOTOR_POWER",
"ALTITUDE_DIFFERENCE", "ALTITUDE_DIFFERENCE",
"OIL_PRESSURE_HEAVY_HAMMER",
"OIL_PRESSURE_OIL_PRESSURE",
"FREIGHT_VOLUME", "FREIGHT_VOLUME",
"CARRIER_LINE", "CARRIER_LINE",
"SPEED", "SPEED",
"BEARING_CABLE", "BEARING_CABLE",
"CABLE_PITCH", "CABLE_PITCH",
"NUMBER_AND_TYPE_OF_VEHICLES", "OIL_PRESSURE_HEAVY_HAMMER",
"TRACTION_ROPE", "NUMBER_AND_TYPE_OF_VEHICLES"
"BALANCE_CABLE"
FROM FROM
idx_biz_jg_tech_params_ropeway idx_biz_jg_tech_params_ropeway
WHERE WHERE
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamVesselMapper.xml
View file @ c3ec77b8
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<select id="queryTechParamInUse" <select id="queryTechParamInUse"
resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVessel"> resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVessel">
SELECT SELECT
vin,
rated_quality, rated_quality,
ambient_temperature, ambient_temperature,
model_number, model_number,
...@@ -84,7 +85,9 @@ ...@@ -84,7 +85,9 @@
chamber_pressure, chamber_pressure,
temperature, temperature,
pressure_medium, pressure_medium,
per_capita_cabin_capacity per_capita_cabin_capacity,
gas_cylinder_accessories,
gas_cylinder
FROM idx_biz_jg_tech_params_vessel FROM idx_biz_jg_tech_params_vessel
where record = #{record} where record = #{record}
</select> </select>
......
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