|
@@ -28,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
import tk.mybatis.mapper.weekend.Weekend;
|
|
|
import tk.mybatis.mapper.weekend.WeekendCriteria;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -70,10 +71,10 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
|
|
|
model.setPositionNum(model.getDescription() + "_DV");
|
|
|
}
|
|
|
if (model.getXPosition() == null) {
|
|
|
- model.setXPosition(50);
|
|
|
+ model.setXPosition(new BigDecimal(50));
|
|
|
}
|
|
|
if (model.getYPosition() == null) {
|
|
|
- model.setYPosition(50);
|
|
|
+ model.setYPosition(new BigDecimal(50));
|
|
|
}
|
|
|
return super.saveModelByDTO(model);
|
|
|
}
|
|
@@ -167,10 +168,10 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
|
|
|
for (RemoteOpc remoteOpc : items) {
|
|
|
remoteOpc.setType(1);
|
|
|
remoteOpc.setLine(line);
|
|
|
- remoteOpc.setXPosition(50);
|
|
|
- remoteOpc.setYPosition(50);
|
|
|
- remoteOpc.setWidth(50);
|
|
|
- remoteOpc.setHeight(50);
|
|
|
+ remoteOpc.setXPosition(new BigDecimal(50));
|
|
|
+ remoteOpc.setYPosition(new BigDecimal(50));
|
|
|
+ remoteOpc.setWidth(new BigDecimal(50));
|
|
|
+ remoteOpc.setHeight(new BigDecimal(50));
|
|
|
remoteOpc.setWarnFirstColor("#B71C1C");
|
|
|
remoteOpc.setWarnSecondColor("#F57F17");
|
|
|
remoteOpc.setWarnThirdColor("#F57F17");
|