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;
+
+
 }

doc/sql/20220122_模块单元数据表新增字段.sql

@@ -1,4 +1,4 @@
 ALTER TABLE `sar_model_tree` 
 ADD COLUMN `MODEL_TYPE` varchar(20) NULL COMMENT '模块数据类型(CAR:乘用车;TRUCK:卡车)' AFTER `HAS_CHILDREN`,
 ADD COLUMN `MODEL_PID` varchar(100) NULL COMMENT '模块父级ID' AFTER `MODEL_TYPE`,
-ADD COLUMN `MODEL_LEVEL` int(2) NULL COMMENT '模块层级' AFTER `MODEL_PID`;;
+ADD COLUMN `MODEL_LEVEL` int(2) NULL COMMENT '模块层级' AFTER `MODEL_PID`;

doc/sql/20220127_国内海外标准库新增模块单元字段.sql

@@ -0,0 +1,8 @@
+-- 字段配置表新增
+INSERT INTO `sar_stand_attr_details`(`ID`, `ATTR_FIELD`, `ATTR_NAME`, `ATTR_TYPE`, `ATTR_LEN`, `ORDER_NUM`, `IS_EDIT`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `IS_MUST`, `IS_SHOW_IMP`, `SHOW_REGION_ID`, `SEL_VAL`, `SAR_TYPE`, `IS_SEARCH`, `IS_WARN`, `IS_JANSUO`) VALUES ('ibb1lhjxy5180auyqnta', 'DYBXHCAR', '模块结构单元型号(乘用车)', 'INPUT_STR', 1000, 19, '0', 'admin', '0', '2022-01-27 00:00:00', '2022-01-27 10:07:31', '1', '0', '6DCCCGU9KFQXTQ6EGGA4', '', 'STAND', '1', '1', NULL);
+INSERT INTO `sar_stand_attr_details`(`ID`, `ATTR_FIELD`, `ATTR_NAME`, `ATTR_TYPE`, `ATTR_LEN`, `ORDER_NUM`, `IS_EDIT`, `CREATION_USER`, `VALID_FLAG`, `CREATION_TIME`, `MODIFY_TIME`, `IS_MUST`, `IS_SHOW_IMP`, `SHOW_REGION_ID`, `SEL_VAL`, `SAR_TYPE`, `IS_SEARCH`, `IS_WARN`, `IS_JANSUO`) VALUES ('seul117cy8y410qm5trk', 'DYMCCAR', '模块结构单元名称(乘用车)', 'INPUT_STR', 1000, 20, '0', 'admin', '0', '2022-01-27 10:07:21', '2022-01-27 10:07:21', '1', '0', '6DCCCGU9KFQXTQ6EGGA4', '', 'STAND', '1', '1', NULL);
+
+-- 标准扩展字段表添加字段
+ALTER TABLE `sar_stand_attr_info`
+ADD COLUMN `DYBXHCAR` varchar(1000) NULL AFTER `BDTBZH`,
+ADD COLUMN `DYMCCAR` varchar(1000) NULL AFTER `DYBXHCAR`;