恢复日期格式修改

VB_DSM_V2.1/Scripts/Cmds/7081_passport.run.xml

@@ -5,7 +5,6 @@
       <option name="myRunnerSettings" />
       <option name="myRunnerParameters">
         <MavenRunnerParameters>
-          <option name="cmdOptions" />
           <option name="profiles">
             <set />
           </option>
@@ -20,9 +19,6 @@
               <entry key="local" value="true" />
             </map>
           </option>
-          <option name="projectsCmdOptionValues">
-            <list />
-          </option>
           <option name="resolveToWorkspace" value="false" />
           <option name="workingDirPath" value="$PROJECT_DIR$/vbdsm-web/vbdsm-passport" />
         </MavenRunnerParameters>

VB_DSM_V2.1/Scripts/Cmds/7082_manage.run.xml

@@ -5,7 +5,6 @@
       <option name="myRunnerSettings" />
       <option name="myRunnerParameters">
         <MavenRunnerParameters>
-          <option name="cmdOptions" />
           <option name="profiles">
             <set />
           </option>
@@ -20,9 +19,6 @@
               <entry key="local" value="true" />
             </map>
           </option>
-          <option name="projectsCmdOptionValues">
-            <list />
-          </option>
           <option name="resolveToWorkspace" value="false" />
           <option name="workingDirPath" value="$PROJECT_DIR$/vbdsm-web/vbdsm-manage" />
         </MavenRunnerParameters>

VB_DSM_V2.1/Scripts/Cmds/7083_power-service.run.xml

@@ -5,7 +5,6 @@
       <option name="myRunnerSettings" />
       <option name="myRunnerParameters">
         <MavenRunnerParameters>
-          <option name="cmdOptions" />
           <option name="profiles">
             <set />
           </option>
@@ -20,9 +19,6 @@
               <entry key="local" value="true" />
             </map>
           </option>
-          <option name="projectsCmdOptionValues">
-            <list />
-          </option>
           <option name="resolveToWorkspace" value="false" />
           <option name="workingDirPath" value="$PROJECT_DIR$/vbdsm-web/vbdsm-powerservice" />
         </MavenRunnerParameters>

VB_DSM_V2.1/Scripts/Cmds/7084_gov.run.xml

@@ -5,7 +5,6 @@
       <option name="myRunnerSettings" />
       <option name="myRunnerParameters">
         <MavenRunnerParameters>
-          <option name="cmdOptions" />
           <option name="profiles">
             <set />
           </option>
@@ -20,9 +19,6 @@
               <entry key="local" value="true" />
             </map>
           </option>
-          <option name="projectsCmdOptionValues">
-            <list />
-          </option>
           <option name="resolveToWorkspace" value="false" />
           <option name="workingDirPath" value="$PROJECT_DIR$/vbdsm-web/vbdsm-gov" />
         </MavenRunnerParameters>

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/java/cn/vbdsm/hj212/modbus/ws/MockUploadTcpService.java

@@ -71,7 +71,8 @@ public class MockUploadTcpService {
             setEngine(power,td);
             try {
                 String nowStr = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
-                long now = Long.parseLong(nowStr);
+                //long now = Long.parseLong(nowStr);
+                long now = Long.parseLong("20240801123030");
                 now = now - (now - (now / 10000) * 10000) % 500;
                 uploadData(client,td,power,now);
                 Thread.sleep(500);

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-modbus/src/main/resources/application.yml

@@ -9,7 +9,7 @@ vbdsm:
             bossThreadNum: 1 #netty boss线程数 默认为1
             workThreadNum: 4 #netty work线程数，默认为4
         client:
-            port: 17777
+            port: 7777
             bindIp: 127.0.0.1
     ws:
         #url: http://192.168.0.104:7100/services/UploadData?wsdl;http://192.168.0.104:7100/services/UploadData?wsdl

VB_DSM_V2.1/vbdsm-data-upload/vbdsm-hj212/vbdsm-hj212-server/src/main/java/cn/vbdsm/hj212/server/executor/ReaTimeExector.java

@@ -52,7 +52,13 @@ public class ReaTimeExector implements IExecutor {
         }
         //校正时间 5分钟间隔
         time = time - (time - (time / 10000) * 10000) % 500;
-
+        if(time>20240601123030L){
+            log.info("非法日期");
+            RpcRemoterStruct response = new RpcRemoterStruct(st, msg.getCn(), msg.getDataTime(), "03");
+            request.getCtx().channel().writeAndFlush(response);
+            log.debug(response.toString());
+            return;
+        }
 
         DataUploadRequest dataUpload = DataUploadRequest.parse(cp);
         Boolean flag = false;
@@ -200,6 +206,7 @@ public class ReaTimeExector implements IExecutor {
                     analEnergy.setHour(Integer.valueOf(body.getHour()));
                     onlineTerminal.setAnalData(analEnergy);
                 }
+
                 dataBiz.insertOnlineData(onlineTerminal);
             } else {
                 flag = true;

VB_DSM_V2.1/vbdsm-web/vbdsm-gov-new/src/main/java/cn/vbdsm/config/DatabaseConfig.java

@@ -20,7 +20,7 @@ public class DatabaseConfig
 	@Bean
 	public DataSource datasource() throws Exception
 	{
-		InputStream fileInputStream = Thread.currentThread().getContextClassLoader ().getResourceAsStream(shardingFilePath);
+		InputStream fileInputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(shardingFilePath);
 		byte[] content = new byte[fileInputStream.available()];
 		fileInputStream.read(content);
 		fileInputStream.close();

VB_DSM_V2.1/vbdsm-web/vbdsm-powerservice/src/main/java/cn/vbdsm/powerservice/service/online/impl/OnlineDataPowerService.java

@@ -331,7 +331,8 @@ public class OnlineDataPowerService extends BaseService<OnlineDataPower> impleme
     private List<OnlineDataPower> buildMonitorOnlineDataByMonitor(String local, Monitor monitor, String dateString) {
         List<OnlineDataPower> list = new ArrayList<OnlineDataPower>();
         if (monitor != null) {
-            dateString = dateString.substring(0, 4) + "-" + dateString.substring(4, 6) + "-" + dateString.substring(6, 8);
+            //去掉-,否则会报错，之前未出现过,现在前端传参格式就是yyyy-MM-dd,无需处理
+            //dateString = dateString.substring(0, 4) + "-" + dateString.substring(4, 6) + "-" + dateString.substring(6, 8);
             long startTime = DateUtil.str2MonitorDate(dateString, dateString.length());
             long endTime = DateUtil.str2MonitorDate(dateString, 1, 10);
             if (monitor.getSeeType().equals(EmDistributionType.virtual.value)) { //虚拟节点