Merge remote-tracking branch 'origin/FOTON' into develop_master

adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java

@@ -185,7 +185,7 @@ public class ScheduledJob {
     /**
      * 定时更新文本状态
      */
-    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
+//    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
 //    @Scheduled(cron="*/5 * * * * ?")
     @Async
     public void TextStatusSchedulingTasks() {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java

@@ -8,6 +8,7 @@ import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService;
 import com.adc.da.slrs.sarModelTree.service.ISarModuleTreeService;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
+import com.adc.da.util.utils.StringUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -40,7 +41,10 @@ public class SarModelTreeController extends BaseController<SarModelTree> {
     @GetMapping("/list")
     public ResponseMessage<List<SarModelTree>> getAll(){
 //        List<SarModuleTree> tsResources = iSarModuleTreeService.getAll(null);
-         List<SarModelTree> tsResources = iSarModelTreeService.getAll(null);
+        SarModelTree rootData = new SarModelTree();
+        rootData.setModelType("TRUCK");
+        rootData.setDelFlag("1");
+        List<SarModelTree> tsResources = iSarModelTreeService.getAll(rootData);
         return Result.success(tsResources);
     }
 
@@ -61,7 +65,9 @@ public class SarModelTreeController extends BaseController<SarModelTree> {
     @GetMapping("/childByList")
     public ResponseMessage<List<SarModelTree>> childByList(SarModelTree parentTree){
 //        List<SarModuleTree> tsResources = iSarModuleTreeService.recursionGetChildren(parentTree);
-
+        if(StringUtils.isNotBlank(parentTree.getType())){
+            parentTree.setModelType(parentTree.getType());
+        }
         List<SarModelTree> tsResources = iSarModelTreeService.recursionGetChildren(parentTree);
 
         return Result.success(tsResources);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java

@@ -94,4 +94,11 @@ public class SarModelTree extends BaseEntity {
     @TableField("MODEL_LEVEL")
     private int modelLevel;
 
+    /**
+     * 前端数据查询字段
+     */
+    @TableField(exist=false)
+    private String type;
+
+
 }