Przeglądaj źródła

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
wanjing 1 rok temu
rodzic
commit
a36d58a3e6
10 zmienionych plików z 15 dodań i 15 usunięć
  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 Wyświetl plik

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

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

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

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

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

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/DeleteHandle.java Wyświetl plik

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

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ExecuteHandle.java Wyświetl plik

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

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/LiveHandle.java Wyświetl plik

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

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/PlayBackHandle.java Wyświetl plik

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

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ProblemCountHandle.java Wyświetl plik

@@ -31,7 +31,7 @@ public class ProblemCountHandle implements GenerateInspectionFieldHander {

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

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ProblemDetailsHandle.java Wyświetl plik

@@ -20,7 +20,7 @@ public class ProblemDetailsHandle implements GenerateInspectionFieldHander {

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

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ProblemVerifyHandle.java Wyświetl plik

@@ -20,7 +20,7 @@ public class ProblemVerifyHandle implements GenerateInspectionFieldHander {

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

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/inspection/query/handle/ResubmitHandle.java Wyświetl plik

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

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/section/query/QuerySectionListByRoadIdService.java Wyświetl plik

@@ -39,7 +39,7 @@ public class QuerySectionListByRoadIdService {
private SectionDeptMapper sectionDeptMapper;

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

// 校验

Ładowanie…
Anuluj
Zapisz