Explorar o código

移植智能检修首页接口

shilin %!s(int64=3) %!d(string=hai) anos
pai
achega
651687afea

+ 3 - 3
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/config/GeneratorCodeConfig.java

@@ -57,9 +57,9 @@ public class GeneratorCodeConfig {
 //        mpg.setDataSource(dsc);
 
         dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
-        dsc.setUsername("gdprod");
-        dsc.setPassword("gd123");
-        dsc.setUrl("jdbc:oracle:thin:@10.0.118.71:1521:gdsj");
+        dsc.setUsername("nxfdprod");
+        dsc.setPassword("gdnxfd123");
+        dsc.setUrl("jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd");
         mpg.setDataSource(dsc);
 
 //        dsc.setDriverName("com.cloudera.impala.jdbc41.Driver");

+ 67 - 67
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/config/XxlJobConfig.java

@@ -1,67 +1,67 @@
-package com.gyee.healthmodel.config;
-
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-
-/**
- * xxl-job config
- *
- * @author xuxueli 2017-04-28
- */
-
-
-    @Configuration
-    @PropertySource("classpath:xxl-job-executor.properties")
-    public class XxlJobConfig implements EnvironmentAware {
-        private Environment env;
-
-        @Override
-        public void setEnvironment(Environment environment) {
-            this.env=environment;
-        }
-
-    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-
-
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        logger.info(">>>>>>>>>>> xxl-job config init.");
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
-        xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
-        xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
-        xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
-        xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
-        xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
-        xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
-        xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
-
-        return xxlJobSpringExecutor;
-    }
-
-    /**
-     * 针对多网卡、容器内部署等情况,可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP;
-     *
-     *      1、引入依赖:
-     *          <dependency>
-     *             <groupId>org.springframework.cloud</groupId>
-     *             <artifactId>spring-cloud-commons</artifactId>
-     *             <version>${version}</version>
-     *         </dependency>
-     *
-     *      2、配置文件,或者容器启动变量
-     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
-     *
-     *      3、获取IP
-     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
-     */
-
-
-}
+//package com.gyee.healthmodel.config;
+//
+//import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.context.EnvironmentAware;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.PropertySource;
+//import org.springframework.core.env.Environment;
+//
+///**
+// * xxl-job config
+// *
+// * @author xuxueli 2017-04-28
+// */
+//
+//
+//    @Configuration
+//    @PropertySource("classpath:xxl-job-executor.properties")
+//    public class XxlJobConfig implements EnvironmentAware {
+//        private Environment env;
+//
+//        @Override
+//        public void setEnvironment(Environment environment) {
+//            this.env=environment;
+//        }
+//
+//    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+//
+//
+//
+//    @Bean
+//    public XxlJobSpringExecutor xxlJobExecutor() {
+//        logger.info(">>>>>>>>>>> xxl-job config init.");
+//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+//        xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
+//        xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
+//        xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
+//        xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
+//        xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
+//        xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
+//        xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
+//        xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
+//
+//        return xxlJobSpringExecutor;
+//    }
+//
+//    /**
+//     * 针对多网卡、容器内部署等情况,可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP;
+//     *
+//     *      1、引入依赖:
+//     *          <dependency>
+//     *             <groupId>org.springframework.cloud</groupId>
+//     *             <artifactId>spring-cloud-commons</artifactId>
+//     *             <version>${version}</version>
+//     *         </dependency>
+//     *
+//     *      2、配置文件,或者容器启动变量
+//     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+//     *
+//     *      3、获取IP
+//     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+//     */
+//
+//
+//}

+ 24 - 0
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/mapper/auto/WindturbinewindyawMapper.java

@@ -0,0 +1,24 @@
+package com.gyee.healthmodel.mapper.auto;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.healthmodel.model.auto.Windturbinewindyaw;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-11
+ */
+public interface WindturbinewindyawMapper extends BaseMapper<Windturbinewindyaw> {
+    @Select("select windturbineid,speed,sum(qualified) qualified,sum(unqualified) unqualified from Windturbinewindyaw where recorddate>=#{beginDate} and recorddate<=#{endDate} \n" +
+            " group by windturbineid,speed  order by windturbineid,speed ")
+    List<Windturbinewindyaw> findWindturbinewindyaw(@Param("beginDate") Date beginDate, @Param("endDate")Date endDate);
+}

