优化监控填写

java110-bean/src/main/java/com/java110/dto/community/CommunityLocationDto.java

@@ -15,6 +15,7 @@ import java.util.Date;
  **/
 public class CommunityLocationDto extends PageDto implements Serializable {
 
+
     private String locationName;
     private String locationId;
     private String locationType;

java110-bean/src/main/java/com/java110/dto/machine/MachineDto.java

@@ -19,6 +19,7 @@ public class MachineDto extends PageDto implements Serializable {
     public static final String MACHINE_TYPE_CAR_THIRD = "9995";//第三方道闸平台
     public static final String MACHINE_TYPE_ACCESS_CONTROL = "9999";
     public static final String MACHINE_TYPE_ATTENDANCE = "9997"; // 考勤机
+    public static final String MACHINE_TYPE_MONITOR = "9998"; // 监控
     public static final String MACHINE_STATE_ON = "1200";
     public static final String MACHINE_STATE_OFF = "1300";
 

service-common/src/main/java/com/java110/common/cmd/machine/SaveMachineCmd.java

@@ -84,16 +84,20 @@ public class SaveMachineCmd extends Cmd {
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        MachinePo machinePo = BeanConvertUtil.covertBean(reqJson, MachinePo.class);
 
-        CommunityLocationDto communityLocationDto = new CommunityLocationDto();
-        communityLocationDto.setCommunityId(reqJson.getString("communityId"));
-        communityLocationDto.setLocationId(reqJson.getString("locationTypeCd"));
-        List<CommunityLocationDto> locationDtos = communityLocationV1InnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
-
-        Assert.listOnlyOne(locationDtos, "位置不存在");
+        if(!MachineDto.MACHINE_TYPE_MONITOR.equals(reqJson.getString("machineTypeCd"))){
+            CommunityLocationDto communityLocationDto = new CommunityLocationDto();
+            communityLocationDto.setCommunityId(reqJson.getString("communityId"));
+            communityLocationDto.setLocationId(reqJson.getString("locationTypeCd"));
+            List<CommunityLocationDto> locationDtos = communityLocationV1InnerServiceSMOImpl.queryCommunityLocations(communityLocationDto);
+            Assert.listOnlyOne(locationDtos, "位置不存在");
+            machinePo.setLocationObjId(locationDtos.get(0).getLocationObjId());
+        }else{
+            machinePo.setLocationObjId("-1");
+            machinePo.setLocationTypeCd("-1");
+        }
 
-        MachinePo machinePo = BeanConvertUtil.covertBean(reqJson, MachinePo.class);
-        machinePo.setLocationObjId(locationDtos.get(0).getLocationObjId());
         machinePo.setMachineId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         machinePo.setHeartbeatTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         machinePo.setState(MachineDto.MACHINE_STATE_ON);