Merge remote-tracking branch 'origin/master'

shuili-admin/src/main/resources/config/application-dev.yml

@@ -79,14 +79,14 @@ spring:
   redis:
     # 地址
     host: 127.0.0.1
-#    database: 2
+    database: 2
 #    cluster:
 #     nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006
 #     max-redirects: 3
     # 端口，默认为6379
     port: 6379
     # 密码
-    password:
+    password: 12345
     # 连接超时时间
     timeout: 10s
     lettuce:

shuili-admin/src/main/resources/config/application-druid-dev.yml

@@ -6,9 +6,12 @@ spring:
         druid:
             # 主库数据源
             master:
-            url: jdbc:mysql://19.15.225.193:15016/ygc_slgcyxgl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
-            username: zhsl_ygc_sgcyxgl
-            password: J[@D|&.<:_G+)sp2
+            #   url: jdbc:mysql://19.15.225.193:15016/ygc_slgcyxgl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
+            #   username: zhsl_ygc_sgcyxgl
+            #   password: J[@D|&.<:_G+)sp2
+            url: jdbc:mysql://47.93.254.187:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
+            username: shuili
+            password: wuxukgdvJ1!@!
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

shuili-admin/src/main/resources/config/application.yml

@@ -1,3 +1,4 @@
 spring:
    profiles:
-     include: dev,druid-dev
+#     include: dev,druid-dev
+#

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzAqjcController.java

@@ -48,7 +48,8 @@ public class BsSgcSzAqjcController extends BaseController
     @ApiOperation("水闸安全检测列表")
     public IPage list(@RequestBody SearchParam<BsSgcSzAqjc> sp)
     {
-        return bsSgcSzAqjcService.selectPage(sp);
+        IPage page = bsSgcSzAqjcService.selectPage(sp);
+        return page;
     }
 
     /**

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

@@ -12,8 +12,7 @@
                hz_status, zx_status, reason, MNUN, NOTE, EFF_DATE, EXPR_DATE, WAGA_CEN_LONG, WAGA_CEN_LAT, IF_CEB, IF_HYJ, IF_GSE, IF_SGE, FREQIN, CHECK_DATE, WAGA_OV, UPDATE_DATE,
                 sf.id, name, unit, duties, phone, person_responsible_type, competent_department, competent_department_duties, effective_date, pro_code, pro_no, type, safety_type, person_type,
                 sf.create_time
-        from bs_sgc_sz_fzr sf
-                 left join att_waga_base sj on sf.waga_code = sj.waga_code
+        from bs_sgc_sz_fzr sf ,att_waga_base sj where  sf.waga_code = sj.waga_code
     </sql>
 
 
@@ -69,7 +68,7 @@
     <select id="getList" resultMap="BsSgcSzFzr">
         <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         <include refid="info"></include>
-        <where>
+
             <if test="wageName!=null and wageName!=''">
                 and sj.WAGA_NAME LIKE concat('%',#{wageName},'%')
             </if>
@@ -79,7 +78,7 @@
             <if test="adcd != null and adcd != ''">
                 and sj.adcd like concat(#{adcd},'%')
             </if>
-        </where>
+
         order by ${orderBy} desc LIMIT #{pageNum},#{pageSize};
     </select>