+ 348 - 0
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/model/auto/Windturbinewindyaw.java

@@ -0,0 +1,348 @@
+package com.gyee.healthmodel.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDTURBINEWINDYAW")
+public class Windturbinewindyaw extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Long id;
+
+    @TableField("WINDTURBINEID")
+    private String windturbineid;
+
+    @TableField("RECORDDATE")
+    private Date recorddate;
+
+    @TableField("SPEED")
+    private Integer speed;
+
+    @TableField("QUALIFIED")
+    private Double qualified;
+
+    @TableField("UNQUALIFIED")
+    private Double unqualified;
+
+    @TableField("\"R-50\"")
+    private Integer Rf50;
+
+    @TableField("\"R-49\"")
+    private Integer Rf49;
+
+    @TableField("\"R-48\"")
+    private Integer Rf48;
+
+    @TableField("\"R-47\"")
+    private Integer Rf47;
+
+    @TableField("\"R-46\"")
+    private Integer Rf46;
+
+    @TableField("\"R-45\"")
+    private Integer Rf45;
+
+    @TableField("\"R-44\"")
+    private Integer Rf44;
+
+    @TableField("\"R-43\"")
+    private Integer Rf43;
+
+    @TableField("\"R-42\"")
+    private Integer Rf42;
+
+    @TableField("\"R-41\"")
+    private Integer Rf41;
+
+    @TableField("\"R-40\"")
+    private Integer Rf40;
+
+    @TableField("\"R-39\"")
+    private Integer Rf39;
+
+    @TableField("\"R-38\"")
+    private Integer Rf38;
+
+    @TableField("\"R-37\"")
+    private Integer Rf37;
+
+    @TableField("\"R-36\"")
+    private Integer Rf36;
+
+    @TableField("\"R-35\"")
+    private Integer Rf35;
+
+    @TableField("\"R-34\"")
+    private Integer Rf34;
+
+    @TableField("\"R-33\"")
+    private Integer Rf33;
+
+    @TableField("\"R-32\"")
+    private Integer Rf32;
+
+    @TableField("\"R-31\"")
+    private Integer Rf31;
+
+    @TableField("\"R-30\"")
+    private Integer Rf30;
+
+    @TableField("\"R-29\"")
+    private Integer Rf29;
+
+    @TableField("\"R-28\"")
+    private Integer Rf28;
+
+    @TableField("\"R-27\"")
+    private Integer Rf27;
+
+    @TableField("\"R-26\"")
+    private Integer Rf26;
+
+    @TableField("\"R-25\"")
+    private Integer Rf25;
+
+    @TableField("\"R-24\"")
+    private Integer Rf24;
+
+    @TableField("\"R-23\"")
+    private Integer Rf23;
+
+    @TableField("\"R-22\"")
+    private Integer Rf22;
+
+    @TableField("\"R-21\"")
+    private Integer Rf21;
+
+    @TableField("\"R-20\"")
+    private Integer Rf20;
+
+    @TableField("\"R-19\"")
+    private Integer Rf19;
+
+    @TableField("\"R-18\"")
+    private Integer Rf18;
+
+    @TableField("\"R-17\"")
+    private Integer Rf17;
+
+    @TableField("\"R-16\"")
+    private Integer Rf16;
+
+    @TableField("\"R-15\"")
+    private Integer Rf15;
+
+    @TableField("\"R-14\"")
+    private Integer Rf14;
+
+    @TableField("\"R-13\"")
+    private Integer Rf13;
+
+    @TableField("\"R-12\"")
+    private Integer Rf12;
+
+    @TableField("\"R-11\"")
+    private Integer Rf11;
+
+    @TableField("\"R-10\"")
+    private Integer Rf10;
+
+    @TableField("\"R-9\"")
+    private Integer Rf9;
+
+    @TableField("\"R-8\"")
+    private Integer Rf8;
+
+    @TableField("\"R-7\"")
+    private Integer Rf7;
+
+    @TableField("\"R-6\"")
+    private Integer Rf6;
+
+    @TableField("\"R-5\"")
+    private Integer Rf5;
+
+    @TableField("\"R-4\"")
+    private Integer Rf4;
+
+    @TableField("\"R-3\"")
+    private Integer Rf3;
+
+    @TableField("\"R-2\"")
+    private Integer Rf2;
+
+    @TableField("\"R-1\"")
+    private Integer Rf1;
+
+    @TableField("R0")
+    private Integer R0;
+
+    @TableField("R1")
+    private Integer R1;
+
+    @TableField("R2")
+    private Integer R2;
+
+    @TableField("R3")
+    private Integer R3;
+
+    @TableField("R4")
+    private Integer R4;
+
+    @TableField("R5")
+    private Integer R5;
+
+    @TableField("R6")
+    private Integer R6;
+
+    @TableField("R7")
+    private Integer R7;
+
+    @TableField("R8")
+    private Integer R8;
+
+    @TableField("R9")
+    private Integer R9;
+
+    @TableField("R10")
+    private Integer R10;
+
+    @TableField("R11")
+    private Integer R11;
+
+    @TableField("R12")
+    private Integer R12;
+
+    @TableField("R13")
+    private Integer R13;
+
+    @TableField("R14")
+    private Integer R14;
+
+    @TableField("R15")
+    private Integer R15;
+
+    @TableField("R16")
+    private Integer R16;
+
+    @TableField("R17")
+    private Integer R17;
+
+    @TableField("R18")
+    private Integer R18;
+
+    @TableField("R19")
+    private Integer R19;
+
+    @TableField("R20")
+    private Integer R20;
+
+    @TableField("R21")
+    private Integer R21;
+
+    @TableField("R22")
+    private Integer R22;
+
+    @TableField("R23")
+    private Integer R23;
+
+    @TableField("R24")
+    private Integer R24;
+
+    @TableField("R25")
+    private Integer R25;
+
+    @TableField("R26")
+    private Integer R26;
+
+    @TableField("R27")
+    private Integer R27;
+
+    @TableField("R28")
+    private Integer R28;
+
+    @TableField("R29")
+    private Integer R29;
+
+    @TableField("R30")
+    private Integer R30;
+
+    @TableField("R31")
+    private Integer R31;
+
+    @TableField("R32")
+    private Integer R32;
+
+    @TableField("R33")
+    private Integer R33;
+
+    @TableField("R34")
+    private Integer R34;
+
+    @TableField("R35")
+    private Integer R35;
+
+    @TableField("R36")
+    private Integer R36;
+
+    @TableField("R37")
+    private Integer R37;
+
+    @TableField("R38")
+    private Integer R38;
+
+    @TableField("R39")
+    private Integer R39;
+
+    @TableField("R40")
+    private Integer R40;
+
+    @TableField("R41")
+    private Integer R41;
+
+    @TableField("R42")
+    private Integer R42;
+
+    @TableField("R43")
+    private Integer R43;
+
+    @TableField("R44")
+    private Integer R44;
+
+    @TableField("R45")
+    private Integer R45;
+
+    @TableField("R46")
+    private Integer R46;
+
+    @TableField("R47")
+    private Integer R47;
+
+    @TableField("R48")
+    private Integer R48;
+
+    @TableField("R49")
+    private Integer R49;
+
+    @TableField("R50")
+    private Integer R50;
+
+}

