Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
wanjing 1 year ago
parent
commit
a36d58a3e6
10 changed files with 15 additions and 15 deletions
  1. +6
    -6
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/DeptController.java
  2. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/DeleteHandle.java
  3. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ExecuteHandle.java
  4. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/LiveHandle.java
  5. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/PlayBackHandle.java
  6. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ProblemCountHandle.java
  7. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ProblemDetailsHandle.java
  8. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ProblemVerifyHandle.java
  9. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ResubmitHandle.java
  10. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/section/query/QuerySectionListByRoadIdService.java

+ 6
- 6
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/DeptController.java View File

*/ */
@GetMapping("/list/tree") @GetMapping("/list/tree")
public JsonResult getListTree() { public JsonResult getListTree() {
log.info("进入获取部门列表接口");
// log.info("进入获取部门列表接口");
return deptService.getListTree(); return deptService.getListTree();
} }


*/ */
@GetMapping("/child/list/{id}") @GetMapping("/child/list/{id}")
public JsonResult getChildList(@PathVariable("id") String id) { public JsonResult getChildList(@PathVariable("id") String id) {
log.info("进入获取子部门分页列表列表接口, id:{}", id);
// log.info("进入获取子部门分页列表列表接口, id:{}", id);
return deptService.getChildList(id); return deptService.getChildList(id);
} }


*/ */
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public JsonResult getInfo(@PathVariable("id") String id) { public JsonResult getInfo(@PathVariable("id") String id) {
log.info("进入获取部门信息接口");
// log.info("进入获取部门信息接口");
return deptService.getDeptInfo(id); return deptService.getDeptInfo(id);
} }


*/ */
@PostMapping("/add") @PostMapping("/add")
public JsonResult add(@RequestBody AddDeptRequest addDeptRequest) { public JsonResult add(@RequestBody AddDeptRequest addDeptRequest) {
log.info("进入新增部门接口");
// log.info("进入新增部门接口");
return deptService.insert(addDeptRequest); return deptService.insert(addDeptRequest);
} }


*/ */
@PutMapping("/edit") @PutMapping("/edit")
public JsonResult update(@RequestBody Map<String, Object> param) { public JsonResult update(@RequestBody Map<String, Object> param) {
log.info("进入修改部门接口");
// log.info("进入修改部门接口");
EditDeptRequest oldEditDeptRequest = JSON.parseObject(JSON.toJSONString(param.get("oldEditDeptRequest")), EditDeptRequest.class); EditDeptRequest oldEditDeptRequest = JSON.parseObject(JSON.toJSONString(param.get("oldEditDeptRequest")), EditDeptRequest.class);
EditDeptRequest newEditDeptRequest = JSON.parseObject(JSON.toJSONString(param.get("newEditDeptRequest")), EditDeptRequest.class); EditDeptRequest newEditDeptRequest = JSON.parseObject(JSON.toJSONString(param.get("newEditDeptRequest")), EditDeptRequest.class);
return deptService.update(oldEditDeptRequest, newEditDeptRequest); return deptService.update(oldEditDeptRequest, newEditDeptRequest);
*/ */
@DeleteMapping("/delete/{id}") @DeleteMapping("/delete/{id}")
public JsonResult delete(@PathVariable("id") String id) { public JsonResult delete(@PathVariable("id") String id) {
log.info("进入删除部门接口");
// log.info("进入删除部门接口");
return deptService.deleteById(id); return deptService.deleteById(id);
} }
} }

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/DeleteHandle.java View File

