Commit 3196ee83 authored by LiuLin's avatar LiuLin

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

# Conflicts: # 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 # 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/JyjcOpeningApplicationServiceImpl.java
parents b1a8b97e 04cde04b
...@@ -164,10 +164,10 @@ public class JgInstallationNoticeDto extends BaseDto { ...@@ -164,10 +164,10 @@ public class JgInstallationNoticeDto extends BaseDto {
private String inputUnitNo; private String inputUnitNo;
@ApiModelProperty(value = "安装委托书图片") @ApiModelProperty(value = "安装委托书图片")
private List<Map<String, String>> proxyStatementAttachmentList; private String proxyStatementAttachmentList;
@ApiModelProperty(value = "安装合同照片") @ApiModelProperty(value = "安装合同照片")
private List<Map<String, String>> installContractAttachmentList; private String installContractAttachmentList;
@ApiModelProperty(value = "安装委托书图片") @ApiModelProperty(value = "安装委托书图片")
private String proxyStatementAttachment; private String proxyStatementAttachment;
......
package com.yeejoin.amos.boot.module.jg.api.service; package com.yeejoin.amos.boot.module.jg.api.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
import java.util.Map; import java.util.Map;
...@@ -14,7 +16,42 @@ import java.util.Map; ...@@ -14,7 +16,42 @@ import java.util.Map;
public interface IJgInstallationNoticeService { public interface IJgInstallationNoticeService {
/** /**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return 安装告知
*/
Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
/**
* 更新安装告知
*
* @param noticeDto 安装告知
* @param op 操作类型
*/
JgInstallationNoticeDto updateInstallationNotice(JgInstallationNoticeDto noticeDto, String op);
/**
* 分页查询
*
* @param page 分页对象
* @param model 查询参数
* @param type 类型:enterprise-企业端、supervision-监管端
* @return 安装告知列表
*/
Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type);
/**
* 批量删除
*
* @param sequenceNbrs 主键
* @return 是否删除成功
*/
Boolean deleteForBatch(Long[] sequenceNbrs);
/**
* 保存安装告知单 * 保存安装告知单
*
* @param model 数据 * @param model 数据
* @param submitType 保存类型 * @param submitType 保存类型
*/ */
......
package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
import java.util.Map;
/**
* 设备注册
*
* @author Provence
* @version v1.0
* @date 2023/12/13 14:37
*/
@RestController
@Api (tags = "设备注册Api")
@RequestMapping (value = "/equipment-register")
public class IdxBizJqEquipmentRegisterController extends BaseController {
@Autowired
IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
/**
* 设备注册和更新信息
* @param paramMap
* @return
*/
@TycloudOperation (ApiLevel = UserType.AGENCY)
@PostMapping (value = "/submit")
@ApiOperation (httpMethod = "POST", value = "设备注册和更新信息", notes = "设备注册和更新信息")
public ResponseModel<Object> submit(@RequestBody Map<String, Object> paramMap) {
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equipmentRegisterSubmit(paramMap));
}
/**
* 根据recordList批量删除设备注册信息
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/deleteBatch")
@ApiOperation(httpMethod = "POST", value = "批量删除设备注册信息", notes = "批量删除设备注册信息")
public ResponseModel<Boolean> deleteByRecordList(@RequestBody Map<String,Object> map){
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.batchDeleteByRecord(map));
}
/**
* 查询设备注册信息详情
* @param sequenceNbr
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping (value = "/{record}")
@ApiOperation(httpMethod = "GET", value = "根据record查询设备注册信息详情", notes = "根据record查询设备注册信息详情")
public ResponseModel<Object> selectOne(@PathVariable String record) {
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getEquipmentRegisterByRecord(record));
}
/**
* 查询设备注册列表
* @param map
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "设备注册信息分页查询", notes = "设备注册信息分页查询")
public ResponseModel<Page<JSONObject>> queryForPage( @RequestParam Map<String,Object> map) {
JSONObject jsonObject = new JSONObject(map);
return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPage(jsonObject));
}
}
package com.yeejoin.amos.boot.module.jg.biz.dao;
import com.yeejoin.amos.boot.module.ymt.api.entity.EsElevator;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;
/**
* @author fengwang
* @date 2021-09-26.
*/
@Repository
public interface ESElavtorRepository extends PagingAndSortingRepository<EsElevator, Long> {
}
package com.yeejoin.amos.boot.module.jg.biz.dao;
import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface ESEquipmentCategory extends PagingAndSortingRepository<ESEquipmentCategoryDto, String> {
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
/**
* 施工信息表接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgConstructionInfoService {
boolean saveOrUpdateData(IdxBizJgConstructionInfo constructionInfo);
IdxBizJgConstructionInfo getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
/**
* 安全追溯-设计信息表接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgDesignInfoService {
boolean saveOrUpdateData(IdxBizJgDesignInfo designInfo);
IdxBizJgDesignInfo getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
/**
* 安全追溯-制造信息接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgFactoryInfoService {
boolean saveOrUpdateData(IdxBizJgFactoryInfo factoryInfo);
IdxBizJgFactoryInfo getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
/**
* 安全追溯-检验检测信息表接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgInspectionDetectionInfoService {
boolean saveOrUpdateData(IdxBizJgInspectionDetectionInfo inspectionDetectionInfo);
IdxBizJgInspectionDetectionInfo getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMainParts;
import java.util.List;
/**
* 安全追溯-主要零部件接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgMainPartsService {
boolean saveOrUpdateBatchData(List<IdxBizJgMainParts> mainPartsList);
IdxBizJgMainParts getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
/**
* 安全追溯-维保备案信息表接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgMaintenanceRecordInfoService {
boolean saveOrUpdateData(IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo);
IdxBizJgMaintenanceRecordInfo getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
/**
* 安全追溯-其他信息表接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgOtherInfoService {
boolean saveOrUpdateData(IdxBizJgOtherInfo otherInfo);
IdxBizJgOtherInfo getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProtectionDevices;
import java.util.List;
/**
* 安全追溯-安全保护装置接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgProtectionDevicesService {
boolean saveOrUpdateBatchData(List<IdxBizJgProtectionDevices> protectionDevicesList);
IdxBizJgProtectionDevices getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
import java.util.Map;
/**
* 注册登记信息表接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgRegisterInfoService {
ResponseModel equipmentRegisterSubmit(Map<String, Object> paramMap);
boolean batchDeleteByRecord(Map<String,Object> map);
Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record);
Page<JSONObject> queryForEquipmentRegisterPage(JSONObject jsonObject);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
/**
* 监督管理信息表接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgSupervisionInfoService {
boolean saveOrUpdateData(IdxBizJgSupervisionInfo supervisionInfo);
IdxBizJgSupervisionInfo getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
/**
* 安全追溯-锅炉接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgTechParamsBoilerService {
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
/**
* 安全追溯-电梯接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgTechParamsElevatorService {
boolean saveOrUpdateData(IdxBizJgTechParamsElevator techParamsElevator);
IdxBizJgTechParamsElevator getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service;
/**
* 安全追溯-起重机械接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgTechParamsLiftingService {
}
package com.yeejoin.amos.boot.module.jg.biz.service;
/**
* 安全追溯-压力管道接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgTechParamsPipelineService {
}
package com.yeejoin.amos.boot.module.jg.biz.service;
/**
* 安全追溯-游乐设施接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgTechParamsRidesService {
}
package com.yeejoin.amos.boot.module.jg.biz.service;
/**
* 安全追溯-索道接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgTechParamsRopewayService {
}
package com.yeejoin.amos.boot.module.jg.biz.service;
/**
* 安全追溯-场内车辆接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgTechParamsVehicleService {
}
package com.yeejoin.amos.boot.module.jg.biz.service;
/**
* 安全追溯-压力容器接口类
*
* @author system_generator
* @date 2023-08-17
*/
public interface IIdxBizJgTechParamsVesselService {
}
package com.yeejoin.amos.boot.module.jg.biz.service;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
/**
* 使用信息表接口类
*
* @author system_generator
* @date 2023-08-16
*/
public interface IIdxBizJgUseInfoService {
boolean saveOrUpdateData(IdxBizJgUseInfo useInfo);
IdxBizJgUseInfo getOneData(String record);
}
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgConstructionInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgConstructionInfoMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 施工信息表服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgConstructionInfoServiceImpl extends BaseService<IdxBizJgConstructionInfoDto,IdxBizJgConstructionInfo,IdxBizJgConstructionInfoMapper> implements IIdxBizJgConstructionInfoService {
public boolean saveOrUpdateData(IdxBizJgConstructionInfo constructionInfo){
return this.saveOrUpdate(constructionInfo);
}
@Override
public IdxBizJgConstructionInfo getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgConstructionInfo>().eq("RECORD", record));
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgDesignInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgDesignInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgDesignInfoMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-设计信息表服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgDesignInfoServiceImpl extends BaseService<IdxBizJgDesignInfoDto,IdxBizJgDesignInfo,IdxBizJgDesignInfoMapper> implements IIdxBizJgDesignInfoService {
public boolean saveOrUpdateData(IdxBizJgDesignInfo designInfo){
return this.saveOrUpdate(designInfo);
}
@Override
public IdxBizJgDesignInfo getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgDesignInfo>().eq("RECORD", record));
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgFactoryInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgFactoryInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgFactoryInfoMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-制造信息服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgFactoryInfoServiceImpl extends BaseService<IdxBizJgFactoryInfoDto,IdxBizJgFactoryInfo,IdxBizJgFactoryInfoMapper> implements IIdxBizJgFactoryInfoService {
public boolean saveOrUpdateData(IdxBizJgFactoryInfo factoryInfo){
return this.saveOrUpdate(factoryInfo);
}
@Override
public IdxBizJgFactoryInfo getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgFactoryInfo>().eq("RECORD", record));
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgInspectionDetectionInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgInspectionDetectionInfoMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-检验检测信息表服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgInspectionDetectionInfoServiceImpl extends BaseService<IdxBizJgInspectionDetectionInfoDto,IdxBizJgInspectionDetectionInfo,IdxBizJgInspectionDetectionInfoMapper> implements IIdxBizJgInspectionDetectionInfoService {
public boolean saveOrUpdateData(IdxBizJgInspectionDetectionInfo inspectionDetectionInfo){
return this.saveOrUpdate(inspectionDetectionInfo);
}
@Override
public IdxBizJgInspectionDetectionInfo getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgInspectionDetectionInfo>().eq("RECORD", record));
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgMainPartsService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgMainPartsDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMainParts;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgMainPartsMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-主要零部件服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgMainPartsServiceImpl extends BaseService<IdxBizJgMainPartsDto,IdxBizJgMainParts,IdxBizJgMainPartsMapper> implements IIdxBizJgMainPartsService {
public boolean saveOrUpdateBatchData(List<IdxBizJgMainParts> mainPartsList){
return this.saveOrUpdateBatch(mainPartsList);
}
@Override
public IdxBizJgMainParts getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgMainParts>().eq("RECORD", record));
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgMaintenanceRecordInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgMaintenanceRecordInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgMaintenanceRecordInfoMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-维保备案信息表服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgMaintenanceRecordInfoServiceImpl extends BaseService<IdxBizJgMaintenanceRecordInfoDto,IdxBizJgMaintenanceRecordInfo,IdxBizJgMaintenanceRecordInfoMapper> implements IIdxBizJgMaintenanceRecordInfoService {
public boolean saveOrUpdateData(IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo){
return this.saveOrUpdate(maintenanceRecordInfo);
}
@Override
public IdxBizJgMaintenanceRecordInfo getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgMaintenanceRecordInfo>().eq("RECORD", record));
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgOtherInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgOtherInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-其他信息表服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgOtherInfoServiceImpl extends BaseService<IdxBizJgOtherInfoDto,IdxBizJgOtherInfo,IdxBizJgOtherInfoMapper> implements IIdxBizJgOtherInfoService {
public boolean saveOrUpdateData(IdxBizJgOtherInfo otherInfo){
return this.saveOrUpdate(otherInfo);
}
@Override
public IdxBizJgOtherInfo getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgOtherInfo>().eq("RECORD", record));
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgProtectionDevicesService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProtectionDevicesDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProtectionDevices;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProtectionDevicesMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-安全保护装置服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgProtectionDevicesServiceImpl extends BaseService<IdxBizJgProtectionDevicesDto,IdxBizJgProtectionDevices,IdxBizJgProtectionDevicesMapper> implements IIdxBizJgProtectionDevicesService {
public boolean saveOrUpdateBatchData(List<IdxBizJgProtectionDevices> protectionDevicesList){
return this.saveOrUpdateBatch(protectionDevicesList);
}
@Override
public IdxBizJgProtectionDevices getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgProtectionDevices>().eq("RECORD", record));
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgSupervisionInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgSupervisionInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgSupervisionInfoMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 监督管理信息表服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgSupervisionInfoServiceImpl extends BaseService<IdxBizJgSupervisionInfoDto,IdxBizJgSupervisionInfo,IdxBizJgSupervisionInfoMapper> implements IIdxBizJgSupervisionInfoService {
public boolean saveOrUpdateData(IdxBizJgSupervisionInfo supervisionInfo){
return this.saveOrUpdate(supervisionInfo);
}
@Override
public IdxBizJgSupervisionInfo getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgSupervisionInfo>().eq("RECORD", record));
}
}
\ No newline at end of file
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.biz.service.IIdxBizJgTechParamsBoilerService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsBoilerDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsBoiler;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsBoilerMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-锅炉服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgTechParamsBoilerServiceImpl extends BaseService<IdxBizJgTechParamsBoilerDto,IdxBizJgTechParamsBoiler,IdxBizJgTechParamsBoilerMapper> implements IIdxBizJgTechParamsBoilerService {
/**
* 分页查询
*/
public Page<IdxBizJgTechParamsBoilerDto> queryForIdxBizJgTechParamsBoilerPage(Page<IdxBizJgTechParamsBoilerDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<IdxBizJgTechParamsBoilerDto> queryForIdxBizJgTechParamsBoilerList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsElevatorService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsElevatorDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsElevatorMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 安全追溯-电梯服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgTechParamsElevatorServiceImpl extends BaseService<IdxBizJgTechParamsElevatorDto,IdxBizJgTechParamsElevator,IdxBizJgTechParamsElevatorMapper> implements IIdxBizJgTechParamsElevatorService {
public boolean saveOrUpdateData(IdxBizJgTechParamsElevator techParamsElevator){
return this.saveOrUpdate(techParamsElevator);
}
@Override
public IdxBizJgTechParamsElevator getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", record));
}
}
\ No newline at end of file
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.biz.service.IIdxBizJgTechParamsLiftingService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsLiftingDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsLiftingMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-起重机械服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgTechParamsLiftingServiceImpl extends BaseService<IdxBizJgTechParamsLiftingDto,IdxBizJgTechParamsLifting,IdxBizJgTechParamsLiftingMapper> implements IIdxBizJgTechParamsLiftingService {
/**
* 分页查询
*/
public Page<IdxBizJgTechParamsLiftingDto> queryForIdxBizJgTechParamsLiftingPage(Page<IdxBizJgTechParamsLiftingDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<IdxBizJgTechParamsLiftingDto> queryForIdxBizJgTechParamsLiftingList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
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.biz.service.IIdxBizJgTechParamsPipelineService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsPipelineDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsPipelineMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-压力管道服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgTechParamsPipelineServiceImpl extends BaseService<IdxBizJgTechParamsPipelineDto,IdxBizJgTechParamsPipeline,IdxBizJgTechParamsPipelineMapper> implements IIdxBizJgTechParamsPipelineService {
/**
* 分页查询
*/
public Page<IdxBizJgTechParamsPipelineDto> queryForIdxBizJgTechParamsPipelinePage(Page<IdxBizJgTechParamsPipelineDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<IdxBizJgTechParamsPipelineDto> queryForIdxBizJgTechParamsPipelineList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
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.biz.service.IIdxBizJgTechParamsRidesService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsRidesDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsRidesMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-游乐设施服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgTechParamsRidesServiceImpl extends BaseService<IdxBizJgTechParamsRidesDto,IdxBizJgTechParamsRides,IdxBizJgTechParamsRidesMapper> implements IIdxBizJgTechParamsRidesService {
/**
* 分页查询
*/
public Page<IdxBizJgTechParamsRidesDto> queryForIdxBizJgTechParamsRidesPage(Page<IdxBizJgTechParamsRidesDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<IdxBizJgTechParamsRidesDto> queryForIdxBizJgTechParamsRidesList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
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.biz.service.IIdxBizJgTechParamsRopewayService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsRopewayDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsRopewayMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-索道服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgTechParamsRopewayServiceImpl extends BaseService<IdxBizJgTechParamsRopewayDto,IdxBizJgTechParamsRopeway,IdxBizJgTechParamsRopewayMapper> implements IIdxBizJgTechParamsRopewayService {
/**
* 分页查询
*/
public Page<IdxBizJgTechParamsRopewayDto> queryForIdxBizJgTechParamsRopewayPage(Page<IdxBizJgTechParamsRopewayDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<IdxBizJgTechParamsRopewayDto> queryForIdxBizJgTechParamsRopewayList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
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.biz.service.IIdxBizJgTechParamsVehicleService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsVehicleDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVehicle;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsVehicleMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-场内车辆服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgTechParamsVehicleServiceImpl extends BaseService<IdxBizJgTechParamsVehicleDto,IdxBizJgTechParamsVehicle,IdxBizJgTechParamsVehicleMapper> implements IIdxBizJgTechParamsVehicleService {
/**
* 分页查询
*/
public Page<IdxBizJgTechParamsVehicleDto> queryForIdxBizJgTechParamsVehiclePage(Page<IdxBizJgTechParamsVehicleDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<IdxBizJgTechParamsVehicleDto> queryForIdxBizJgTechParamsVehicleList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
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.biz.service.IIdxBizJgTechParamsVesselService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsVesselDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsVesselMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/**
* 安全追溯-压力容器服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgTechParamsVesselServiceImpl extends BaseService<IdxBizJgTechParamsVesselDto,IdxBizJgTechParamsVessel,IdxBizJgTechParamsVesselMapper> implements IIdxBizJgTechParamsVesselService {
/**
* 分页查询
*/
public Page<IdxBizJgTechParamsVesselDto> queryForIdxBizJgTechParamsVesselPage(Page<IdxBizJgTechParamsVesselDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<IdxBizJgTechParamsVesselDto> queryForIdxBizJgTechParamsVesselList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgUseInfoDto;
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.mapper.IdxBizJgUseInfoMapper;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
/**
* 使用信息表服务实现类
*
* @author system_generator
* @date 2023-08-16
*/
@Service
public class IdxBizJgUseInfoServiceImpl extends BaseService<IdxBizJgUseInfoDto,IdxBizJgUseInfo,IdxBizJgUseInfoMapper> implements IIdxBizJgUseInfoService {
public boolean saveOrUpdateData(IdxBizJgUseInfo useInfo){
return this.saveOrUpdate(useInfo);
}
@Override
public IdxBizJgUseInfo getOneData(String record) {
return this.getOne(new QueryWrapper<IdxBizJgUseInfo>().eq("RECORD", record));
}
}
\ No newline at end of file
...@@ -40,12 +40,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -40,12 +40,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
public static final String SUBMIT_TYPE_FLOW = "1"; public static final String SUBMIT_TYPE_FLOW = "1";
public static final String PROCESS_DEFINITION_KEY = "installationNotification"; public static final String PROCESS_DEFINITION_KEY = "installationNotification";
public static final String TABLE_PAGE_ID = "1734141426742095873"; public static final String TABLE_PAGE_ID = "1734141426742095873";
@Autowired
private JgRelationEquipMapper jgRelationEquipMapper;
@Autowired @Autowired
private JgInstallationNoticeMapper jgInstallationNoticeMapper; private JgInstallationNoticeMapper jgInstallationNoticeMapper;
@Autowired @Autowired
ICreateCodeService iCreateCodeService; @SuppressWarnings("all")
private ICreateCodeService iCreateCodeService;
/** /**
* 根据sequenceNbr查询 * 根据sequenceNbr查询
...@@ -53,6 +54,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -53,6 +54,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
* @param sequenceNbr 主键 * @param sequenceNbr 主键
* @return 安装告知 * @return 安装告知
*/ */
@Override
public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) { public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
// 安装告知信息 // 安装告知信息
JgInstallationNotice notice = jgInstallationNoticeMapper.selectById(sequenceNbr); JgInstallationNotice notice = jgInstallationNoticeMapper.selectById(sequenceNbr);
...@@ -76,14 +78,21 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -76,14 +78,21 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
* *
* @param noticeDto 安装告知 * @param noticeDto 安装告知
*/ */
@SuppressWarnings("rawtypes") @SuppressWarnings({"rawtypes", "Duplicates"})
public JgInstallationNoticeDto updateInstallationNotice(JgInstallationNoticeDto noticeDto, String op) { public JgInstallationNoticeDto updateInstallationNotice(JgInstallationNoticeDto noticeDto, String op) {
if (Objects.isNull(noticeDto) || StringUtils.isEmpty(op)) {
throw new IllegalArgumentException("参数不能为空");
}
// 字段转换
this.convertField(noticeDto); this.convertField(noticeDto);
AjaxResult ajaxResult;
// 发起流程
if (!StringUtils.hasText(noticeDto.getInstanceId())) {
ActWorkflowStartDTO dto = new ActWorkflowStartDTO(); ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey("installationNotification"); dto.setProcessDefinitionKey("installationNotification");
dto.setBusinessKey("1"); dto.setBusinessKey("1");
AjaxResult ajaxResult;
try { try {
ajaxResult = Workflow.taskClient.startByVariable(dto); ajaxResult = Workflow.taskClient.startByVariable(dto);
String instanceId = ((Map) ajaxResult.get("data")).get("id").toString(); String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
...@@ -96,6 +105,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -96,6 +105,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
} catch (Exception e) { } catch (Exception e) {
log.error("提交失败:{}", e); log.error("提交失败:{}", e);
} }
}
ajaxResult = Workflow.taskClient.getTask(noticeDto.getInstanceId()); ajaxResult = Workflow.taskClient.getTask(noticeDto.getInstanceId());
JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data"))); JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
...@@ -115,7 +125,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -115,7 +125,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
if (ObjectUtils.isEmpty(ajaxResult1)) { if (ObjectUtils.isEmpty(ajaxResult1)) {
noticeDto.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode())); noticeDto.setStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
JgInstallationNotice bean = new JgInstallationNotice(); JgInstallationNotice bean = new JgInstallationNotice();
BeanUtils.copyProperties(dto,bean); BeanUtils.copyProperties(noticeDto, bean);
jgInstallationNoticeMapper.updateById(bean); jgInstallationNoticeMapper.updateById(bean);
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -124,9 +134,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -124,9 +134,6 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
return noticeDto; return noticeDto;
} }
@Autowired
JgRelationEquipMapper jgRelationEquipMapper;
/** /**
* 分页查询 * 分页查询
* *
...@@ -135,6 +142,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -135,6 +142,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
* @param type 类型:enterprise-企业端、supervision-监管端 * @param type 类型:enterprise-企业端、supervision-监管端
* @return 安装告知列表 * @return 安装告知列表
*/ */
@Override
public Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type) { public Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type) {
Page<JgInstallationNotice> noticePage = jgInstallationNoticeMapper.queryForPage(page, model, type); Page<JgInstallationNotice> noticePage = jgInstallationNoticeMapper.queryForPage(page, model, type);
...@@ -168,6 +176,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -168,6 +176,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
* @param sequenceNbrs 主键 * @param sequenceNbrs 主键
* @return 是否删除成功 * @return 是否删除成功
*/ */
@Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean deleteForBatch(Long[] sequenceNbrs) { public Boolean deleteForBatch(Long[] sequenceNbrs) {
if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) { if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) {
...@@ -184,6 +193,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -184,6 +193,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
} }
@Override @Override
@SuppressWarnings({"Duplicates", "rawtypes"})
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> jgInstallationNoticeDtoMap) { public void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> jgInstallationNoticeDtoMap) {
JgInstallationNoticeDto model = jgInstallationNoticeDtoMap.get(TABLE_PAGE_ID); JgInstallationNoticeDto model = jgInstallationNoticeDtoMap.get(TABLE_PAGE_ID);
...@@ -207,13 +217,28 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -207,13 +217,28 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
if (SUBMIT_TYPE_FLOW.equals(submitType)) { if (SUBMIT_TYPE_FLOW.equals(submitType)) {
// 发起流程 // 发起流程
ActWorkflowStartDTO dto = new ActWorkflowStartDTO(); ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
for (int i = 0 ; i< deviceList.size(); i++) { for (int i = 0; i < deviceList.size(); i++) {
dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY); dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
dto.setBusinessKey("1");
AjaxResult ajaxResult = null; AjaxResult ajaxResult = null;
try { try {
ajaxResult = Workflow.taskClient.startByVariable(dto); ajaxResult = Workflow.taskClient.startByVariable(dto);
String instanceId = ((Map) ajaxResult.get("data")).get("id").toString(); String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
instanceIdList.add(instanceId); instanceIdList.add(instanceId);
ajaxResult = Workflow.taskClient.getTask(instanceId);
// 执行一步
JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
String taskId = dataObject.getString("id");
//组装信息
TaskResultDTO taskResultDTO = new TaskResultDTO();
taskResultDTO.setResultCode("approvalStatus");
taskResultDTO.setTaskId(taskId);
taskResultDTO.setComment("提交流程");
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", "0");
taskResultDTO.setVariable(map);
//执行流程
Workflow.taskClient.completeByTask(taskId, taskResultDTO);
} catch (Exception e) { } catch (Exception e) {
log.error("流程启动失败:{}", e); log.error("流程启动失败:{}", e);
} }
...@@ -232,7 +257,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -232,7 +257,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
dto.setEquList(String.valueOf(obj.get("SEQUENCE_NBR"))); dto.setEquList(String.valueOf(obj.get("SEQUENCE_NBR")));
jgRelationEquip.setEquipId(String.valueOf(obj.get("SEQUENCE_NBR"))); jgRelationEquip.setEquipId(String.valueOf(obj.get("SEQUENCE_NBR")));
jgRelationEquip.setApplyNo(applyNo); jgRelationEquip.setApplyNo(applyNo);
jgRelationEquip.setBusinessType("GZ"); jgRelationEquip.setBusinessType(ApplicationFormTypeEnum.GZ.getCode());
if (!CollectionUtils.isEmpty(instanceIdList)) { if (!CollectionUtils.isEmpty(instanceIdList)) {
dto.setInstanceId(instanceIdList.get(i)); dto.setInstanceId(instanceIdList.get(i));
dto.setStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode())); dto.setStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
...@@ -257,10 +282,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -257,10 +282,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
private void convertField(JgInstallationNoticeDto model) { private void convertField(JgInstallationNoticeDto model) {
// 处理图片 // 处理图片
String proxyStatementAttachment = convertImageUrl(model.getInstallContractAttachmentList()); model.setProxyStatementAttachment(model.getProxyStatementAttachmentList());
String installContractAttachment = convertImageUrl(model.getProxyStatementAttachmentList()); model.setInstallContractAttachment(model.getInstallContractAttachmentList());
model.setProxyStatementAttachment(proxyStatementAttachment);
model.setInstallContractAttachment(installContractAttachment);
// 分割省市区字段 // 分割省市区字段
String province = model.getProvince(); String province = model.getProvince();
......
...@@ -79,7 +79,11 @@ public class JyjcOpeningApplication extends BaseEntity { ...@@ -79,7 +79,11 @@ public class JyjcOpeningApplication extends BaseEntity {
*/ */
@TableField("status") @TableField("status")
private String status; private String status;
/**
* 状态
*/
@TableField("status_name")
private String statusName;
/** /**
* 备注 * 备注
*/ */
......
package com.yeejoin.amos.boot.module.jyjc.api.enums;
/**
* 办理状态枚举
*/
public enum FlowStatusEnum {
/**
* 待提交
*/
TO_BE_SUBMITTED(6610, "待提交"),
/**
* 已提交
*/
SUBMITTED(6611, "已提交"),
/**
* 待受理
*/
TO_BE_PROCESSED(6612, "待受理"),
/**
* 已办理
*/
HAVE_PROCESSED(6613, "已办理"),
/**
* 已驳回
*/
REJECTED(6614, "已驳回");
private final int code;
private final String name;
FlowStatusEnum(int code, String name) {
this.code = code;
this.name = name;
}
public static String getNameByType(Long code) {
String name = null;
for (FlowStatusEnum enumOne : FlowStatusEnum.values()) {
if (enumOne.getCode() == code) {
name = enumOne.getName();
break;
}
}
return name;
}
public int getCode() {
return code;
}
public String getName() {
return name;
}
}
\ No newline at end of file
...@@ -52,11 +52,14 @@ public class JyjcOpeningApplicationModel extends BaseModel { ...@@ -52,11 +52,14 @@ public class JyjcOpeningApplicationModel extends BaseModel {
@ApiModelProperty (value = "状态") @ApiModelProperty (value = "状态")
private String status; private String status;
@ApiModelProperty (value = "状态Name")
private String statusName;
@ApiModelProperty (value = "备注") @ApiModelProperty (value = "备注")
private String remark; private String remark;
@ApiModelProperty (value = "申请时间") @ApiModelProperty (value = "申请时间")
private String applyTime; private Date applyTime;
@ApiModelProperty (value = "工作流执行角色") @ApiModelProperty (value = "工作流执行角色")
private String workflowRole; private String workflowRole;
......
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
apply_time, apply_time,
workflow_prostance_id, workflow_prostance_id,
workflow_role, workflow_role,
unit_code_name unit_code_name,
status_name
from tz_jyjc_opening_application from tz_jyjc_opening_application
<where> <where>
<if test="jyjcOpeningApplicationModel.applicationSeq != '' and jyjcOpeningApplicationModel.applicationSeq != null"> <if test="jyjcOpeningApplicationModel.applicationSeq != '' and jyjcOpeningApplicationModel.applicationSeq != null">
......
package com.yeejoin.amos.boot.module.jyjc.biz.controller; package com.yeejoin.amos.boot.module.jyjc.biz.controller;
import cn.hutool.core.map.MapBuilder;
import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication; import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
...@@ -23,6 +24,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation; ...@@ -23,6 +24,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -68,9 +70,9 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -68,9 +70,9 @@ public class JyjcOpeningApplicationController extends BaseController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}/submit") @PutMapping(value = "/submit")
@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交") @ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true)); return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
} }
...@@ -80,7 +82,7 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -80,7 +82,7 @@ public class JyjcOpeningApplicationController extends BaseController {
@ApiOperation(httpMethod = "POST", value = "重新提交开通申请", notes = "重新提交开通申请") @ApiOperation(httpMethod = "POST", value = "重新提交开通申请", notes = "重新提交开通申请")
public ResponseModel<JyjcOpeningApplicationModel> resubmitJyjcOpeningApplication(@RequestBody JyjcOpeningApplicationModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<JyjcOpeningApplicationModel> resubmitJyjcOpeningApplication(@RequestBody JyjcOpeningApplicationModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model, true)); return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.resubmit(model));
} }
/** /**
...@@ -127,6 +129,25 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -127,6 +129,25 @@ public class JyjcOpeningApplicationController extends BaseController {
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page,jyjcOpeningApplicationDto)); return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page,jyjcOpeningApplicationDto));
} }
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/pageForCompany")
@ApiOperation(httpMethod = "GET",value = "分页查询-公司", notes = "分页查询-公司")
public ResponseModel<Page<JyjcOpeningApplicationModel>> querypageForCompany(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size,JyjcOpeningApplicationModel jyjcOpeningApplicationDto) {
Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.querypageForCompany(page,jyjcOpeningApplicationDto));
}
/** /**
* 列表全部数据查询 * 列表全部数据查询
* *
...@@ -149,9 +170,12 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -149,9 +170,12 @@ public class JyjcOpeningApplicationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "接收或者驳回业务开通申请", notes = "接收或者驳回业务开通申请") @ApiOperation(httpMethod = "POST",value = "接收或者驳回业务开通申请", notes = "接收或者驳回业务开通申请")
@PostMapping(value = "/execueFlow") @PostMapping(value = "/execueFlow")
public void execueFlow(@RequestBody Map<String,Object> params) { public ResponseModel<HashMap<String,String>> execueFlow(@RequestBody Map<String,Object> params) {
jyjcOpeningApplicationServiceImpl.execueFlow(params); jyjcOpeningApplicationServiceImpl.execueFlow(params);
HashMap<String,String> result =new HashMap<>();
result.put("result","success");
return ResponseHelper.buildResponse(result);
} }
/** /**
......
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