guoshilong
2023-11-02 55b4867bb7e89cbde093a9ae55e6a8882195a3e4
测站名称模糊查询修改
2 files modified
6 ■■■■ changed files
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
@@ -42,8 +42,8 @@
        PropsUtil.setProperty(props, "spring.cloud.nacos.password", LauncherConstant.NACOS_PASSWORD);
        //自定义注册
//        PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong");
//        PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong");
        PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong");
        PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong");
        PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
        PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
@@ -86,7 +86,7 @@
            AND NAG.POINT_id = #{vo.pointId}
        </if>
        <if test="vo.cdName != null and vo.cdName !=''">
            AND acb."cd_name" LIKE CONCAT('%',#{vo.cdName},'%')
            AND acb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
        </if>
        AND NAG.dam_id =  #{vo.damId}
    </select>