|
@@ -343,7 +343,7 @@ public class TCm0312Controller extends BaseRESTfulController {
|
|
|
tCm0318.setSystemname(tCm0312.getSystemname());
|
|
|
tCm0318.setSitem(tCm0312.getSitem());
|
|
|
tCm0318.setPowermonitorname(tCm0312.getPowermonitorname());
|
|
|
- tCm0318.setMonitordate(model.getInputtime().substring(0, 10));
|
|
|
+ //tCm0318.setMonitordate(model.getInputtime().substring(0, 10));
|
|
|
tCm0318.setDatadate(model.getInputtime().substring(11));
|
|
|
tCm0318.setMonitoringvalue(Double.parseDouble(model.getTestresult()));
|
|
|
tCm0318.setUnit(tCm0312.getUnit());
|
|
@@ -389,7 +389,7 @@ public class TCm0312Controller extends BaseRESTfulController {
|
|
|
daydata.setDatasource(daylist.get(i).getDatasource());
|
|
|
daydata.setUnit(daylist.get(i).getUnit());
|
|
|
daydata.setInsertTime(DateUtils.getCurrentTime("yyyy-MM-dd HH:mm:ss"));
|
|
|
- daydata.setMonitordate(DateUtils.getCurrentTime("yyyy-MM-dd"));
|
|
|
+ // daydata.setMonitordate(DateUtils.getCurrentTime("yyyy-MM-dd"));
|
|
|
daydata.setDatadate(DateUtils.getCurrentTime("HH:mm:ss"));
|
|
|
for(int j = 1;j <= Integer.parseInt(daylist.get(i).getDetectionf());j++){
|
|
|
daydata.setBatchno(String.valueOf(j));
|
|
@@ -411,7 +411,7 @@ public class TCm0312Controller extends BaseRESTfulController {
|
|
|
monthdata.setDatasource(daylist.get(m).getDatasource());
|
|
|
monthdata.setUnit(daylist.get(m).getUnit());
|
|
|
monthdata.setInsertTime(DateUtils.getCurrentTime("yyyy-MM-dd HH:mm:ss"));
|
|
|
- monthdata.setMonitordate(DateUtils.getCurrentTime("yyyy-MM-dd"));
|
|
|
+ // monthdata.setMonitordate(DateUtils.getCurrentTime("yyyy-MM-dd"));
|
|
|
monthdata.setDatadate(DateUtils.getCurrentTime("HH:mm:ss"));
|
|
|
for(int n = 1;n <= Integer.parseInt(daylist.get(m).getDetectionf());n++){
|
|
|
monthdata.setBatchno(String.valueOf(n));
|