1.巡检废弃接口增加废弃标识

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -228,6 +228,7 @@ public class CheckController extends AbstractBaseController {
         return CommonResponseUtil.success(list);
     }
 
+    @Deprecated
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "一键提交巡检任务", notes = "一键提交巡检任务<font color='blue'>手机app</font>")
     @RequestMapping(value = "/saveRecordAll2", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1697,6 +1697,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     }
 
 
+    @Deprecated
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void handleAllBatch(String planTaskIds, String userId) {
@@ -2001,8 +2002,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             esPlanTaskListDto.setOmission(this.filterByStatus("3", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
             esPlanTaskListDto.setUnqualified(this.filterByStatus("2", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
             esPlanTaskListDto.setUnplan(this.filterByStatus("0", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
-            esPlanTaskListDto.setTaskPlanNum(this.filterByStatus("1", esPlanTaskListDto.getPlanTaskId(), esTaskDetailDtos));
             esPlanTaskListDto.setPoints(this.buildPlanTaskPoint(esPlanTaskListDto.getPlanTaskId(), planTaskDetails));
+            esPlanTaskListDto.setTaskPlanNum(esPlanTaskListDto.getPoints().size() + "");
         });
     }
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanTaskService.java

@@ -210,6 +210,7 @@ public interface IPlanTaskService {
 
 	void backPatrolInfo();
 
+	@Deprecated
     void handleAllBatch(String ids, String userId);
 
 	void handleAllBatch2(String ids, String userId);

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/application.properties

@@ -22,7 +22,7 @@ mybatis.mapper-locations = classpath:db/mapper/*.xml
 mybatis-plus.mapper-locations=classpath:db/mapper/*.xml
 mybatis.type-aliases-package = com.yeejoin.amos.patrol.business.entity.mybatis
 mybatis.configuration.mapUnderscoreToCamelCase=true
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.nologging.NoLoggingImpl
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis-plus.global-config.db-config.update-strategy=ignored
 
 spring.liquibase.change-log=classpath:/db/changelog/changelog-master.xml
@@ -80,4 +80,5 @@ spring.security.user.password=a1234560
 #\u96EA\u82B1\u7B97\u6CD5\u53C2\u6570  \u7EC8\u7AEFID
 generator.worker_id=1
 #\u96EA\u82B1\u7B97\u6CD5\u53C2\u6570  \u6570\u636E\u4E2D\u5FC3id
-generator.datacenter_id=1
+generator.datacenter_id=1
\ No newline at end of file
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file