Skip to content

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

fix(JG)：监管履历信息功能开发

parent ee5b9cf6
Hide whitespace changes
Inline Side-by-side
Showing with 445 additions and 73 deletions
amos-boot-biz-common/pom.xml
View file @ f02af2d9
......@@ -127,6 +127,11 @@
<version>5.1.10</version>
</dependency>
<dependency>
<groupId>cn.com.vastdata</groupId>
<artifactId>vastbase-jdbc</artifactId>
<version>2.7p</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
......
amos-boot-biz-common/src/main/resources/template2/controller.java.ftl
View file @ f02af2d9
......@@ -24,14 +24,13 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* ${table.comment!}
*
* @author ${author}
* @date ${date}
*/
<#if restControllerStyle>
@RestController
@Api(tags = "${table.comment}Api")
@Api(tags = "Api")
<#else>
@Controller
</#if>
......@@ -49,13 +48,13 @@ public class ${table.controllerName} {
${table.serviceImplName} ${table.serviceImplName ?uncap_first};
/**
* 新增${table.comment}
* 新增
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增${table.comment}", notes = "新增${table.comment}")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<${entity}Model> save(@RequestBody ${entity}Model model) {
model = ${table.serviceImplName ?uncap_first}.createWithModel(model);
return ResponseHelper.buildResponse(model);
......@@ -69,7 +68,7 @@ public class ${table.controllerName} {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新${table.comment}", notes = "根据sequenceNbr更新${table.comment}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<${entity}Model> updateBySequenceNbr${entity}(@RequestBody ${entity}Model model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.updateWithModel(model));
......@@ -83,7 +82,7 @@ public class ${table.controllerName} {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除${table.comment}", notes = "根据sequenceNbr删除${table.comment}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.removeById(sequenceNbr));
}
......@@ -96,7 +95,7 @@ public class ${table.controllerName} {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个${table.comment}", notes = "根据sequenceNbr查询单个${table.comment}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<${entity}Model> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryBySeq(sequenceNbr));
}
......@@ -110,7 +109,7 @@ public class ${table.controllerName} {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询${table.comment}", notes = "分页查询${table.comment}")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<${entity}Model>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<${entity}Model> page = new Page<${entity}Model>();
......@@ -125,7 +124,7 @@ public class ${table.controllerName} {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询${table.comment}", notes = "列表全部数据查询${table.comment}")
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<${entity}Model>> selectForList() {
return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryFor${entity}List());
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgResumeInfoDto.java 0 → 100644
View file @ f02af2d9
package com.yeejoin.amos.boot.module.jg.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
*
*
* @author system_generator
* @date 2024-05-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="JgResumeInfoDto", description="")
@Builder
public class JgResumeInfoDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "申请编号")
private String applyNo;
@ApiModelProperty(value = "业务状态")
private String status;
@ApiModelProperty(value = "业务id")
private String businessId;
@ApiModelProperty(value = "创建时间")
private Date createDate;
@ApiModelProperty(value = "创建人id ")
private String createUserId;
@ApiModelProperty(value = "创建人")
private String createUserName;
@ApiModelProperty(value = "设备ID")
private String equId;
@ApiModelProperty(value = "业务类型")
private String businessType;
@ApiModelProperty(value = "审批单位")
private String approvalUnit;
@ApiModelProperty(value = "审批单位Code")
private String approvalUnitCode;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgResumeInfo.java 0 → 100644
View file @ f02af2d9
package com.yeejoin.amos.boot.module.jg.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 监管履历信息
*
* @author system_generator
* @date 2024-05-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tzs_jg_resume_info")
public class JgResumeInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 申请编号
*/
@TableField("apply_no")
private String applyNo;
/**
* 业务状态
*/
@TableField("status")
private String status;
/**
* 业务id
*/
@TableField("business_id")
private String businessId;
/**
* 创建时间
*/
@TableField("create_date")
private Date createDate;
/**
* 创建人id
*/
@TableField("create_user_id")
private String createUserId;
/**
* 创建人
*/
@TableField("create_user_name")
private String createUserName;
/**
* 设备ID
*/
@TableField("equ_id")
private String equId;
/**
* 业务类型
*/
@TableField("business_type")
private String businessType;
/**
* 审批单位
*/
@TableField("approval_unit")
private String approvalUnit;
/**
* 审批单位code
*/
@TableField("approval_unit_code")
private String approvalUnitCode;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgResumeInfoMapper.java 0 → 100644
View file @ f02af2d9
package com.yeejoin.amos.boot.module.jg.api.mapper;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* Mapper 接口
*
* @author system_generator
* @date 2024-05-29
*/
public interface JgResumeInfoMapper extends BaseMapper<JgResumeInfo> {
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgResumeInfoService.java 0 → 100644
View file @ f02af2d9
package com.yeejoin.amos.boot.module.jg.api.service;
/**
* 接口类
*
* @author system_generator
* @date 2024-05-29
*/
public interface IJgResumeInfoService {}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @ f02af2d9
......@@ -98,16 +98,17 @@
<select id="equOnJgServiceOperationRecords" resultType="java.util.Map">
select
sequenceNbr,
businessName,
applyNo,
recUserId,
recUserName,
DATE_FORMAT(recDate,'%Y-%m-%d %H:%i:%s') as recDate,
receiveOrgName
from idx_biz_view_jg_equ_log
where sequenceNbr = #{record}
order by recDate ASC
sequence_nbr as sequenceNbr,
business_type as businessType,
apply_no as applyNo,
rec_User_Id as recUserId,
rec_user_name as recUserName,
DATE_FORMAT(rec_date,'%Y-%m-%d %H:%i:%s') as recDate,
approval_unit as approvalUnit,
status
from tzs_jg_resume_info
where equ_id = #{record}
order by rec_date ASC
</select>
<select id="selectPromoterData" resultType="java.lang.String">
select
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgResumeInfoMapper.xml 0 → 100644
View file @ f02af2d9
<?xml version="1.0" encoding="UTF-8"?>
<!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.jg.api.mapper.JgResumeInfoMapper">
</mapper>
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgResumeInfoController.java 0 → 100644
View file @ f02af2d9
package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgResumeInfoServiceImpl;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* 监管履历信息表
* @author LiuLin
* @date 2024-05-29
*/
@RestController
@Api(tags = "监管履历信息表Api")
@RequestMapping(value = "/jg-resume-info")
public class JgResumeInfoController extends BaseController {
@Autowired
JgResumeInfoServiceImpl jgResumeInfoServiceImpl;
/**
* 新增监管履历信息表
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<JgResumeInfoDto> save(@RequestBody JgResumeInfoDto model) {
model = jgResumeInfoServiceImpl.createWithModel(model);
return ResponseHelper.buildResponse(model);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<JgResumeInfoDto> updateBySequenceNbrJgResumeInfo(@RequestBody JgResumeInfoDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<JgResumeInfoDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<JgResumeInfoDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<JgResumeInfoDto> page = new Page<JgResumeInfoDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.queryForJgResumeInfoPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<JgResumeInfoDto>> selectForList() {
return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.queryForJgResumeInfoList());
}
}
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/CommonServiceImpl.java
View file @ f02af2d9
......@@ -544,14 +544,16 @@ public class CommonServiceImpl implements ICommonService {
*/
@Override
public List<Map<String, String>> equOnJgServiceOperationRecords(String record) {
List<Map<String, String>> maps = commonMapper.equOnJgServiceOperationRecords(record);
String template = "%s 创建人：%s 单号【%s】 审批单位：%s";
return maps.stream().map(x -> {
Map<String, String> map = new HashMap<>();
map.put("operatingTime", x.get("recDate"));
map.put("content", String.format(template, x.get("businessName"), x.get("recUserName"), x.get("applyNo"), x.get("receiveOrgName")));
return map;
}).collect(Collectors.toList());
return commonMapper.equOnJgServiceOperationRecords(record).stream()
.map(x -> {
Map<String, String> map = new HashMap<>();
map.put("operatingTime", x.get("recDate"));
String content = String.format("%s 创建人：%s 单号【%s】 审批单位：%s",
x.get("businessType"), x.get("recUserName"), x.get("applyNo"), x.get("approvalUnit"));
map.put("content", content);
return map;
})
.collect(Collectors.toList());
}
/**
......
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/JgInstallationNoticeServiceImpl.java
View file @ f02af2d9
......@@ -156,9 +156,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
private RedissonClient redissonClient;
@Autowired
private IdxBizJgConstructionInfoMapper constructionInfoMapper;
@Autowired
private ESEquipmentCategory esEquipmentCategory;
@Autowired
private JgResumeInfoServiceImpl jgResumeInfoService;
/**
* 根据sequenceNbr查询
......@@ -566,6 +567,15 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
List<JgInstallationNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
List<JgInstallationNotice> collect = list.stream().filter(jgInstallationNotice -> jgRelationEquip.getEquipTransferId().equals(jgInstallationNotice.getApplyNo())).collect(Collectors.toList());
Long sequenceNbr = collect.get(0).getSequenceNbr();
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(collect.get(0).getApplyNo())
.businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
.businessId(sequenceNbr+"")
.equId(jgRelationEquip.getEquId())
.approvalUnit(collect.get(0).getReceiveOrgName())
.approvalUnitCode(collect.get(0).getReceiveOrgCreditCode())
.status("正常")
.build());
return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
}).collect(Collectors.toList());
jgInstallationNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
......
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/JgMaintenanceContractServiceImpl.java
View file @ f02af2d9
......@@ -51,7 +51,6 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
......@@ -89,10 +88,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
private JgMaintenanceContractEqServiceImpl jgMaintenanceContractEqService;
@Autowired
private IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
@Autowired
private RedissonClient redissonClient;
@Autowired
private JgResumeInfoServiceImpl jgResumeInfoService;
@Autowired
EmqKeeper emqKeeper;
......@@ -430,6 +429,15 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
equip.setEquId(String.valueOf(x.get("SEQUENCE_NBR")));
equip.setEquipTransferId(contract.getSequenceNbr().toString());
equipList.add(equip);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(contractDto.getApplyNo())
.businessType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName())
.businessId(contract.getSequenceNbr() + "")
.equId(String.valueOf(x.get("record")))
.approvalUnit(contractDto.getReceiveOrgName())
.approvalUnitCode(contractDto.getReceiveOrgCode())
.status("正常")
.build());
});
// 保存关联设备信息
jgMaintenanceContractEqService.saveBatch(equipList);
......
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/JgResumeInfoServiceImpl.java 0 → 100644
View file @ f02af2d9
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgResumeInfoMapper;
import com.yeejoin.amos.boot.module.jg.api.service.IJgResumeInfoService;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 服务实现类
*
* @author system_generator
* @date 2024-05-29
*/
@Service
public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto,JgResumeInfo,JgResumeInfoMapper> implements IJgResumeInfoService {
/**
* 分页查询
*/
public Page<JgResumeInfoDto> queryForJgResumeInfoPage(Page<JgResumeInfoDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<JgResumeInfoDto> queryForJgResumeInfoList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
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/JgUseRegistrationServiceImpl.java
View file @ f02af2d9
......@@ -160,6 +160,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private JgUseRegistrationMapper jgUseRegistrationMapper;
@Autowired
private ESEquipmentCategory esEquipmentCategory;
@Autowired
private JgResumeInfoServiceImpl jgResumeInfoService;
/**
* @param auditPassDate 通过时间
......@@ -492,6 +494,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
this.save(jgUseRegistration);
jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
jgRelationEquipMapper.insert(jgRelationEquip);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(jgUseRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName() + "(台套)")
.businessId(jgUseRegistration.getSequenceNbr() + "")
.equId(jgRelationEquip.getEquId())
.approvalUnit(jgUseRegistration.getReceiveOrgName())
.approvalUnitCode(jgUseRegistration.getReceiveOrgCode())
.status("正常")
.build());
}
// 暂存历史表
updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
......@@ -691,13 +702,23 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jgRelationEquipMapper.delete(new QueryWrapper<JgUseRegistrationEq>().lambda().eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr()));
}
// 更新关联气瓶信息
List<JgUseRegistrationEq> equipList = equipmentLists.stream()
.map(x -> new JgUseRegistrationEq()
.setEquId(String.valueOf(x.get("record")))
.setEquipTransferId(String.valueOf(useRegistration.getSequenceNbr())))
.collect(Collectors.toList());
// 保存关联设备信息
jgUseRegistrationEqService.saveBatch(equipList);
equipmentLists.stream()
.map(x -> {
JgUseRegistrationEq equip = new JgUseRegistrationEq()
.setEquId(String.valueOf(x.get("record")))
.setEquipTransferId(String.valueOf(useRegistration.getSequenceNbr()));
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(useRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()+"(单位)")
.businessId(String.valueOf(useRegistration.getSequenceNbr()))
.equId(String.valueOf(x.get("record")))
.approvalUnit(useRegistration.getReceiveOrgName())
.approvalUnitCode(useRegistration.getReceiveOrgCode())
.status("正常")
.build());
return equip;
})
.forEach(jgUseRegistrationEqService::save);
// 启动流程
if (!ObjectUtils.isEmpty(map.get("submit"))) {
......
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/JgVehicleInformationServiceImpl.java
View file @ f02af2d9
......@@ -89,6 +89,11 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
public static final String SUBMIT_DATA = "0";
public static final String SUBMIT_TYPE_FLOW = "1";
private static final String DEFINITION_KEY = "vehicleInformation";
private static final String[] DEFAULT_KEYS = {
"useRegistrationCode", "useUnitName", "fullAddress", "equList", "equipDefine",
"equipCode", "equipCategory", "useInnerCode", "factoryNum", "giveOutYear",
"giveOutMonth", "giveOutDay"
};
@Autowired
private RedissonClient redissonClient;
@Autowired
......@@ -131,13 +136,27 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
private IdxBizJgInspectionDetectionInfoServiceImpl idxBizJgInspectionDetectionInfoService;
@Autowired
private ESEquipmentCategory esEquipmentCategory;
@Autowired
private JgResumeInfoServiceImpl jgResumeInfoService;
private Map<String, Object> fillingMediumMap;
private static final String[] DEFAULT_KEYS = {
"useRegistrationCode", "useUnitName", "fullAddress", "equList", "equipDefine",
"equipCode", "equipCategory", "useInnerCode", "factoryNum", "giveOutYear",
"giveOutMonth", "giveOutDay"
};
/**
* @param auditPassDate 通过时间
* @param exportParamsMap 参数map
*/
static void handleAuditPassedDate(Date auditPassDate, Map<String, Object> exportParamsMap) {
LocalDate today;
if (ValidationUtil.isEmpty(auditPassDate)) {
// 发证日期为空取当前时间
today = LocalDate.now();
} else {
today = auditPassDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
}
exportParamsMap.put("year", today.getYear() + "");
exportParamsMap.put("mon", today.getMonthValue());
exportParamsMap.put("day", today.getDayOfMonth());
}
/**
* 新增（提交）车用气瓶
......@@ -298,6 +317,15 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
equip.setEquId(String.valueOf(x.get("record")));
equip.setVehicleId(vehicleInformation.getSequenceNbr() + "");
equipList.add(equip);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(vehicleInformation.getApplyNo())
.businessType(BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName())
.businessId(vehicleInformation.getSequenceNbr() + "")
.equId(String.valueOf(x.get("record")))
.approvalUnit(vehicleInformation.getReceiveOrgName())
.approvalUnitCode(vehicleInformation.getReceiveOrgCode())
.status("正常")
.build());
});
// 保存关联设备信息
jgVehicleInformationEqService.saveBatch(equipList);
......@@ -505,10 +533,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
if (!(dto.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName()) || dto.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))) {
vo.setEquipmentLists(
this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,
vehicleInformationEqList.stream()
.map(JgVehicleInformationEq::getEquId)
.collect(Collectors.toList())
).stream()
vehicleInformationEqList.stream()
.map(JgVehicleInformationEq::getEquId)
.collect(Collectors.toList())
).stream()
.peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
.collect(Collectors.toList())
);
......@@ -519,10 +547,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
if (objects.isEmpty()) {
vo.setEquipmentLists(
this.baseMapper.queryForUnitVesselEquipment(sequenceNbr,
vehicleInformationEqList.stream()
.map(JgVehicleInformationEq::getEquId)
.collect(Collectors.toList())
).stream()
vehicleInformationEqList.stream()
.map(JgVehicleInformationEq::getEquId)
.collect(Collectors.toList())
).stream()
.peek(v -> v.put("chargingMedium", getFillingMediumMap().get(v.getOrDefault("chargingMedium", "") + "")))
.collect(Collectors.toList())
);
......@@ -866,7 +894,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
this.createCode(jgVehicleInformation, registerInfo, otherInfo);
}
/**
* 生成监管码
*/
......@@ -936,8 +963,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
.map(JgVehicleInformation::getReceiveOrgName)
.anyMatch(Objects::isNull) ||
Stream.of(vehicleInformation.getUseRegistrationCode(),
vehicleInformation.getUseUnitName(),
vehicleInformation.getUseUnitAddress())
vehicleInformation.getUseUnitName(),
vehicleInformation.getUseUnitAddress())
.anyMatch(Objects::isNull)) {
throw new BadRequest("使用登记证导出失败,请稍后重试或检查数据完整性!");
}
......@@ -1071,24 +1098,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
}
}
/**
* @param auditPassDate 通过时间
* @param exportParamsMap 参数map
*/
static void handleAuditPassedDate(Date auditPassDate, Map<String, Object> exportParamsMap) {
LocalDate today;
if (ValidationUtil.isEmpty(auditPassDate)) {
// 发证日期为空取当前时间
today = LocalDate.now();
} else {
today = auditPassDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
}
exportParamsMap.put("year", today.getYear()+"");
exportParamsMap.put("mon", today.getMonthValue());
exportParamsMap.put("day", today.getDayOfMonth());
}
private void generatePdfPrint(Map<String, Object> map, HttpServletResponse response) {
// 设置默认值
Arrays.stream(DEFAULT_KEYS).forEach(key -> map.computeIfAbsent(key, k -> ""));
......@@ -1222,7 +1231,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
// 1.待办任务更新为已完成
this.finishedTask(vehicleInformation);
// 2.终止流程-工作流报错暂时注释掉
cmWorkflowService.stopProcess(vehicleInformation.getInstanceId(), vehicleInformation.getCancelReason());
cmWorkflowService.stopProcess(vehicleInformation.getInstanceId(), vehicleInformation.getCancelReason());
}
}
......
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