Commit 0cae970d authored by zhangsen's avatar zhangsen

修改参数类型,加排序

parent edd06982
......@@ -9,10 +9,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
......@@ -30,8 +27,8 @@ public class InstructionsController {
*/
@Permission
@ApiOperation(value = "指令流查询API", notes = "指令流查询API")
@GetMapping(value = "/{code}", produces = "application/json;charset=UTF-8")
public ResponseModel createPlan(@PathVariable(value = "code") String code) {
@GetMapping(value = "/getBatchNoByCode", produces = "application/json;charset=UTF-8")
public ResponseModel getBatchNoByCode(@RequestParam(value = "code") String code) {
if (StringUtils.isEmpty(code)) {
return CommonResponseUtil2.failure("参数有误");
}
......
......@@ -47,4 +47,15 @@ public interface IContingencyPlanInstanceRepository extends BaseDao<ContingencyP
List<ContingencyPlanInstance> queryForContent(String batch_no,String category,String subCategory);
Optional<ContingencyPlanInstance> findById(String id);
@Query(value = "SELECT " +
" *" +
" FROM " +
" contingency_plan_instance t" +
" WHERE" +
" t.batch_no = ?" +
" AND t.record_type = ?" +
" ORDER BY" +
" t.create_date DESC", nativeQuery = true)
List<ContingencyPlanInstance> queryForCategoryOrderByCreateDate(String batch_no,String recordType);
}
......@@ -284,7 +284,7 @@ public class ContingencyPlanServiceImpl implements IContingencyPlanService {
if (StringUtils.isEmpty(batchNoByEquipId)) {
return list;
}
List<ContingencyPlanInstance> instancesList = repository.queryForCategory(batchNoByEquipId, "MESSAGE");
List<ContingencyPlanInstance> instancesList = repository.queryForCategoryOrderByCreateDate(batchNoByEquipId, "MESSAGE");
instancesList.forEach(contingencyPlanInstance -> {
HashMap<String, Object> map = new HashMap<>();
map.put("crateDate", contingencyPlanInstance.getCreateDate());
......
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