Commit a7a76094 authored by yangyang's avatar yangyang

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

parents 7d23fd8c 246aa8c1
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,8 +16,43 @@ import java.util.Map; ...@@ -14,8 +16,43 @@ 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 保存类型
*/ */
void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> model); void saveNotice(String submitType, Map<String, JgInstallationNoticeDto> model);
......
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.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.biz.dao.ESElavtorRepository;
import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgConstructionInfoService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgDesignInfoService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgFactoryInfoService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgMainPartsService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgMaintenanceRecordInfoService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgOtherInfoService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgProtectionDevicesService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgSupervisionInfoService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsElevatorService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMainParts;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProtectionDevices;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsElevatorMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.sort.SortOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import static com.alibaba.fastjson.JSON.toJSONString;
/**
* 注册登记信息表服务实现类
*
* @author system_generator
* @date 2023-08-17
*/
@Service
public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegisterInfoDto, IdxBizJgRegisterInfo, IdxBizJgRegisterInfoMapper> implements IIdxBizJgRegisterInfoService {
//设备信息表单id
private static final String EQUIPMENT_INFO_FORM_ID = "1734504628768239617";
private static final String EQUSTATE = "EQU_STATE";
/**
* levlel=company,是企业,如果不是都是监管单位,
* * 在接口中查询当前登录人所属单位是监管单位还是企业。
* * 如果为监管单位添加监管机构查询参数(ORG_BRANCH_CODE);
* * 如果为企业添加使用单位查询参数(USE_UNIT_CREDIT_CODE)
*/
private static final String LEVEL = "company";
// 新增修改标识
private static final String OPERATESAVE = "save";
private static final String OPERATEEDIT = "edit";
// 主要零部件
private static final String main_parts = "mainParts";
// 安全附件
private static final String protection_devices = "ProtectionDevices";
@Autowired
RestHighLevelClient restHighLevelClient;
@Autowired
private RedisUtils redisUtils;
@Autowired
IIdxBizJgUseInfoService idxBizJgUseInfoService;
@Autowired
IIdxBizJgDesignInfoService iIdxBizJgDesignInfoService;
@Autowired
IIdxBizJgFactoryInfoService iIdxBizJgFactoryInfoService;
@Autowired
IIdxBizJgConstructionInfoService iIdxBizJgConstructionInfoService;
@Autowired
IIdxBizJgMaintenanceRecordInfoService iIdxBizJgMaintenanceRecordInfoService;
@Autowired
IIdxBizJgSupervisionInfoService iIdxBizJgSupervisionInfoService;
@Autowired
IIdxBizJgOtherInfoService iIdxBizJgOtherInfoService;
@Autowired
IIdxBizJgInspectionDetectionInfoService iIdxBizJgInspectionDetectionInfoService;
@Autowired
IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
@Autowired
IIdxBizJgMainPartsService iIdxBizJgMainPartsService;
@Autowired
IIdxBizJgProtectionDevicesService iIdxBizJgProtectionDevicesService;
@Autowired
ESEquipmentCategory esEquipmentCategory;
@Autowired
CategoryOtherInfoMapper categoryOtherInfoMapper;
@Autowired
private SuperviseInfoMapper superviseInfoMapper;
/**
* 设备注册信息
*
* @param paramMap
* @return
*/
public ResponseModel equipmentRegisterSubmit(Map<String, Object> paramMap) {
String record = null;
//操作类型
try {
//保存数据
record = batchSubmitOrUpdate(paramMap);
//保存Es数据
if (!ObjectUtils.isEmpty(record)) {
checkEsData(record);
}
} catch (Exception e) {
//删除Es数据
}
return ResponseHelper.buildResponse(record);
}
/**
* 删除设备注册信息(批量删除)
*
* @param sequenceNbrList
* @return
*/
public boolean batchDeleteByRecord(Map<String, Object> map) {
Object recordList = map.get("recordList");
List<String> records = new ArrayList<>();
List<ESEquipmentCategoryDto> list = new ArrayList<>();
//删除ES数据
if (recordList.toString().contains("[")) {
for (String record : (List<String>) recordList) {
records.add(record);
ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto();
esEquipmentCategoryDto.setSEQUENCE_NBR(record);
list.add(esEquipmentCategoryDto);
}
} else {
records.add(recordList.toString());
ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto();
esEquipmentCategoryDto.setSEQUENCE_NBR(recordList.toString());
list.add(esEquipmentCategoryDto);
}
//删除涉及的19张表的数据
superviseInfoMapper.deleteDataAll(records);
//删除es中的数据
esEquipmentCategory.deleteAll(list);
return true;
}
/**
* 查询设备注册信息详情
*
* @param record
* @return
*/
public Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record) {
Map<String, Map<String, Object>> resultMap = new HashMap<>();
Map<String, Object> objMap = new HashMap<>();
//使用信息
IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(useInfo)) {
Map<String, Object> useInfoMap = Bean.BeantoMap(useInfo);
useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
objMap.putAll(useInfoMap);
}
//设计制造
IdxBizJgDesignInfo designInfo = iIdxBizJgDesignInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(designInfo)) {
Map<String, Object> designInfoMap = Bean.BeantoMap(designInfo);
designInfoMap.put("DESIGNINFO_SEQ", designInfo.getSequenceNbr());
objMap.putAll(designInfoMap);
}
//制造信息
IdxBizJgFactoryInfo factoryInfo = iIdxBizJgFactoryInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(factoryInfo)) {
Map<String, Object> factoryInfoMap = Bean.BeantoMap(factoryInfo);
factoryInfoMap.put("FACTORYINFO_SEQ", factoryInfo.getSequenceNbr());
objMap.putAll(factoryInfoMap);
}
//施工信息
IdxBizJgConstructionInfo constructionInfo = iIdxBizJgConstructionInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(constructionInfo)) {
Map<String, Object> constructionInfoMap = Bean.BeantoMap(constructionInfo);
constructionInfoMap.put("CONSTRUCTIONINFO_SEQ", constructionInfo.getSequenceNbr());
objMap.putAll(constructionInfoMap);
}
//注册登记
IdxBizJgRegisterInfo registerInfo = this.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", record));
if (!ValidationUtil.isEmpty(registerInfo)) {
Map<String, Object> registerInfoMap = Bean.BeantoMap(registerInfo);
registerInfoMap.put("REGISTERINFO_SEQ", registerInfo.getSequenceNbr());
objMap.putAll(registerInfoMap);
}
//维保备案
IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = iIdxBizJgMaintenanceRecordInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(maintenanceRecordInfo)) {
Map<String, Object> maintenanceRecordInfoMap = Bean.BeantoMap(maintenanceRecordInfo);
maintenanceRecordInfoMap.put("MAINTENANCERECORDINFO_SEQ", maintenanceRecordInfo.getSequenceNbr());
objMap.putAll(maintenanceRecordInfoMap);
}
//监督管理
IdxBizJgSupervisionInfo supervisionInfo = iIdxBizJgSupervisionInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(supervisionInfo)) {
Map<String, Object> supervisionInfoMap = Bean.BeantoMap(supervisionInfo);
supervisionInfoMap.put("SUPERVISIONINFO_SEQ", supervisionInfo.getSequenceNbr());
objMap.putAll(supervisionInfoMap);
}
//其他信息
IdxBizJgOtherInfo otherInfo = iIdxBizJgOtherInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(otherInfo)) {
Map<String, Object> otherInfoMap = Bean.BeantoMap(otherInfo);
otherInfoMap.put("OTHERINFO_SEQ", otherInfo.getSequenceNbr());
objMap.putAll(otherInfoMap);
}
//检验检测
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.getOneData(record);
if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
Map<String, Object> inspectionDetectionInfoMap = Bean.BeantoMap(inspectionDetectionInfo);
inspectionDetectionInfoMap.put("INSPECTIONDETECTIONINFO_SEQ", inspectionDetectionInfo.getSequenceNbr());
objMap.putAll(inspectionDetectionInfoMap);
}
//电梯
IdxBizJgTechParamsElevator elevator = iIdxBizJgTechParamsElevatorService.getOneData(record);
if (!ValidationUtil.isEmpty(elevator)) {
Map<String, Object> elevatorMap = Bean.BeantoMap(elevator);
elevatorMap.put("ELEVATOR_SEQ", elevator.getSequenceNbr());
objMap.putAll(elevatorMap);
}
//厂车
//索道
//游乐设施
//锅炉
//压力容器
//压力管道
//起重机械
//主要零部件
IdxBizJgMainParts mainParts = iIdxBizJgMainPartsService.getOneData(record);
if (!ValidationUtil.isEmpty(mainParts)) {
Map<String, Object> mainPartsMap = Bean.BeantoMap(mainParts);
mainPartsMap.put("MAINPARTS_SEQ", mainParts.getSequenceNbr());
objMap.putAll(mainPartsMap);
}
//安全附件
IdxBizJgProtectionDevices protectionDevices = iIdxBizJgProtectionDevicesService.getOneData(record);
if (!ValidationUtil.isEmpty(protectionDevices)) {
Map<String, Object> protectionDevicesMap = Bean.BeantoMap(protectionDevices);
protectionDevicesMap.put("PROTECTIONDEVICES_SEQ", protectionDevices.getSequenceNbr());
objMap.putAll(protectionDevicesMap);
}
if (!ValidationUtil.isEmpty(objMap)) {
resultMap.put(EQUIPMENT_INFO_FORM_ID, objMap);
}
return resultMap;
}
/**
* 设备注册信息分页查询
*
* @param map
* @return
*/
public Page<JSONObject> queryForEquipmentRegisterPage(JSONObject map) {
Page<JSONObject> result = new Page<>(map.getInteger("number"), map.getInteger("size"));
SearchRequest request = new SearchRequest();
request.indices("idx_biz_view_jg_all");
SearchSourceBuilder builder = new SearchSourceBuilder();
builder.trackTotalHits(true);
BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
//根据当前登录人查询
if (!ValidationUtil.isEmpty(map.get(EQUSTATE))) {
map.put(EQUSTATE, EquimentEnum.getCode.get(map.get(EQUSTATE).toString()).toString());
}
//获取当前登录人单位类型
List<JSONObject> companyType = getCompanyType();
if (!ValidationUtil.isEmpty(companyType)) {
JSONObject object = getCompanyType().get(0);
String level = object.getString("level");
String code = object.getString("orgCode");
String companyCode = object.getString("companyCode").contains("_") ?
object.getString("companyCode").split("_")[1] : object.getString("companyCode");
// 根据当前登录用户类型及管辖机构筛选条件添加对应参数
if (!ValidationUtil.isEmpty(level)) {
if (LEVEL.equals(level)) {
//企业
map.put("USE_UNIT_CREDIT_CODE", companyCode);
if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
BoolQueryBuilder query = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
query.must(QueryBuilders.matchPhrasePrefixQuery("ORG_BRANCH_CODE", test));
boolMust.must(query);
}
} else {
if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
String paramCode = map.getString("ORG_BRANCH_CODE");
if (paramCode.contains(code)) {
BoolQueryBuilder query = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("ORG_BRANCH_CODE"));
query.must(QueryBuilders.matchPhrasePrefixQuery("ORG_BRANCH_CODE", test));
boolMust.must(query);
} else {
return result;
}
} else {
//监管单位
map.put("ORG_BRANCH_CODE", code);
}
}
}
}
// 默认条件【STATUS===""】
BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
meBuilder.must(QueryBuilders.matchQuery("STATUS", "null"));
boolMust.must(meBuilder);
String queryType = map.getString("QUERY_TYPE");
// //查询 安装告知【可告知设备列表】【EQU_STATE===""】
if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "AZ")) {
BoolQueryBuilder azBuilder = QueryBuilders.boolQuery();
azBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
boolMust.must(azBuilder);
}
//查询 维保备案【可绑定设备列表】【EQU_STATE==="" && INSPECT_REPORT!==9999(默认占位值)】
if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "WB")) {
BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
wbBuilder.mustNot(QueryBuilders.matchQuery("INSPECT_REPORT", 9999));
boolMust.must(wbBuilder);
}
//查询 使用登记【可选设备列表】【EQU_STATUS==="" && INSPECT_REPORT!==9999(默认占位值) && USE_ORG_CODE!=="" 】
if (!ObjectUtils.isEmpty(queryType) && ValidationUtil.equals(queryType, "SY")) {
BoolQueryBuilder syBuilder = QueryBuilders.boolQuery();
syBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
syBuilder.mustNot(QueryBuilders.matchQuery("INSPECT_REPORT", 9999));
syBuilder.mustNot(QueryBuilders.matchQuery("USE_ORG_CODE", ""));
boolMust.must(syBuilder);
}
//通用匹配规则,其他条件构建
if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY"))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String param = QueryParser.escape(map.getString("EQU_CATEGORY"));
pBuilder.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY", "*" + param + "*"));
boolMust.must(pBuilder);
}
if (!ObjectUtils.isEmpty(map.getString("USE_PLACE"))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String param = QueryParser.escape(map.getString("USE_PLACE"));
pBuilder.must(QueryBuilders.matchPhraseQuery("USE_PLACE", "*" + param + "*"));
boolMust.must(pBuilder);
}
builder.query(boolMust);
builder.sort("REC_DATE", SortOrder.DESC);
builder.from((map.getInteger("number") - 1) * map.getInteger("size"));
builder.size(map.getInteger("size"));
request.source(builder);
List<JSONObject> list = new LinkedList<>();
long totle = 0;
try {
SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
for (org.elasticsearch.search.SearchHit hit : response.getHits().getHits()) {
System.out.println(hit);
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
JSONObject dto2 = jsonObject.getJSONObject("sourceAsMap");
list.add(dto2);
}
totle = response.getInternalResponse().hits().getTotalHits().value;
result.setRecords(list);
result.setTotal(totle);
} catch (IOException e) {
throw new RuntimeException(e);
}
return result;
}
/**
* 获取当前登录人单位类型
*
* @return
*/
public List<JSONObject> getCompanyType() {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
List<CompanyModel> companys = reginParams.getUserModel().getCompanys();
List<JSONObject> objectList = new ArrayList<>();
if (!ValidationUtil.isEmpty(companys)) {
for (CompanyModel company : companys) {
JSONObject object = new JSONObject();
object.put("level", company.getLevel());
object.put("orgCode", company.getOrgCode());
object.put("companyCode", company.getCompanyCode());
objectList.add(object);
}
}
return objectList;
}
private String batchSubmitOrUpdate(Map<String, Object> map) {
Date date = new Date();
String record = null;
LinkedHashMap equipmentInfoForm = (LinkedHashMap) map.get(EQUIPMENT_INFO_FORM_ID);
//操作类型
String operateType = ValidationUtil.isEmpty(String.valueOf(equipmentInfoForm.get("SEQUENCE_NBR"))) ? OPERATESAVE : OPERATEEDIT;
record = OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : equipmentInfoForm.get("RECORD").toString();
//使用信息
IdxBizJgUseInfo useInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgUseInfo.class);
useInfo.setRecord(record);
useInfo.setRecDate(date);
useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
idxBizJgUseInfoService.saveOrUpdateData(useInfo);
//设计制造
IdxBizJgDesignInfo designInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgDesignInfo.class);
designInfo.setRecord(record);
designInfo.setRecDate(date);
designInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("DESIGNINFO_SEQ")));
iIdxBizJgDesignInfoService.saveOrUpdateData(designInfo);
//制造信息
IdxBizJgFactoryInfo factoryInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgFactoryInfo.class);
factoryInfo.setRecord(record);
factoryInfo.setRecDate(date);
factoryInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("FACTORYINFO_SEQ")));
iIdxBizJgFactoryInfoService.saveOrUpdateData(factoryInfo);
//施工信息
IdxBizJgConstructionInfo constructionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgConstructionInfo.class);
constructionInfo.setRecord(record);
constructionInfo.setRecDate(date);
constructionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("CONSTRUCTIONINFO_SEQ")));
iIdxBizJgConstructionInfoService.saveOrUpdateData(constructionInfo);
//注册登记
IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgRegisterInfo.class);
registerInfo.setRecord(record);
registerInfo.setRecDate(date);
registerInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("REGISTERINFO_SEQ")));
this.saveOrUpdate(registerInfo);
//维保备案
IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgMaintenanceRecordInfo.class);
maintenanceRecordInfo.setRecord(record);
maintenanceRecordInfo.setRecDate(date);
maintenanceRecordInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("MAINTENANCERECORDINFO_SEQ")));
iIdxBizJgMaintenanceRecordInfoService.saveOrUpdateData(maintenanceRecordInfo);
//监督管理
IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgSupervisionInfo.class);
supervisionInfo.setRecord(record);
supervisionInfo.setRecDate(date);
supervisionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("SUPERVISIONINFO_SEQ")));
iIdxBizJgSupervisionInfoService.saveOrUpdateData(supervisionInfo);
//其他信息
IdxBizJgOtherInfo otherInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgOtherInfo.class);
otherInfo.setRecord(record);
otherInfo.setRecDate(date);
otherInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("OTHERINFO_SEQ")));
iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
//检验检测
IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
inspectionDetectionInfo.setRecord(record);
inspectionDetectionInfo.setRecDate(date);
inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
//八大类技术参数表
//电梯
IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgTechParamsElevator.class);
if (!ValidationUtil.isEmpty(elevator)) {
elevator.setRecord(record);
elevator.setRecDate(date);
elevator.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("ELEVATOR_SEQ")));
iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
}
//厂车
//索道
//游乐设施
//锅炉
//压力容器
//压力管道
//起重机械
//八大类技术参数中主要零部件和安全附件表
List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
//要零部件
List<String> subFormMainPartsList = new ArrayList<>();
subFormMainPartsList.add("subForm_fie04854f2");
mainPartsList = getAccessoryEntity(equipmentInfoForm, subFormMainPartsList, main_parts, record, date, operateType);
//安全附件
List<String> subFormProtectionDevicesList = new ArrayList<>();
subFormProtectionDevicesList.add("subForm_d4xdzhsgdj");
protectionDevicesList = getAccessoryEntity(equipmentInfoForm, subFormProtectionDevicesList, protection_devices, record, date, operateType);
if (!ValidationUtil.isEmpty(mainPartsList)) {
iIdxBizJgMainPartsService.saveOrUpdateBatchData(mainPartsList);
}
if (!ValidationUtil.isEmpty(protectionDevicesList)) {
iIdxBizJgProtectionDevicesService.saveOrUpdateBatchData(protectionDevicesList);
}
return record;
}
public void checkEsData(String id) {
Map<String, Object> map = categoryOtherInfoMapper.selectDataById(id);
categoryOtherInfoMapper.updateEsStatus(id);
ESEquipmentCategoryDto dto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
// 默认赋值占位,方便es条件搜索时使用
dto.setSTATUS("null");
dto.setEQU_STATE(9999);
Optional<ESEquipmentCategoryDto> data = esEquipmentCategory.findById(id);
if (!ObjectUtils.isEmpty(data)) {
esEquipmentCategory.deleteById(id);
}
if (!ObjectUtils.isEmpty(dto)) {
long time = Timestamp.valueOf(map.get("REC_DATE").toString().substring(0, 19)).getTime();
dto.setREC_DATE(time);
esEquipmentCategory.save(dto);
}
}
private List getAccessoryEntity(Map<String, Object> map, List<String> list, String subFormType, String record, Date date, String type) {
List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
if ("mainParts".equals(subFormType)) {
for (Object s : list) {
List subFormMainPartsList = (ArrayList) map.get(s);
if (!ObjectUtils.isEmpty(subFormMainPartsList)) {
for (Object obj : subFormMainPartsList) {
HashMap<String, Object> objMap = (HashMap<String, Object>) obj;
IdxBizJgMainParts mainParts = JSON.parseObject(JSON.toJSONString(objMap), IdxBizJgMainParts.class);
mainParts.setRecord(record);
mainParts.setRecDate(date);
mainParts.setSequenceNbr("save".equals(type) ? null : String.valueOf(objMap.get("MAINPARTS_SEQ")));
mainPartsList.add(mainParts);
}
}
}
return mainPartsList;
} else {
for (Object s : list) {
List subFormProtectionDevicesList = (ArrayList) map.get(s);
if (!ObjectUtils.isEmpty(subFormProtectionDevicesList)) {
for (Object obj : subFormProtectionDevicesList) {
HashMap<String, Object> objMap = (HashMap<String, Object>) obj;
IdxBizJgProtectionDevices protectionDevices = JSON.parseObject(JSON.toJSONString(objMap), IdxBizJgProtectionDevices.class);
protectionDevices.setRecord(record);
protectionDevices.setRecDate(date);
protectionDevices.setSequenceNbr("save".equals(type) ? null : String.valueOf(objMap.get("PROTECTIONDEVICES_SEQ")));
protectionDevicesList.add(protectionDevices);
}
}
}
return protectionDevicesList;
}
}
}
\ 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
...@@ -58,6 +58,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -58,6 +58,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);
...@@ -142,6 +143,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -142,6 +143,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);
...@@ -175,6 +177,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -175,6 +177,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) {
......
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