Merge branch 'master' of http://60.205.104.179:3000/yinyujing/zhihuishuiwuDataSyn

TimedUpload/QuartzJobs/jingshanDataUploadDataJob.cs

@@ -206,6 +206,9 @@ namespace TimedUpload.QuartzJobs
                         if(isValve == 2) { // 控阀控泵的情况
                             sqlMeterHis += ",[运行模式],[阀1开到位延时],[阀2开到位延时],[阀3开到位延时],[真空泵开启时间],[排气间隔],[控制方式],[真空泵故障],[阀1状态],[阀2状态],[阀3状态]";
                         }
+                        if (isValve == 3) {
+                            sqlMeterHis += ",阀门状态";
+                        }
                         sqlMeterHis +=" from " + tablename;
                         if (uploadHis.ContainsKey(meterCode)) // 添加是否在线的判断
                         {
@@ -318,7 +321,7 @@ namespace TimedUpload.QuartzJobs
                                     {
                                         if (Convert.DBNull != drMeterHis["阀门状态"])
                                         {
-                                            message.Append("\"valveOneState\": \"").Append(Convert.ToDecimal(drMeterHis["阀门状态"])).Append("\",");
+                                            message.Append("\"valveOneState\": \"").Append(drMeterHis["阀门状态"]).Append("\",");
                                         }
                                     }
                                     if (Convert.DBNull != drMeterHis["净累计流量"])

TimedUpload/TimedUpload.csproj

@@ -21,9 +21,10 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -45,6 +46,18 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>C2F5AB8559D83F69FFEF22B039CDDCBB874FCB26</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>TimedUpload_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
       <HintPath>..\packages\Common.Logging.3.3.1\lib\net40\Common.Logging.dll</HintPath>
@@ -132,6 +145,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </None>
+    <None Include="TimedUpload_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="quartz_jobs.xml">

TimedUpload/app.config

@@ -14,7 +14,7 @@
     <add key="UploadPassword" value="wwkj123!" />
     <!-- 智慧水务系统RabbitMQ信息 end -->
     <add key="ManufacturerCode" value="1" />
-    <add key="MeterId" value="66" />
+    <add key="MeterId" value="636" />
     <!-- 二供数据是否推送到分区记录 1：是；0：否-->
     <add key="SecondaryToDMA" value="1" />
     <!-- 二供设备已同步到分区计量的设备编码 -->