*/ */
@Override @Override
public void handler(User user, Dept dept, InspectionVo inspectionVo) { public void handler(User user, Dept dept, InspectionVo inspectionVo) {
log.info("处理删除字段");
// log.info("处理删除字段");
if (InspectionStatusEnum.IN_FLIGHT.getCode() == inspectionVo.getStatus()) { if (InspectionStatusEnum.IN_FLIGHT.getCode() == inspectionVo.getStatus()) {
if (null != handler) { if (null != handler) {
handler.handler(user, dept, inspectionVo); handler.handler(user, dept, inspectionVo);

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ExecuteHandle.java View File

*/ */
@Override @Override
public void handler(User user, Dept dept, InspectionVo inspectionVo) { public void handler(User user, Dept dept, InspectionVo inspectionVo) {
log.info("处理立即执行字段");
// log.info("处理立即执行字段");
if (InspectionStatusEnum.WAIT_FLIGHT.getCode() != inspectionVo.getStatus()) { if (InspectionStatusEnum.WAIT_FLIGHT.getCode() != inspectionVo.getStatus()) {
if (null != handler) { if (null != handler) {
handler.handler(user, dept, inspectionVo); handler.handler(user, dept, inspectionVo);

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/LiveHandle.java View File

*/ */
@Override @Override
public void handler(User user, Dept dept, InspectionVo inspectionVo) { public void handler(User user, Dept dept, InspectionVo inspectionVo) {
log.info("处理直播执行字段");
// log.info("处理直播执行字段");
if (InspectionStatusEnum.IN_FLIGHT.getCode() != inspectionVo.getStatus()) { if (InspectionStatusEnum.IN_FLIGHT.getCode() != inspectionVo.getStatus()) {
if (null != handler) { if (null != handler) {
handler.handler(user, dept, inspectionVo); handler.handler(user, dept, inspectionVo);

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/PlayBackHandle.java View File

*/ */
@Override @Override
public void handler(User user, Dept dept, InspectionVo inspectionVo) { public void handler(User user, Dept dept, InspectionVo inspectionVo) {
log.info("处理回放执行字段");
// log.info("处理回放执行字段");
if (InspectionStatusEnum.FLIGHT_COMPLETED.getCode() == inspectionVo.getStatus()) { if (InspectionStatusEnum.FLIGHT_COMPLETED.getCode() == inspectionVo.getStatus()) {
inspectionVo.setPlayback(true); inspectionVo.setPlayback(true);
} }

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ProblemCountHandle.java View File



@Override @Override
public void handler(User user, Dept dept, InspectionVo inspectionVo) { public void handler(User user, Dept dept, InspectionVo inspectionVo) {
log.info("处理问题数字段");
// log.info("处理问题数字段");
if (InspectionStatusEnum.WAIT_FLIGHT.getCode() == inspectionVo.getStatus()) { if (InspectionStatusEnum.WAIT_FLIGHT.getCode() == inspectionVo.getStatus()) {
inspectionVo.setExecute(true); inspectionVo.setExecute(true);
} }

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ProblemDetailsHandle.java View File



@Override @Override
public void handler(User user, Dept dept, InspectionVo inspectionVo) { public void handler(User user, Dept dept, InspectionVo inspectionVo) {
log.info("处理问题详情字段");
// log.info("处理问题详情字段");
if (InspectionStatusEnum.WAIT_FLIGHT.getCode() == inspectionVo.getStatus()) { if (InspectionStatusEnum.WAIT_FLIGHT.getCode() == inspectionVo.getStatus()) {
inspectionVo.setExecute(true); inspectionVo.setExecute(true);
} }

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ProblemVerifyHandle.java View File



@Override @Override
public void handler(User user, Dept dept, InspectionVo inspectionVo) { public void handler(User user, Dept dept, InspectionVo inspectionVo) {
log.info("处理问题核实字段");
// log.info("处理问题核实字段");
if (InspectionStatusEnum.WAIT_FLIGHT.getCode() == inspectionVo.getStatus()) { if (InspectionStatusEnum.WAIT_FLIGHT.getCode() == inspectionVo.getStatus()) {
inspectionVo.setExecute(true); inspectionVo.setExecute(true);
} }

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ResubmitHandle.java View File

*/ */
@Override @Override
public void handler(User user, Dept dept, InspectionVo inspectionVo) { public void handler(User user, Dept dept, InspectionVo inspectionVo) {
log.info("处理重新提交字段");
// log.info("处理重新提交字段");
if (InspectionStatusEnum.FLIGHT_FAILED.getCode() != inspectionVo.getStatus()) { if (InspectionStatusEnum.FLIGHT_FAILED.getCode() != inspectionVo.getStatus()) {
if (null != handler) { if (null != handler) {
handler.handler(user, dept, inspectionVo); handler.handler(user, dept, inspectionVo);

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/section/query/QuerySectionListByRoadIdService.java View File

private SectionDeptMapper sectionDeptMapper; private SectionDeptMapper sectionDeptMapper;


public JsonResult getList(String roadId) { public JsonResult getList(String roadId) {
log.info("根据公路id获取该公路下路段信息列表业务");
// log.info("根据公路id获取该公路下路段信息列表业务");
String tenantId = CurrentUserUtil.getTenantId(); String tenantId = CurrentUserUtil.getTenantId();


// 校验 // 校验

Loading…
Cancel
Save