pipIrr-SV.git - Gitblit

parent: c5cc260d | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2024-07-26 08947136f642fe6964f64d5972436495f234e9e1

Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

6个文件已修改

	pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWork.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoWork.java

@@ -84,7 +84,7 @@
    /**
     * 电表累计电量(单位0.01度)
     */
    private Double ele_total;
    private Double eleTotal;

    /**
     * 用户剩余金额(单位0.01元)

 pipIrr-platform/pipIrr-global/src/main/resources/application-database-pj.yml

@@ -5,9 +5,9 @@
            #name: pj
            type: com.alibaba.druid.pool.DruidDataSource
            driverClassName: com.mysql.cj.jdbc.Driver
            url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://127.0.0.1:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.140.179.55:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://8.140.179.55:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            username: root
            password: dysql,;.abc!@#
            druid:

 pipIrr-platform/pipIrr-global/src/main/resources/application-database-sp.yml

@@ -5,9 +5,9 @@
      #name: sp
      type: com.alibaba.druid.pool.DruidDataSource
      driverClassName: com.mysql.cj.jdbc.Driver
      url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#      url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#      url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#      url: jdbc:mysql://8.140.179.55:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
      url: jdbc:mysql://8.140.179.55:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
      username: root
      password: dysql,;.abc!@#
      druid:

 pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml

@@ -5,9 +5,9 @@
            #name: ym
            type: com.alibaba.druid.pool.DruidDataSource
            driverClassName: com.mysql.cj.jdbc.Driver
            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            username: root
            password: dysql,;.abc!@#
            druid:

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportHistoryMapper.xml

@@ -470,7 +470,7 @@
      wo.water_press AS waterPress,
      wo.water_instant AS waterInstant,
      wo.water_total AS waterTotal,
      wo.ele_total AS ele_total,
      wo.ele_total AS eleTotal,
      wo.money_remain AS moneyRemain,
      wo.water_remain AS waterRemain,
      wo.this_ele AS thisEle,

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmWorkReportLastMapper.xml

@@ -477,7 +477,7 @@
      wo.water_press AS waterPress,
      wo.water_instant AS waterInstant,
      wo.water_total AS waterTotal,
      wo.ele_total AS ele_total,
      wo.ele_total AS eleTotal,
      wo.money_remain AS moneyRemain,
      wo.water_remain AS waterRemain,
      wo.this_ele AS thisEle,

			@@ -84,7 +84,7 @@
			/**
			* 电表累计电量(单位0.01度)
			*/
			private Double ele_total;
			private Double eleTotal;

			/**
			* 用户剩余金额(单位0.01元)

			@@ -5,9 +5,9 @@
			#name: pj
			type: com.alibaba.druid.pool.DruidDataSource
			driverClassName: com.mysql.cj.jdbc.Driver
			url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://192.168.40.166:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://127.0.0.1:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://8.140.179.55:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			url: jdbc:mysql://8.140.179.55:3306/pipIrr_pj?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			username: root
			password: dysql,;.abc!@#
			druid:

			@@ -5,9 +5,9 @@
			#name: sp
			type: com.alibaba.druid.pool.DruidDataSource
			driverClassName: com.mysql.cj.jdbc.Driver
			url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://192.168.40.166:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://127.0.0.1:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://8.140.179.55:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			url: jdbc:mysql://8.140.179.55:3306/pipIrr_sp?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			username: root
			password: dysql,;.abc!@#
			druid:

			@@ -5,9 +5,9 @@
			#name: ym
			type: com.alibaba.druid.pool.DruidDataSource
			driverClassName: com.mysql.cj.jdbc.Driver
			url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			# url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
			username: root
			password: dysql,;.abc!@#
			druid:

			@@ -470,7 +470,7 @@
			wo.water_press AS waterPress,
			wo.water_instant AS waterInstant,
			wo.water_total AS waterTotal,
			wo.ele_total AS ele_total,
			wo.ele_total AS eleTotal,
			wo.money_remain AS moneyRemain,
			wo.water_remain AS waterRemain,
			wo.this_ele AS thisEle,

			@@ -477,7 +477,7 @@
			wo.water_press AS waterPress,
			wo.water_instant AS waterInstant,
			wo.water_total AS waterTotal,
			wo.ele_total AS ele_total,
			wo.ele_total AS eleTotal,
			wo.money_remain AS moneyRemain,
			wo.water_remain AS waterRemain,
			wo.this_ele AS thisEle,