Skip to content

A
amos-boot-biz
Commit b186adbb authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_tzs_register' into develop_jyjc

# Conflicts: # 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
parents 38ed946d 37ddceaf
Show whitespace changes
Inline Side-by-side
Showing with 539 additions and 64 deletions
amos-boot-biz-common/pom.xml
View file @ b186adbb
......@@ -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 @ b186adbb
......@@ -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-data/amos-boot-data-openapi/src/main/resources/application-vb.properties
View file @ b186adbb
spring.application.name=AMOS-API-OPENAPI-tb
spring.application.name=AMOS-API-OPENAPI
server.servlet.context-path=/openapi
server.port=11001
# jdbc_config
spring.datasource.driver-class-name=cn.com.vastbase.Driver
spring.datasource.url=jdbc:vastbase://36.46.151.113:5432/tzs_amos_tzs_biz_test?currentSchema=amos_openapi_cyl
spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_openapi_cyl
spring.datasource.username=admin
spring.datasource.password=Yeejoin@2023
......@@ -19,7 +19,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
# REDIS (RedisProperties)
spring.redis.database=1
spring.redis.host=36.46.151.113
spring.redis.host=172.16.10.243
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
......@@ -29,7 +29,7 @@ spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
#注册中心地址
eureka.client.service-url.defaultZone =http://admin:a1234560@36.46.151.113:10001/eureka/
eureka.client.service-url.defaultZone =http://admin:a1234560@172.16.10.243:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
......@@ -42,7 +42,7 @@ eureka.instance.ip-address = 172.16.3.89
##emqx
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://36.46.151.113:1883
emqx.broker=tcp://172.16.10.243:2883
emqx.client-user-name=super
emqx.client-password=123456
......
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 @ b186adbb
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;
@ApiModelProperty(value = "详情路径")
private String routePath;
}
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 @ b186adbb
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 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;
/**
* 详情路径
*/
@TableField("route_path")
private String routePath;
}
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 @ b186adbb
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 @ b186adbb
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 @ b186adbb
......@@ -98,16 +98,18 @@
<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,
route_path as routePath
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 @ b186adbb
<?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 @ b186adbb
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);
}
/**
* 新增监管履历信息表
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveBatchResume")
@ApiOperation(httpMethod = "POST", value = "批量新增", notes = "批量新增")
public boolean saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList) {
return jgResumeInfoServiceImpl.saveBatchResume(jgResumeInfoDtoList);
}
/**
* 根据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/handler/WBCQEventHandler.java
View file @ b186adbb
......@@ -37,7 +37,7 @@ public class WBCQEventHandler implements SafetyProblemEventHandler {
}
private void generateProblem(JSONObject jsonObject) {
SafetyProblemTopicMessage.generateProblem(jsonObject, SafetyProblemTypeEnum.JYCQ, safetyProblemTracingService);
SafetyProblemTopicMessage.generateProblem(jsonObject, SafetyProblemTypeEnum.WBCQ, safetyProblemTracingService);
}
}
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 @ b186adbb
......@@ -544,14 +544,17 @@ 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 -> {
return commonMapper.equOnJgServiceOperationRecords(record).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")));
String content = String.format("%s 创建人：%s 单号【%s】 审批单位：%s",
x.get("businessType"), x.get("recUserName"), x.get("applyNo"), x.get("approvalUnit"));
map.put("content", content);
map.put("routePath", x.get("routePath"));
return map;
}).collect(Collectors.toList());
})
.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 @ b186adbb
......@@ -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查询
......@@ -1008,7 +1009,19 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
taskMap.put("model", taskMessageDto);
commonService.updateTaskModel(taskMap);
TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(jgInstallationNotice.getApplyNo())
.businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
.businessId(jgInstallationNotice.getSequenceNbr() + "")
.equId(jgRelationEquip.getEquId())
.approvalUnit(jgInstallationNotice.getReceiveOrgName())
.approvalUnitCode(jgInstallationNotice.getReceiveOrgCreditCode())
.status("正常")
.routePath(taskV2Model1.getRoutePath())
.build());
} else {
jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
......
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 @ b186adbb
......@@ -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;
......@@ -82,6 +81,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
@Autowired
IJgInstallationNoticeService jrmInstallationNoticeService;
@Autowired
EmqKeeper emqKeeper;
@Autowired
private JgMaintenanceContractMapper maintenanceContractMapper;
@Autowired
private JgMaintenanceContractEqMapper maintenanceContractEqMapper;
......@@ -89,12 +90,10 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
private JgMaintenanceContractEqServiceImpl jgMaintenanceContractEqService;
@Autowired
private IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
@Autowired
private RedissonClient redissonClient;
@Autowired
EmqKeeper emqKeeper;
private JgResumeInfoServiceImpl jgResumeInfoService;
/**
* 分页查询
......@@ -131,7 +130,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
}
}
contractList = maintenanceContractMapper.getContractList(page, sortMap, dto, reginParams.getUserModel().getUserId());
List<JgMaintenanceContractDto> records = contractList.getRecords().stream().peek(x->x.setUnitType(company.getCompanyType())).collect(Collectors.toList());
List<JgMaintenanceContractDto> records = contractList.getRecords().stream().peek(x -> x.setUnitType(company.getCompanyType())).collect(Collectors.toList());
contractList.setRecords(records);
BeanUtils.copyProperties(contractList, result);
return result;
......@@ -298,6 +297,24 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
modelDto.setModel(taskMessageDto);
// 再插入新代办、数据待定
commonService.buildTaskModel(Collections.singletonList(modelDto));
// 新增人员履历消息表
LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
lambda.eq(JgMaintenanceContractEq::getEquipTransferId, contract.getSequenceNbr());
List<JgMaintenanceContractEq> jgMaintenanceContractEqList = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
jgResumeInfoService.saveBatchResume(
jgMaintenanceContractEqList.stream()
.map(v -> JgResumeInfoDto.builder()
.applyNo(contract.getApplyNo())
.businessType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName())
.businessId(String.valueOf(contract.getSequenceNbr()))
.equId(String.valueOf(v.getEquId()))
.approvalUnit(contract.getReceiveOrgName())
.approvalUnitCode(contract.getReceiveOrgCode())
.status("正常")
.routePath(taskV2Model.getRoutePath())
.build())
.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/JgResumeInfoServiceImpl.java 0 → 100644
View file @ b186adbb
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.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
/**
* 服务实现类
*
* @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);
}
@Transactional
public boolean saveBatchResume(List<JgResumeInfoDto> jgResumeInfoDtoList) {
Collection<JgResumeInfo> jgResumeInfoCollection = jgResumeInfoDtoList.stream()
.map(dto -> {
JgResumeInfo info = new JgResumeInfo();
BeanUtils.copyProperties(dto, info);
return info;
})
.collect(Collectors.toList());
return this.saveBatch(jgResumeInfoCollection);
}
}
\ 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 @ b186adbb
......@@ -160,6 +160,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
private JgUseRegistrationMapper jgUseRegistrationMapper;
@Autowired
private ESEquipmentCategory esEquipmentCategory;
@Autowired
private JgResumeInfoServiceImpl jgResumeInfoService;
/**
* @param auditPassDate 通过时间
......@@ -1006,7 +1008,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
taskMessageDto.setEquipId(String.valueOf(mapData.get("equipId")));
params.put("model", taskMessageDto);
commonServiceImpl.updateTaskModel(params);
TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
.applyNo(jgUseRegistration.getApplyNo())
.businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
.businessId(jgUseRegistration.getSequenceNbr() + "")
.equId((String) mapData.get("equipId"))
.approvalUnit(jgUseRegistration.getReceiveOrgName())
.approvalUnitCode(jgUseRegistration.getReceiveCompanyCode())
.status("正常")
.routePath(taskV2Model.getRoutePath())
.build());
}
/**
......
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 @ b186adbb
......@@ -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);
......@@ -866,7 +894,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
this.createCode(jgVehicleInformation, registerInfo, otherInfo);
}
/**
* 生成监管码
*/
......@@ -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 -> ""));
......
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JgResumeInfoDto.java 0 → 100644
View file @ b186adbb
package com.yeejoin.amos.boot.module.jyjc.api.model;
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;
@ApiModelProperty(value = "详情路径")
private String routePath;
}
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/feign/JgFeignClient.java
View file @ b186adbb
......@@ -3,10 +3,11 @@ package com.yeejoin.amos.boot.module.jyjc.biz.feign;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.feign.MultipartSupportConfig;
import com.yeejoin.amos.boot.module.jyjc.api.model.JgResumeInfoDto;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@FeignClient(contextId = "jyjc", name = "${tzsJg.feign.name:TZS-JG}", path = "jg", configuration = {MultipartSupportConfig.class})
......@@ -17,7 +18,12 @@ public interface JgFeignClient {
*
* */
@RequestMapping(value = "/equipment-register/page", method = RequestMethod.GET)
FeignClientResult<Page<JSONObject>> queryForPage(@RequestParam Map<String,Object> map);
FeignClientResult<Page<JSONObject>> queryForPage(@RequestParam Map<String, Object> map);
/***
* 设备注册信息分页查询
* */
@RequestMapping(value = "/jg-resume-info/saveBatchResume", method = RequestMethod.POST)
FeignClientResult<Boolean> saveBatchResume(@RequestBody List<JgResumeInfoDto> jgResumeInfoDtoList);
}
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