Commit 36a8efdf authored by suhuiguang's avatar suhuiguang

1.问题生成适配详情打开修改

parent dcbf148c
...@@ -105,4 +105,14 @@ public class CylinderQuestionInfoController extends BaseController { ...@@ -105,4 +105,14 @@ public class CylinderQuestionInfoController extends BaseController {
return ResponseHelper.buildResponse(cylinderQuestionInfoServiceImpl.queryForCylinderQuestionInfoPage(page,questionType, regionCode, appId)); return ResponseHelper.buildResponse(cylinderQuestionInfoServiceImpl.queryForCylinderQuestionInfoPage(page,questionType, regionCode, appId));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/init")
@ApiOperation(httpMethod = "问题数据初始化", value = "问题数据初始化", notes = "问题数据初始化,运维专用")
public ResponseModel<String> initData() {
cylinderQuestionInfoServiceImpl.initData();
return ResponseHelper.buildResponse("succese");
}
} }
...@@ -42,6 +42,10 @@ public class CompanyQuestionJob { ...@@ -42,6 +42,10 @@ public class CompanyQuestionJob {
@Scheduled(cron = "${inspection.cert.expire.job.cron:0 0 5 * * ?}") @Scheduled(cron = "${inspection.cert.expire.job.cron:0 0 5 * * ?}")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void genCompanyQuestionOfPermissionExpire() { public void genCompanyQuestionOfPermissionExpire() {
genCompanyQuestionOfPermissionExpireImpl();
}
public void genCompanyQuestionOfPermissionExpireImpl() {
List<CylinderUnitDto> cylinderUnitDtoList = cylinderUnitMapper.queryCylinderUnitOfPermissionExpire(QuestionTypeEnum.XKCQ.getCode()); List<CylinderUnitDto> cylinderUnitDtoList = cylinderUnitMapper.queryCylinderUnitOfPermissionExpire(QuestionTypeEnum.XKCQ.getCode());
List<CylinderQuestionInfo> cylinderQuestionInfos = cylinderUnitDtoList.stream().map(cylinderUnitDto -> { List<CylinderQuestionInfo> cylinderQuestionInfos = cylinderUnitDtoList.stream().map(cylinderUnitDto -> {
CylinderQuestionInfo cylinderQuestionInfo = new CylinderQuestionInfo(); CylinderQuestionInfo cylinderQuestionInfo = new CylinderQuestionInfo();
......
...@@ -53,6 +53,10 @@ public class InspectionQuestionJob { ...@@ -53,6 +53,10 @@ public class InspectionQuestionJob {
@Scheduled(cron = "${inspection.overdue.job.cron:0 0/30 * * * ?}") @Scheduled(cron = "${inspection.overdue.job.cron:0 0/30 * * * ?}")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void genOverdueQuestion() { public void genOverdueQuestion() {
genOverdueQuestionImpl();
}
public void genOverdueQuestionImpl() {
List<CylinderInfoDto> cylinderList = cylinderInfoMapper.queryCylinderOfInspectionOverdue(); List<CylinderInfoDto> cylinderList = cylinderInfoMapper.queryCylinderOfInspectionOverdue();
List<CylinderQuestionInfo> cylinderQuestionInfos = cylinderList.stream().map(cylinderInfoDto -> { List<CylinderQuestionInfo> cylinderQuestionInfos = cylinderList.stream().map(cylinderInfoDto -> {
CylinderQuestionInfo cylinderQuestionInfo = new CylinderQuestionInfo(); CylinderQuestionInfo cylinderQuestionInfo = new CylinderQuestionInfo();
...@@ -88,6 +92,10 @@ public class InspectionQuestionJob { ...@@ -88,6 +92,10 @@ public class InspectionQuestionJob {
@Scheduled(cron = "${inspection.unqualified.job.cron:0 0/30 * * * ?}") @Scheduled(cron = "${inspection.unqualified.job.cron:0 0/30 * * * ?}")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void genInspectionUnqualifiedQuestion() { public void genInspectionUnqualifiedQuestion() {
genInspectionUnqualifiedQuestionImpl();
}
public void genInspectionUnqualifiedQuestionImpl() {
List<CylinderInfoDto> cylinderList = cylinderInfoMapper.queryCylinderOfUnqualifiedQuestion(); List<CylinderInfoDto> cylinderList = cylinderInfoMapper.queryCylinderOfUnqualifiedQuestion();
List<CylinderQuestionInfo> cylinderQuestionInfos = cylinderList.stream().map(cylinderInfoDto -> { List<CylinderQuestionInfo> cylinderQuestionInfos = cylinderList.stream().map(cylinderInfoDto -> {
CylinderQuestionInfo cylinderQuestionInfo = new CylinderQuestionInfo(); CylinderQuestionInfo cylinderQuestionInfo = new CylinderQuestionInfo();
......
...@@ -5,6 +5,9 @@ import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderQuestionInfoDto; ...@@ -5,6 +5,9 @@ import com.yeejoin.amos.boot.module.cylinder.api.dto.CylinderQuestionInfoDto;
import com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderQuestionInfo; import com.yeejoin.amos.boot.module.cylinder.api.entity.CylinderQuestionInfo;
import com.yeejoin.amos.boot.module.cylinder.api.mapper.CylinderQuestionInfoMapper; import com.yeejoin.amos.boot.module.cylinder.api.mapper.CylinderQuestionInfoMapper;
import com.yeejoin.amos.boot.module.cylinder.api.service.ICylinderQuestionInfoService; import com.yeejoin.amos.boot.module.cylinder.api.service.ICylinderQuestionInfoService;
import com.yeejoin.amos.boot.module.cylinder.biz.job.CompanyQuestionJob;
import com.yeejoin.amos.boot.module.cylinder.biz.job.InspectionQuestionJob;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.annotation.Condition; import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator; import org.typroject.tyboot.core.rdbms.annotation.Operator;
...@@ -18,6 +21,13 @@ import org.typroject.tyboot.core.rdbms.service.BaseService; ...@@ -18,6 +21,13 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
*/ */
@Service @Service
public class CylinderQuestionInfoServiceImpl extends BaseService<CylinderQuestionInfoDto, CylinderQuestionInfo, CylinderQuestionInfoMapper> implements ICylinderQuestionInfoService { public class CylinderQuestionInfoServiceImpl extends BaseService<CylinderQuestionInfoDto, CylinderQuestionInfo, CylinderQuestionInfoMapper> implements ICylinderQuestionInfoService {
@Autowired
CompanyQuestionJob companyQuestionJob;
@Autowired
InspectionQuestionJob inspectionQuestionJob;
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -25,4 +35,12 @@ public class CylinderQuestionInfoServiceImpl extends BaseService<CylinderQuestio ...@@ -25,4 +35,12 @@ public class CylinderQuestionInfoServiceImpl extends BaseService<CylinderQuestio
return this.queryForPage(page, "happen_date", false, questionType, regionCode, questionAttributionId); return this.queryForPage(page, "happen_date", false, questionType, regionCode, questionAttributionId);
} }
public void initData() {
// 资质超期类型问题数据生成
companyQuestionJob.genCompanyQuestionOfPermissionExpireImpl();
// 检验超期类型问题数据生成
inspectionQuestionJob.genOverdueQuestionImpl();
// 检验不合格类型问题数据生成
inspectionQuestionJob.genInspectionUnqualifiedQuestionImpl();
}
} }
\ No newline at end of file
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