+ 23 - 0
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/service/HealthFactoryService.java

@@ -55,6 +55,9 @@ public class HealthFactoryService  {
 				case DFEDCL:
 					result=getQxpcfx(wt, result, c, hc);
 					break;
+                case PHDFPC:
+                    result=getPhdfpcfx(wt, result, c, hc);
+                    break;
 				default:
 					break;
 				}
@@ -429,5 +432,25 @@ public class HealthFactoryService  {
 		return result;
 	}
 
+
+    private Object getPhdfpcfx(Windturbine wt, Object result, Calendar c,HcEnum hc) throws Exception {
+
+        result=false;
+
+	    if(HealthInitialService.phdfpcmap.containsKey(wt.getId()))
+        {
+            int time=HealthInitialService.phdfpcmap.get(wt.getId());
+            {
+                if(time>=9)
+                {
+                    result=true;
+                }else
+                {
+                    result=false;
+                }
+            }
+        }
+        return result;
+    }
 	
 }

+ 7 - 1
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/service/HealthInitialService.java

@@ -31,6 +31,10 @@ public class HealthInitialService {
     @Autowired
     private CurvefittingsubsService curvefittingsubsService;
 
+
+    @Autowired
+    private WindturbinewindyawService windturbinewindyawService;
+
     public static Map<String, Losspowerrate> lwmap;
     public static Map<String, List<Windturbineinfoday3>> wimap;
     public static Map<String, List<Curvefittingmain>> cfvmap;
@@ -47,7 +51,7 @@ public class HealthInitialService {
     public static Map<String, Double> clpdmap;
 
     public static Map<String, Double> dfpdmap;
-
+    public static Map<String, Integer>phdfpcmap;
     /************************************************************************************/
 
 
@@ -70,6 +74,8 @@ public class HealthInitialService {
         //曲线偏差基准值
         cfsbase = curvefittingsubsService.findCurvefittingBaseVallue(c.getTime());
 
+        phdfpcmap=windturbinewindyawService.findWindturbinewindyaw(c.getTime());//偏航对风偏差分析
+
 //		xnmap = masterDataService.findDjpg();
         djpgmap = xnmap;
         jkfxmap = yxmap;

+ 1 - 1
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/service/HealthJudgeService.java

@@ -491,7 +491,7 @@ public class HealthJudgeService {
 	 * @param staionid
 	 * @return
 	 */
-	private List<Alertrule2> findArsubs(String modelid,String staionid) {
+	private List<Alertrule2> findArsubs(String staionid,String modelid) {
 
         if(StringUtils.notEmp(modelid) && StringUtils.notEmp(staionid))
         {

+ 64 - 0
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/service/WindturbinewindyawService.java

@@ -0,0 +1,64 @@
+package com.gyee.healthmodel.service;
+
+import com.gyee.healthmodel.model.auto.Windturbinewindyaw;
+import com.gyee.healthmodel.service.auto.IWindturbinewindyawService;
+import com.gyee.healthmodel.util.DateUtils;
+import com.gyee.healthmodel.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @ClassName : WindturbinewindyawService
+ * @Description : 偏航对风统计service
+ */
+@Service
+public class WindturbinewindyawService {
+
+    private final int DIGIT=2;
+    @Resource
+    private IWindturbinewindyawService windturbinewindyawService;
+
+
+    public Map<String,Integer> findWindturbinewindyaw(Date recodeDate)  {
+
+
+        Calendar c=Calendar.getInstance();
+        c.setTime(recodeDate);
+        c.add(Calendar.DAY_OF_MONTH, -1);
+        Date endDate = c.getTime();
+        c.add(Calendar.DAY_OF_MONTH, -7);
+        Date beginDate = c.getTime();
+
+        Map<String,Integer> map=new HashMap<>();
+        List<Windturbinewindyaw> windturbinewindyawlist = windturbinewindyawService.findWindturbinewindyaw(DateUtils.truncate(beginDate),DateUtils.truncate(endDate));
+        if (!windturbinewindyawlist.isEmpty()) {
+            for (Windturbinewindyaw yaw : windturbinewindyawlist)
+            {
+                if(StringUtils.notEmp(yaw.getWindturbineid()) && StringUtils.notEmp(yaw.getQualified()) && StringUtils.notEmp(yaw.getUnqualified())) {
+
+                    if (map.containsKey(yaw.getWindturbineid())) {
+
+                        if (yaw.getUnqualified() > yaw.getQualified()) {
+                            int time = map.get(yaw.getWindturbineid());
+                            map.put(yaw.getWindturbineid(), time + 1);
+                        }
+
+                    } else {
+
+                        if (yaw.getUnqualified() > yaw.getQualified()) {
+                            map.put(yaw.getWindturbineid(), 1);
+                        }
+
+                    }
+                }
+            }
+        }
+        return map;
+    }
+
+
+
+
+}

+ 21 - 0
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/service/auto/IWindturbinewindyawService.java

@@ -0,0 +1,21 @@
+package com.gyee.healthmodel.service.auto;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gyee.healthmodel.model.auto.Windturbinewindyaw;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-11
+ */
+public interface IWindturbinewindyawService extends IService<Windturbinewindyaw> {
+
+    List<Windturbinewindyaw> findWindturbinewindyaw(Date beginDate, Date endDate);
+}

+ 30 - 0
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/service/auto/impl/WindturbinewindyawServiceImpl.java

@@ -0,0 +1,30 @@
+package com.gyee.healthmodel.service.auto.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gyee.healthmodel.mapper.auto.WindturbinewindyawMapper;
+import com.gyee.healthmodel.model.auto.Windturbinewindyaw;
+import com.gyee.healthmodel.service.auto.IWindturbinewindyawService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-10-11
+ */
+@Service
+public class WindturbinewindyawServiceImpl extends ServiceImpl<WindturbinewindyawMapper, Windturbinewindyaw> implements IWindturbinewindyawService {
+    @Resource
+    private WindturbinewindyawMapper windturbinewindyawMapper;
+    @Override
+    public List<Windturbinewindyaw> getdfpclwind(Date monthFirst, Date monthLast) {
+        return windturbinewindyawMapper.getdfpclwind(monthFirst,monthLast);
+    }
+}

+ 5 - 1
realtime/healthmodel-server-cph/src/main/java/com/gyee/healthmodel/util/HcEnum.java

@@ -33,7 +33,11 @@ public enum HcEnum {
 	/**
 	 * 大风额定出力
 	 */
-	DFEDCL("HC00007");
+	DFEDCL("HC00007"),
+    /**
+     * 偏航对风偏差
+     */
+    PHDFPC("HC00008");
 	
 	private String name;
 	

+ 14 - 10
realtime/healthmodel-server-cph/src/main/resources/application.yml

@@ -2,7 +2,9 @@
 gyee:
   #实时数据库Url
   #baseurl: http://10.0.118.73:8011/ts
-  baseurl: http://123.60.213.70:8011/ts
+  #baseurl: http://123.60.213.70:8011/ts
+  #baseurl: http://192.168.2.205:8011/ts
+  baseurl: http://192.168.2.198:8011/ts
   #实时数据库选择
   realtimedataBase: mongodb #数据查询模式 golden、hwy
   initialcode: INITIAL
@@ -46,12 +48,12 @@ spring:
         #        username: root
         #        password: 123456
 
-        #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
-        url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
-#        username: gdprod
-#        password: gd123
-        username: nxfdprod
-        password: gdnxfd123
+        url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+        #url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+        username: gdprod
+        password: gd123
+#        username: nxfdprod
+#        password: gdnxfd123
         driver-class-name: oracle.jdbc.driver.OracleDriver
       #备数据源 #关闭
       slave:
@@ -62,11 +64,13 @@ spring:
         #两票数据源
       ticket:
         #url: jdbc:sqlserver://10.0.118.71:1433;DatabaseName=fdeamnew
-        url: jdbc:sqlserver://123.60.213.70:1434;DatabaseName=fdeam
+        #url: jdbc:sqlserver://123.60.213.70:1434;DatabaseName=fdeam
+        url: jdbc:sqlserver://192.168.2.200:1434;DatabaseName=fdeamnew
         username: sa
-#        password: ibs
+        password: ibs
         #password: Gd!123456
-        password: Gyee@321#!
+#        password: Gyee@321#!
+#        password: ibs
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
         #配置初始化连接数大小
       initial-size: 10

+ 1 - 1
realtime/healthmodel-server-cph/src/main/resources/xxl-job-executor.properties

@@ -1,5 +1,5 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://192.168.56.1:8175/xxl-job-admin
+xxl.job.admin.addresses=http://192.168.2.198:8175/xxl-job-admin
 
 ### xxl-job, access token
 xxl.job.accessToken=