Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6_temp

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SupervisionVideoServiceImpl.java

@@ -25,7 +25,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
 
     @Autowired
     SupervisionVideoMapper supervisionVideoMapper;
-    @Value("${window.vedioFormat}")
+    @Value("${window.vedioFormat.video}")
     String vedioFormat;
     @Autowired
     private IVideoService videoService;

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -82,6 +82,7 @@ param.system.online.date = 2019-02-12
 
 # 视频转码服务开关 hls(关)/flv(开),默认关闭，数字换流站使用时开启
 window.vedioFormat = hls
+window.vedioFormat.video = flv
 # 航天视频服务地址
 param.htvideo.url=http://192.168.4.174:9001;
 # 南瑞视频转码服务地址

amos-boot-system-tdc/amos-boot-module-tdc-api/src/main/resources/mapper/CheckModelMapper.xml

@@ -5,7 +5,7 @@
     <select id="selectByOrgCode" resultType="com.yeejoin.amos.boot.module.tdc.api.dto.CheckModelDto">
         select `*`,'●' as circle from tdc_model
         <where>
-            <if test = "amosOrgCode != null and amosOrgCode != '' and amosOrgCode != 50 ">
+            <if test = "amosOrgCode != null and amosOrgCode != '' and amosOrgCode != '50' ">
                 and amos_org_code=#{amosOrgCode}
             </if>
         </where>

amos-boot-system-tdc/amos-boot-module-tdc-biz/src/main/java/com/yeejoin/amos/boot/module/tdc/biz/service/impl/CheckModelImpl.java

@@ -270,7 +270,7 @@ public class CheckModelImpl extends ServiceImpl<CheckModelMapper, CheckModel> im
         }
         String modelRule = jsonObject.getString("model_rule");
         if(!ValidationUtil.isEmpty(modelRule)){
-            modelRule = modelRule.substring(modelRule.indexOf("/"),modelRule.indexOf("."));
+            modelRule = modelRule.substring(modelRule.indexOf("/")+1,modelRule.indexOf("."));
         }
         JSONArray modelFile = jsonObject.getJSONArray("model_file");
         String fileUrl = "";