feat:安全追溯增加企业许可超期问题生成测试接口

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/SafetyProblemTracingController.java

@@ -31,118 +31,119 @@ import java.util.Map;
 @RequestMapping(value = "/safety-problem-tracing")
 public class SafetyProblemTracingController extends BaseController {
 
-    @Autowired
-    SafetyProblemTracingServiceImpl safetyProblemTracingServiceImpl;
+	@Autowired
+	SafetyProblemTracingServiceImpl safetyProblemTracingServiceImpl;
 
 	@Autowired
 	SafetyProblemTracingGenServiceImpl safetyProblemTracingGenService;
 
-    /**
-     * 新增安全追溯问题
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	/**
+	 * 新增安全追溯问题
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增安全追溯问题", notes = "新增安全追溯问题")
 	public ResponseModel<SafetyProblemTracingDto> save(@RequestBody SafetyProblemTracingDto model) {
-	    model = safetyProblemTracingServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+		model = safetyProblemTracingServiceImpl.createWithModel(model);
+		return ResponseHelper.buildResponse(model);
 	}
 
 	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
+	 * 根据sequenceNbr更新
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新安全追溯问题", notes = "根据sequenceNbr更新安全追溯问题")
-	public ResponseModel<SafetyProblemTracingDto> updateBySequenceNbrSafetyProblemTracing(@RequestBody SafetyProblemTracingDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.updateWithModel(model));
+	public ResponseModel<SafetyProblemTracingDto> updateBySequenceNbrSafetyProblemTracing(@RequestBody SafetyProblemTracingDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		model.setSequenceNbr(sequenceNbr);
+		return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.updateWithModel(model));
+	}
+
+	/**
+	 * 根据sequenceNbr删除
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除安全追溯问题", notes = "根据sequenceNbr删除安全追溯问题")
+	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.removeById(sequenceNbr));
 	}
 
 	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除安全追溯问题", notes = "根据sequenceNbr删除安全追溯问题")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
+	 * 根据sequenceNbr查询
+	 *
+	 * @param sequenceNbr 主键
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个安全追溯问题",  notes = "根据sequenceNbr查询单个安全追溯问题")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个安全追溯问题", notes = "根据sequenceNbr查询单个安全追溯问题")
 	public ResponseModel<SafetyProblemTracingDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.selectOne(sequenceNbr));
+		return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.selectOne(sequenceNbr));
 	}
 
 	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/page")
-	@ApiOperation(httpMethod = "POST",value = "分页查询安全追溯问题",  notes = "分页查询安全追溯问题")
-	public ResponseModel<Page<SafetyProblemTracingDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size, @RequestBody(required = false) SafetyProblemTracingDto problemModel) {
+	@ApiOperation(httpMethod = "POST", value = "分页查询安全追溯问题", notes = "分页查询安全追溯问题")
+	public ResponseModel<Page<SafetyProblemTracingDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+			(value = "size") int size, @RequestBody(required = false) SafetyProblemTracingDto problemModel) {
 		ReginParams loginParams = getSelectedOrgInfo();
 		CompanyBo company = loginParams.getCompany();
 		if (company.getLevel().equals("company")) {
 			return ResponseHelper.buildResponse(new Page<>());
 		}
-	    Page<SafetyProblemTracingDto> page = new Page<>();
-	    page.setCurrent(current);
-	    page.setSize(size);
+		Page<SafetyProblemTracingDto> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
 		problemModel.setGoverningBodyOrgCode(loginParams.getCompany().getOrgCode());
-	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.queryForSafetyProblemTracingPage(page, problemModel));
+		return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.queryForSafetyProblemTracingPage(page, problemModel));
 	}
+
 	/**
-     * 列表分页查询-大屏使用
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
+	 * 列表分页查询-大屏使用
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/page/dp")
-	@ApiOperation(httpMethod = "POST",value = "分页查询安全追溯问题-大屏使用",  notes = "分页查询安全追溯问题-大屏使用")
+	@ApiOperation(httpMethod = "POST", value = "分页查询安全追溯问题-大屏使用", notes = "分页查询安全追溯问题-大屏使用")
 	public ResponseModel<Page<SafetyProblemTracingDto>> getProblemRecords(@RequestParam(value = "current") int current,
 																		  @RequestParam(value = "size") int size,
 																		  @RequestBody(required = false) SafetyProblemTracingDto problemModel) {
-	    Page<SafetyProblemTracingDto> page = new Page<>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.getProblemRecords(page, problemModel));
+		Page<SafetyProblemTracingDto> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.getProblemRecords(page, problemModel));
 	}
 
 	/**
 	 * 设备问题列表分页查询
 	 *
 	 * @param current 当前页
-	 * @param size 每页大小
+	 * @param size    每页大小
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/equipId/page")
-	@ApiOperation(httpMethod = "GET",value = "设备问题列表分页查询",  notes = "设备问题列表分页查询")
-	public ResponseModel<Page<SafetyProblemTracingDto>> queryProblemPageByEquipId(@RequestParam(value = "current") int current,@RequestParam
+	@ApiOperation(httpMethod = "GET", value = "设备问题列表分页查询", notes = "设备问题列表分页查询")
+	public ResponseModel<Page<SafetyProblemTracingDto>> queryProblemPageByEquipId(@RequestParam(value = "current") int current, @RequestParam
 			(value = "size") int size, @RequestParam(value = "record") String equipId) {
 		Page<SafetyProblemTracingDto> page = new Page<>();
 		page.setCurrent(current);
@@ -152,14 +153,14 @@ public class SafetyProblemTracingController extends BaseController {
 
 	/**
 	 * 列表全部数据查询
-     *
+	 *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询安全追溯问题",   notes = "列表全部数据查询安全追溯问题")
+	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询安全追溯问题", notes = "列表全部数据查询安全追溯问题")
 	@GetMapping(value = "/list")
 	public ResponseModel<List<SafetyProblemTracingDto>> selectForList() {
-	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.queryForSafetyProblemTracingList());
+		return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.queryForSafetyProblemTracingList());
 	}
 
 	/**
@@ -169,9 +170,9 @@ public class SafetyProblemTracingController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "根据问题ID及问题类型查询关联设备列表",   notes = "根据问题ID及问题类型查询关联设备列表")
+	@ApiOperation(httpMethod = "GET", value = "根据问题ID及问题类型查询关联设备列表", notes = "根据问题ID及问题类型查询关联设备列表")
 	@GetMapping(value = "/equip/list")
-	public ResponseModel<Page<Map<String, Object>>> queryEquipListProblemById(@RequestParam(value = "current") int current,@RequestParam
+	public ResponseModel<Page<Map<String, Object>>> queryEquipListProblemById(@RequestParam(value = "current") int current, @RequestParam
 			(value = "size") int size, @RequestParam(value = "sequenceNbr") String problemId) {
 		Page<Map<String, Object>> page = new Page<>();
 		page.setCurrent(current);
@@ -186,9 +187,9 @@ public class SafetyProblemTracingController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "根据问题ID及问题类型查询关联企业",   notes = "根据问题ID及问题类型查询关联企业")
+	@ApiOperation(httpMethod = "GET", value = "根据问题ID及问题类型查询关联企业", notes = "根据问题ID及问题类型查询关联企业")
 	@GetMapping(value = "/unit/list")
-	public ResponseModel<Page<Map<String, Object>>> queryPrincipalUnitByProblemId(@RequestParam(value = "current") int current,@RequestParam
+	public ResponseModel<Page<Map<String, Object>>> queryPrincipalUnitByProblemId(@RequestParam(value = "current") int current, @RequestParam
 			(value = "size") int size, @RequestParam(value = "sequenceNbr") String problemId) {
 		Page<Map<String, Object>> page = new Page<>();
 		page.setCurrent(current);
@@ -202,7 +203,7 @@ public class SafetyProblemTracingController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@ApiOperation(httpMethod = "GET",value = "生成维保、检验检测超期数据",   notes = "生成维保、检验检测超期数据")
+	@ApiOperation(httpMethod = "GET", value = "生成维保、检验检测超期数据", notes = "生成维保、检验检测超期数据")
 	@GetMapping(value = "/gen/test1")
 	public ResponseModel<String> test1() {
 		safetyProblemTracingGenService.executeSafetyProblemCheck();
@@ -215,7 +216,7 @@ public class SafetyProblemTracingController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@ApiOperation(httpMethod = "GET",value = "生成检验检测超期数据",   notes = "生成检验检测超期数据")
+	@ApiOperation(httpMethod = "GET", value = "生成检验检测超期数据", notes = "生成检验检测超期数据")
 	@GetMapping(value = "/gen/test2")
 	public ResponseModel<String> test2() {
 		safetyProblemTracingGenService.executeInspectionCheck();
@@ -228,7 +229,7 @@ public class SafetyProblemTracingController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@ApiOperation(httpMethod = "GET",value = "生成维保超期数据",   notes = "生成维保超期数据")
+	@ApiOperation(httpMethod = "GET", value = "生成维保超期数据", notes = "生成维保超期数据")
 	@GetMapping(value = "/gen/test3")
 	public ResponseModel<String> test3() {
 		safetyProblemTracingGenService.executeMaintenanceCheck();
@@ -236,18 +237,30 @@ public class SafetyProblemTracingController extends BaseController {
 	}
 
 
-
 	/**
 	 * update3 -- 修复
 	 *
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@ApiOperation(httpMethod = "GET",value = "修改维保超期脏数据 && 修改检验检测超期数据",
+	@ApiOperation(httpMethod = "GET", value = "修改维保超期脏数据 && 修改检验检测超期数据",
 			notes = "修改维保超期脏数据 && 修改检验检测超期数据")
 	@GetMapping(value = "/gen/update3")
 	public ResponseModel<String> update3() {
 		safetyProblemTracingGenService.update3MaintenanceCheck();
 		return ResponseHelper.buildResponse("success");
 	}
+
+	/**
+	 * 生成企业许可超期问题
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "成企业许可超期问题数据", notes = "成企业许可超期问题数据")
+	@GetMapping(value = "/gen/unitLicenseProblem")
+	public ResponseModel<String> genUnitLicenseProblem() {
+		safetyProblemTracingGenService.executeEnterpriseQualificationCheck();
+		return ResponseHelper.buildResponse("success");
+	}
 }