修改员工连续月统计

VisualInspection/js/statistics/user_check_statistics.js

@@ -1,5 +1,43 @@
 var year = new Date().getFullYear();
 $(function() {
+    var road_manager;
+    if (roleContains("STATION")) {
+        road_manager = getCurrentUser().road_manager_id;
+    }
+    if (roleContains("ROAD_MANAGER")) {
+        road_manager = getCurrentUser().organid;
+    }
+    setRoadManagerSelect("#center-manager", road_manager, true);
+    if (road_manager) {
+        var dept;
+        if (roleContains("STATION")) {
+            dept = getCurrentUser().organid;
+        }
+        var feeList = cache_road_manager_fee_list_map.get(road_manager);
+        // $("#fsList").html(obj);
+        setRoadManagerValue(feeList, "#fsList", dept, true);
+        // $("#fsList").val(dept);
+        // 初始化查询
+        // initQueryEmp(road_manager, dept);
+    } else {
+        // 初始化查询
+        // initQueryEmp(null, null);
+    }
+    // 道管中心选择变化
+    $("#center-manager").change(function() {
+        $("#fsList").empty();
+        if (GV(this) != '') {
+            getFsStationList(GV(this), function(options) {
+                $("#fsList").append(options);
+                var dept;
+                if (roleContains("STATION")) {
+                    dept = getCurrentUser().organid;
+                }
+                $("#fsList").val(dept);
+            });
+        }
+    })
+
     // 公用方法，根据当前年月动态将13个月push数组
     month_method();
     // 公用方法，月份下拉框
@@ -47,7 +85,10 @@ function getscore(starttime, endtime, limitnumber, limitscore, limitscore2) {
         "end_date": moment(endtime + "-25 23:00:00").valueOf(),
         "limitnumber": limitnumber,
         "limitscore": limitscore,
-        "limitscore2": limitscore2
+        "limitscore2": limitscore2,
+        "cmanager": $("#center-manager").val(),
+        "dept": $("#fsList").val(),
+        "sctype": $("#score_select").val()
     };
 
     //获取该人员排班

VisualInspection/view/statistics/user_check_statistics.html

@@ -48,6 +48,15 @@
         border-color: #d9d9d9;
     }
     
+    input::-webkit-input-placeholder {
+        /* placeholder颜色  */
+        color: #aab2bd;
+        /* placeholder字体大小  */
+        font-size: 10px;
+        /* placeholder位置  */
+        text-align: right;
+    }
+    
     .div-score {
         float: left;
         padding-top: 6px;
@@ -59,31 +68,60 @@
 </style>
 
 <div class="container-fluid ">
-    <div class="row">
-        <label class="col-sm-1" style="line-height:30px;width:80px">开始月</label>
-        <div class="div-month col-sm-1">
-            <input id="month_date_from" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
-        </div>
-        <label class="col-sm-1" style="line-height:30px;width:80px">结束月</label>
-        <div class="div-month col-sm-1">
-            <input id="month_date_to" class="form-control form-date " type="text " placeholder="请选择 " style="height:30px; ">
-        </div>
+    <div class="row" style="position: relative;">
 
-        <label class="col-sm-1" style="line-height:30px;width:80px">连续月数</label>
-        <div class="div-month col-sm-2">
-            <input id="month_number" type="number" placeholder="请输入0以上的整数" style="height:30px;padding:5px " value="3" />
+        <div class="row">
+            <label class="col-sm-1" style="line-height:30px;width:80px">道管中心</label>
+            <div class="col-sm-2">
+                <select class="form-control" id="center-manager">
+                    <!--<option selected value="">全部</option>
+                    <option  value="30">连云港</option>
+                    <option value="31">盐城</option>
+                    <option value="32">南通</option>-->
+                </select>
+            </div>
+
+            <label class="col-sm-1" style="line-height:30px;width:80px">部门</label>
+            <div class="col-sm-2">
+                <select class="form-control" id="fsList">
+                </select>
+            </div>
+
+            <label class="col-sm-1" style="line-height:30px;width:80px">开始月</label>
+            <div class="div-month col-sm-1">
+                <input id="month_date_from" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+            </div>
+            <label class="col-sm-1" style="line-height:30px;width:80px">结束月</label>
+            <div class="div-month col-sm-1">
+                <input id="month_date_to" class="form-control form-date " type="text " placeholder="请选择 " style="height:30px; ">
+            </div>
         </div>
-        <div class="form-group col-sm-3">
-            <label for="exampleInputAccount1" class="col-sm-4" style="line-height:30px;width:80px">得分区间</label>
-            <div class="col-sm-3">
-                <input type="text" id="start-score" class="form-control form-date" value="985">
+        <div class="row" style="margin-top: 10px;">
+            <!-- <label class="col-sm-1" style="line-height:30px;width:80px">连续月数</label> -->
+            <div class="div-month col-sm-2">
+                <label class="col-sm-1" style="line-height:30px;width:80px;padding: 0">连续月数</label>
+                <input id="month_number" style="width:90px;height:30px" type="number" placeholder="请输入0以上的整数" style="height:30px;padding:5px " value="3" />
             </div>
-            <div class="to-score col-sm-2" style="padding-top: 6px;text-align:center;width:10px"><label> - </label></div>
-            <div class="col-sm-3">
-                <input type="text" id="end-score" class="form-control form-date" value="1000">
+
+            <label class="col-sm-1" style="line-height:30px;width:80px">得分类型</label>
+            <div class="div-month col-sm-1">
+                <select class="form-control score-select" id="score_select">
+            <option value="2">综合得分</option><option value="1" selected>温馨服务</option>
+          </select>
+            </div>
+
+            <div class="form-group col-sm-3">
+                <label for="exampleInputAccount1" class="col-sm-4" style="line-height:30px;width:80px">得分区间</label>
+                <div class="col-sm-3">
+                    <input type="text" id="start-score" class="form-control form-date" value="985">
+                </div>
+                <div class="to-score col-sm-2" style="padding-top: 6px;text-align:center;width:10px"><label> - </label></div>
+                <div class="col-sm-3">
+                    <input type="text" id="end-score" class="form-control form-date" value="1000">
+                </div>
             </div>
         </div>
-        <div class="col-sm-2 "><button class="btn btn-info2 col-sm-6 query-company " id="searchbtn">查询</button></div>
+        <div class="col-sm-2 " style="right: 0;position: absolute;top:0;"><button class="btn btn-info2 col-sm-6 query-company " style="float:right;margin-right: 25px;" id="searchbtn">查询</button></div>
     </div>
 
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/StatisticsBean.java

@@ -167,15 +167,30 @@ public class StatisticsBean {
     private Integer company_ranking2;
     // 道管排名
     private Integer fee_station_ranking2;
-    
+
+    //特情
     private Integer check_t_num = 0;
     
     private Integer check_t_score = 0;
-    
+
+    //公司
+    private Integer check_g_num = 0;
+
+    private Integer check_g_score = 0;
+
+   //暗访
+    private Integer check_a_num = 0;
+
+    private Integer check_a_score = 0;
+
+
+    //现场
     private Integer check_x_num = 0;
     
     private Integer check_x_score = 0;
-    
+
+
+    //数据平台
     private Integer check_s_num = 0;
     
     private Integer check_s_score = 0;

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/StatisticsBo.java

@@ -43,16 +43,33 @@ public class StatisticsBo {
     
     private int score = 0;
     
+
+
+    //特情
     private Integer check_t_num = 0;
-    
+
     private Integer check_t_score = 0;
-    
+
+    //公司
+    private Integer check_g_num = 0;
+
+    private Integer check_g_score = 0;
+
+    //暗访
+    private Integer check_a_num = 0;
+
+    private Integer check_a_score = 0;
+
+
+    //现场
     private Integer check_x_num = 0;
-    
+
     private Integer check_x_score = 0;
-    
+
+
+    //数据平台
     private Integer check_s_num = 0;
-    
+
     private Integer check_s_score = 0;
     
     private Integer check_all_num = 0;

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/UserStatistic.java

@@ -11,12 +11,22 @@ public class UserStatistic {
     private Long id;
     private Integer user_id;
     private Integer period_id;
-    private Integer user_score;
+
     private Double user_total_score;
+
+    private Double user_other_a_check_score;
+    private Integer user_other_a_check_num;
+    private Double user_other_s_check_score;
+    private Integer user_other_s_check_num;
+    private Double user_other_t_check_score;
+    private Integer user_other_t_check_num;
+    private Double user_other_x_check_score;
+    private Integer user_other_x_check_num;
+    private Double user_score;
     private Integer user_check_num;
-    private Integer user_ranking_c;
-    private Integer user_ranking_d;
-    private Integer user_ranking_s;
+//    private Integer user_ranking_c;
+//    private Integer user_ranking_d;
+//    private Integer user_ranking_s;
     private Integer dept_id;
     private Integer startperiod_id;
     private Integer endperiod_id;
@@ -27,10 +37,14 @@ public class UserStatistic {
     private Integer limitnumber;
     private String p_str;
 
+    private String dept;
+    private String cmanager;
+
     private Integer count;
+    private Integer sctype;
 
-    public void setUserTotalScore(){
-        this.user_total_score = 1000 - user_total_score/(user_check_num*1.00);
-    }
+//    public void setUserTotalScore(){
+//        this.user_total_score = 1000 - user_total_score/(user_check_num*1.00);
+//    }
 
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/CheckUserStatisticsMapper.xml

@@ -17,13 +17,13 @@
     </resultMap>
 
 
-    <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+    <select id="getOne" parameterType="java.lang.Long" resultType="com.xintong.visualinspection.bean.UserStatistic" >
         SELECT *
         FROM check_statistics
         WHERE id = #{id}
     </select>
     
-    <select id="getByUser" parameterType="com.xintong.visualinspection.bean.UserStatistic" resultMap="BaseResultMap" >
+    <select id="getByUser" parameterType="com.xintong.visualinspection.bean.UserStatistic" resultType="com.xintong.visualinspection.bean.UserStatistic" >
         SELECT *
         FROM check_statistics
         WHERE user_id = #{user_id} and period_id = #{period_id}
@@ -63,27 +63,47 @@
         SET
         <if test="user_score != null">user_score = #{user_score},</if>
         <if test="user_check_num != null">user_check_num = #{user_check_num},</if>
-        <if test="user_ranking_c != null">user_ranking_c = #{user_ranking_c},</if>
-        <if test="user_ranking_d != null">user_ranking_d = #{user_ranking_d},</if>
-        <if test="user_ranking_s != null">user_ranking_s = #{user_ranking_s},</if>
+        <if test="user_total_score != null">user_total_score = #{user_total_score},</if>
+        <if test="user_other_a_check_score != null">user_other_a_check_score = #{user_other_a_check_score},</if>
+        <if test="user_other_a_check_num != null">user_other_a_check_num = #{user_other_a_check_num},</if>
+        <if test="user_other_s_check_score != null">user_other_s_check_score = #{user_other_s_check_score},</if>
+        <if test="user_other_s_check_num != null">user_other_s_check_num = #{user_other_s_check_num},</if>
+        <if test="user_other_t_check_score != null">user_other_t_check_score = #{user_other_t_check_score},</if>
+        <if test="user_other_t_check_num != null">user_other_t_check_num = #{user_other_t_check_num},</if>
+        <if test="user_other_x_check_score != null">user_other_x_check_score = #{user_other_x_check_score},</if>
+        <if test="user_other_x_check_num != null">user_other_x_check_num = #{user_other_x_check_num},</if>
         <if test="dept_id != null">dept_id = #{dept_id}</if>
         WHERE
         user_id = #{user_id} and period_id = #{period_id}
     </sql>
+
     <sql id="insertc">
          INSERT INTO
         check_statistics
-        (user_id,period_id,user_score,user_check_num,user_ranking_c,user_ranking_d,user_ranking_s,dept_id)
+        (user_id,period_id,user_score,user_check_num,user_total_score,user_other_a_check_score,user_other_a_check_num,user_other_s_check_score,user_other_s_check_num,user_other_t_check_score,user_other_t_check_num,user_other_x_check_score,user_other_x_check_num,dept_id)
         VALUES
-        (#{user_id}, #{period_id},#{user_score},#{user_check_num},#{user_ranking_c},#{user_ranking_d},#{user_ranking_s},#{dept_id})
+        (#{user_id}, #{period_id},#{user_score},#{user_check_num},#{user_total_score},#{user_other_a_check_score},#{user_other_a_check_num},#{user_other_s_check_score},#{user_other_s_check_num},#{user_other_t_check_score},#{user_other_t_check_num},#{user_other_x_check_score},#{user_other_x_check_num},#{dept_id})
     </sql>
 
 
-    <select id="selectlimituser"   parameterType="com.xintong.visualinspection.bean.UserStatistic" resultMap="BaseResultMap">
-
+    <select id="selectlimituser"   parameterType="com.xintong.visualinspection.bean.UserStatistic" resultType="com.xintong.visualinspection.bean.UserStatistic">
         select c.* from (
+        <choose>
+            <when test="sctype != null &amp;&amp; sctype != '' &amp;&amp; sctype == 2 ">
+                <include refid="selectc"/>
+            </when>
+            <otherwise>
+                <include refid="selectcwxfw"/>
+            </otherwise>
+        </choose>
+        ) c where c.user_id in ( select d.user_id from  (select p.user_id,count(user_id) as count from (  <choose>
+        <when test="sctype != null &amp;&amp; sctype != '' &amp;&amp; sctype == 2 ">
             <include refid="selectc"/>
-        ) c where c.user_id in ( select d.user_id from  (select p.user_id,count(user_id) as count from (<include refid="selectc"/>) p GROUP BY p.user_id ) d where d.count >=#{limitnumber} )
+        </when>
+        <otherwise>
+            <include refid="selectcwxfw"/>
+        </otherwise>
+    </choose>) p GROUP BY p.user_id ) d where d.count >=#{limitnumber} )
 
     </select>
 
@@ -93,10 +113,32 @@
         FROM
         (
         SELECT
-        a.*,
+        a.*
+        FROM
+        (
+        SELECT
+        *
+        FROM
+        check_statistics
+        WHERE
+        period_id >= #{startperiod_id}
+        AND period_id &lt;= #{endperiod_id} AND user_check_num > 0
+        ) a
+        ) b
+        WHERE
+        b.user_total_score >=#{limitscore} and  b.user_total_score &lt;= #{limitscore2} and b.user_check_num>=6
+        GROUP BY user_id ,period_id
+    </sql>
+
+
+    <sql id="selectcwxfw">
+      SELECT
+        b.*
+        FROM
         (
-        1000- a.user_score / ( a.user_check_num * 1.00 )
-        ) AS user_total_score
+        SELECT
+        a.*,
+        (1000- a.user_score / ( a.user_check_num * 1.00 )) AS user_total_score1
         FROM
         (
         SELECT
@@ -109,7 +151,7 @@
         ) a
         ) b
         WHERE
-        b.user_total_score >=#{limitscore} and  b.user_total_score &lt;= #{limitscore2}
+        b.user_total_score1 >=#{limitscore} and  b.user_total_score1 &lt;= #{limitscore2} and b.user_check_num>=6
         GROUP BY user_id ,period_id
     </sql>
 

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -78,7 +78,7 @@
             resultType="com.xintong.visualinspection.bean.StatisticsBean">
         SELECT y.user_id,y.dept_id,IFNULL(x.checked_num,0)+IFNULL(o1.check_a_num,0)
         checked_num,IFNULL(x.score,0)+IFNULL(o1.check_a_score,0)
-        score,o2.check_t_num,o2.check_t_score,o3.check_x_num,o3.check_x_score,o4.check_s_num,o4.check_s_score
+        score,x.checked_num AS check_g_num,o1.check_a_num AS check_a_num,x.score AS check_g_score,o1.check_a_score AS check_a_score,o2.check_t_num,o2.check_t_score,o3.check_x_num,o3.check_x_score,o4.check_s_num,o4.check_s_score
         ,IFNULL(x.checked_num,0)+IFNULL(o1.check_a_num,0)+IFNULL(o2.check_t_num,0)+IFNULL(o3.check_x_num,0)+IFNULL(o4.check_s_num,0)
         check_all_num
         ,IFNULL(x.score,0)+IFNULL(o1.check_a_score,0)+IFNULL(o2.check_t_score,0)+IFNULL(o3.check_x_score,0)+IFNULL(o4.check_s_score,0)

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/ThreadTaskService.java

@@ -45,11 +45,23 @@ public class ThreadTaskService {
                 ) {
             UserStatistic ss =new UserStatistic();
             ss.setUser_id(s.getUser().getId());
-            ss.setUser_score(s.getCheck_all_score());
+//            ss.setUser_score(s.getCheck_all_score());
             ss.setUser_check_num(s.getChecked_num());
-            ss.setUser_ranking_c(s.getCompany_ranking());
-            ss.setUser_ranking_d(s.getCenter_ranking());
-            ss.setUser_ranking_s(s.getFee_station_ranking());
+            ss.setUser_other_a_check_num(s.getCheck_a_num());
+            ss.setUser_other_a_check_score((double)s.getCheck_a_score());
+            ss.setUser_other_x_check_num(s.getCheck_x_num());
+            ss.setUser_other_x_check_score((double)s.getCheck_x_score());
+            ss.setUser_other_t_check_num(s.getCheck_t_num());
+            ss.setUser_other_t_check_score((double)s.getCheck_t_score());
+            ss.setUser_other_s_check_num(s.getCheck_s_num());
+            ss.setUser_other_s_check_score((double)s.getCheck_s_score());
+            ss.setUser_check_num(s.getCheck_g_num());
+            ss.setUser_score((double)s.getCheck_g_score());
+            if(s.getCheck_score_avg()!=null && !s.getCheck_score_avg().equals("")){
+            ss.setUser_total_score(1000.0-Double.parseDouble(s.getCheck_score_avg()));}
+//            ss.setUser_ranking_c(s.getCompany_ranking());
+//            ss.setUser_ranking_d(s.getCenter_ranking());
+//            ss.setUser_ranking_s(s.getFee_station_ranking());
             ss.setDept_id(s.getUser().getOrganid());
             ss.setPeriod_id(period.getId());
             checkUserStatisticsDao.saveandupdate(ss);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckOtherServiceImpl.java

@@ -191,19 +191,27 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
 
                 for (CheckOther c :checkOthers){
                     if((c.getDept_id()+"").equals(station.getDeptid())){
-                        if(c.getSpecial_check_type()!=null && c.getSpecial_check_type().intValue()==1){
-                            Integer i = s1.get(c.getPcheckname());
-                            if(i==null){i=0;}
-                            s1.put(c.getPcheckname(), Integer.valueOf((int) (i+c.getCheck_score())));
-                            totalcheck+=1;
-                            totalscore+=c.getCheck_score();
-                        }
-                        if(c.getSpecial_check_type()!=null && c.getSpecial_check_type().intValue()==2){
-                            Integer i = s2.get(c.getPcheckname());
-                            if(i==null){i=0;}
-                            s2.put(c.getPcheckname(), Integer.valueOf((int) (i+c.getCheck_score())));
-                            totalcheck+=1;
-                            totalscore+=c.getCheck_score();
+
+                        if(c.getUsername() == null || "".equals(c.getUsername())) {
+
+                            if (c.getSpecial_check_type() != null && c.getSpecial_check_type().intValue() == 1) {
+                                Integer i = s1.get(c.getPcheckname());
+                                if (i == null) {
+                                    i = 0;
+                                }
+                                s1.put(c.getPcheckname(), Integer.valueOf((int) (i + c.getCheck_score())));
+                                totalcheck += 1;
+                                totalscore += c.getCheck_score();
+                            }
+                            if (c.getSpecial_check_type() != null && c.getSpecial_check_type().intValue() == 2) {
+                                Integer i = s2.get(c.getPcheckname());
+                                if (i == null) {
+                                    i = 0;
+                                }
+                                s2.put(c.getPcheckname(), Integer.valueOf((int) (i + c.getCheck_score())));
+                                totalcheck += 1;
+                                totalscore += c.getCheck_score();
+                            }
                         }
                     }
                 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -332,7 +332,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			}
 		}
 		//更新数据库统计
-       threadTaskService.saveUserStatic(reList,obj.getStart_date().getTime(),obj.getEnd_date().getTime());
+//       threadTaskService.saveUserStatic(reList,obj.getStart_date().getTime(),obj.getEnd_date().getTime());
 
 		return reList;
 	}
@@ -2208,6 +2208,10 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 				tmp.setCheck_x_score(statisticsBean.getCheck_x_score());
 				tmp.setCheck_s_num(statisticsBean.getCheck_s_num());
 				tmp.setCheck_s_score(statisticsBean.getCheck_s_score());
+				tmp.setCheck_a_num(statisticsBean.getCheck_a_num());
+				tmp.setCheck_a_score(statisticsBean.getCheck_a_score());
+				tmp.setCheck_g_num(statisticsBean.getCheck_g_num());
+				tmp.setCheck_g_score(statisticsBean.getCheck_g_score());
 				tmp.setCheck_all_num(statisticsBean.getCheck_all_num());
 				tmp.setCheck_all_score(statisticsBean.getCheck_all_score());
 			}
@@ -2250,6 +2254,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 				}
 			}
 		}
+        //更新数据库统计
+        threadTaskService.saveUserStatic(reList,obj.getStart_date().getTime(),obj.getEnd_date().getTime());
 
 		return reList;
 	}
@@ -2462,6 +2468,16 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 	    //
         List<CheckTaskPeriod> checkTaskPeriods = checkTaskPeriodDao.select(new CheckTaskPeriod());
 
+//        //温馨服务
+//        if(obj.getSctype().intValue() == 1){
+//
+//
+//        }
+//        //综合得分
+//        if(obj.getSctype().intValue() == 2){
+//             //获取综合得分
+//        }
+
         for (CheckTaskPeriod p : checkTaskPeriods) {
             if (obj.getStart_date() + 1 * 1000 * 60 * 60 == p.getEndtime().getTime()) {
                 obj.setStartperiod_id(p.getId());
@@ -2569,8 +2585,34 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
                 return 0;
             }
         });
+        List<Integer> deptids = new ArrayList<>();
+
+        //去除非部门的
+        if(obj.getDept()!=null && !obj.getDept().equals("")){
+            deptids.add(Integer.parseInt(obj.getDept()));
+        }else{
+            if(obj.getCmanager()!=null && !obj.getCmanager().equals("")){
+               for (Organ o : CacheUtil.deptMap.values()){
+                   if(o.getParentid().intValue() == Integer.parseInt(obj.getCmanager())){
+                       deptids.add(o.getId());
+                   }
+               }
+            }
+        }
+        List<StatisiticPojo> p = new ArrayList<>();
+        if(deptids.size()>0){
+            for(StatisiticPojo s : user_ids){
+                if(deptids.contains(s.getUser().getOrganid().intValue())){
+                    p.add(s);
+                }
+            }
+        }else{
+            p = user_ids;
+        }
+
+
 
-        return user_ids;
+        return p;
     }
 
 	@Override

VisualInspection_server/src/main/resources/application.properties

@@ -2,9 +2,9 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -12,9 +12,9 @@ master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
-cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://git.topm.win:9003/visualinspection?useUnicode=true&characterEncoding=utf8
-#cluster.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
+cluster.datasource.url = jdbc:mysql://xt.wenhq.top:8082/visualinspection?useUnicode=true&characterEncoding=utf-8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -56,9 +56,9 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
 spring.redis.database=0  
 # Redis\u670D\u52A1\u5668\u5730\u5740
-spring.redis.host=10.112.0.199
+#spring.redis.host=10.112.0.199
 #spring.redis.host=xt.wenhq.top
-#spring.redis.host=127.0.0.1
+spring.redis.host=192.168.45.158
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 spring.redis.port=6379
 
@@ -125,8 +125,8 @@ dubbo.scan.basePackages  = com.xintong.visualinspection.service
 ## ApplicationConfig Bean
 dubbo.application.id = jicha_base-provider
 dubbo.application.name = jicha_base-provider
-dubbo.reference.check=false
-dubbo.consumer.check=false
+dubbo.reference.check = false
+dubbo.consumer.check = false
 
 # ProtocolConfig Bean
 dubbo.protocol.id = dubbo
@@ -136,7 +136,7 @@ dubbo.protocol.status = server
 
 ## RegistryConfig Bean
 dubbo.registry.id = demoservice
-dubbo.registry.address = zookeeper://100.0.0.3:2181
+dubbo.registry.address = zookeeper://127.0.0.1:2181
 #dubbo.registry.address = zookeeper://192.168.45.158:2181
 dubbo.registry.file = ./output/dubbo.cache