删除场站工程,另将涉及到摄像头的都整合为一个工程

backend/build.war/build.gradle

@@ -138,7 +138,7 @@ dependencies {
 	compile "com.beecode:xyst.dinas.biz:${inzVersion}"
 	compile "com.beecode:xyst.dinas.project:${inzVersion}"
 	compile "com.beecode:xyst.dinas.production:${inzVersion}"
-	compile "com.beecode:xyst.dinas.station:${inzVersion}"
+	compile "com.beecode:xyst.dinas.camera:${inzVersion}"
 	providedRuntime lib.spring_boot_starter_tomcat
 }
 

backend/build.war/settings.gradle

@@ -15,7 +15,7 @@ includeBuild("../") {
 		substitute module('com.beecode:xyst.dinas.biz') with project(':xyst.dinas.biz')
 		substitute module('com.beecode:xyst.dinas.project') with project(':xyst.dinas.project')
 		substitute module('com.beecode:xyst.dinas.production') with project(':xyst.dinas.production')
-		substitute module('com.beecode:xyst.dinas.station') with project(':xyst.dinas.station')
+		substitute module('com.beecode:xyst.dinas.camera') with project(':xyst.dinas.camera')
 	}
 }
 

backend/settings.gradle

@@ -13,5 +13,5 @@ include "xyst.dinas.oa"
 include "xyst.dinas.biz"
 include "xyst.dinas.project"
 include "xyst.dinas.production"
-include "xyst.dinas.station"
+include "xyst.dinas.camera"
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/ShipInfoDaoImpl.java

@@ -6,13 +6,10 @@ import com.beecode.bcp.core.context.AminoContextHolder;
 import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
-import com.xyst.dinas.biz.constant.CameraInfoConstant;
 import com.xyst.dinas.biz.constant.ShipInfoConstant;
-import com.xyst.dinas.biz.dao.CameraInfoDao;
 import com.xyst.dinas.biz.dao.DinasTypeDao;
 import com.xyst.dinas.biz.dao.ShipInfoDao;
 import com.xyst.dinas.biz.enumeration.OrganizationTypeEnum;
-import com.xyst.dinas.biz.service.CameraInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Order;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/ShipInfoServiceImpl.java

@@ -2,14 +2,11 @@ package com.xyst.dinas.biz.internal.service;
 
 import com.beecode.bap.attachment.common.Page;
 import com.beecode.bcp.type.KObject;
-import com.xyst.dinas.biz.dao.CameraInfoDao;
 import com.xyst.dinas.biz.dao.ShipInfoDao;
-import com.xyst.dinas.biz.service.CameraInfoService;
 import com.xyst.dinas.biz.service.ShipInfoService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.UUID;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/ShipInfoController.java

@@ -8,9 +8,7 @@ import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
 import com.beecode.nlib.utils.StringUtils;
-import com.xyst.dinas.biz.constant.CameraInfoConstant;
 import com.xyst.dinas.biz.constant.ShipInfoConstant;
-import com.xyst.dinas.biz.service.CameraInfoService;
 import com.xyst.dinas.biz.service.ShipInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

backend/xyst.dinas.biz/src/main/resources/META-INF/spring.factories

@@ -3,7 +3,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.xyst.dinas.biz.config.StationConfiguration,\
 com.xyst.dinas.biz.config.DinasTypeConfiguration,\
 com.xyst.dinas.biz.config.ShipConfiguration,\
-com.xyst.dinas.biz.config.CameraConfiguration,\
 com.xyst.dinas.biz.config.SceneConfiguration,\
 com.xyst.dinas.biz.config.DinasOrganizationConfig,\
 com.xyst.dinas.biz.config.BizDataInitializerConfig

backend/xyst.dinas.station/build.gradle → backend/xyst.dinas.camera/build.gradle

-apply from: '../common.gradle'
-
 dependencies {
     compile lib.bcp_import
     compile lib.bcp_type

backend/xyst.dinas.camera/settings.gradle

+rootProject.name = 'xyst.dinas.camera'
\ No newline at end of file

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/CameraConfiguration.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/config/CameraConfiguration.java

-package com.xyst.dinas.biz.config;
+package com.xyst.dinas.camera.config;
 
 import com.beecode.amino.metadata.runtime.MetadataMech;
 import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.TypeConstants;
-import com.xyst.dinas.biz.constant.CameraInfoConstant;
-import com.xyst.dinas.biz.dao.CameraInfoDao;
-import com.xyst.dinas.biz.internal.dao.CameraInfoDaoImpl;
-import com.xyst.dinas.biz.internal.service.CameraInfoServiceImpl;
-import com.xyst.dinas.biz.service.CameraInfoService;
-import com.xyst.dinas.biz.web.CameraInfoController;
+import com.xyst.dinas.camera.constant.CameraInfoConstant;
+import com.xyst.dinas.camera.dao.CameraInfoDao;
+import com.xyst.dinas.camera.internal.dao.CameraInfoDaoImpl;
+import com.xyst.dinas.camera.internal.service.CameraInfoServiceImpl;
+import com.xyst.dinas.camera.service.CameraInfoService;
+import com.xyst.dinas.camera.web.CameraInfoController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -36,7 +36,7 @@ public class CameraConfiguration {
     @Bean(CameraInfoConstant.ENTITY)
     public KClass cameraInfoEntity() {
         return typeMech.createStaticBeanByResource(
-                new ClassPathResource("/com/xyst/dinas/biz/datamodel/CameraInfo.jmx", KClass.class));
+                new ClassPathResource("/com/xyst/dinas/camera/datamodel/CameraInfo.jmx", KClass.class));
     }
 
 }

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/config/CameraPlayConfiguration.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/config/CameraPlayConfiguration.java

-package com.xyst.dinas.production.config;
+package com.xyst.dinas.camera.config;
 
-import com.xyst.dinas.production.dao.CameraPlayDao;
-import com.xyst.dinas.production.internal.dao.CameraPlayDaoImpl;
-import com.xyst.dinas.production.internal.service.CameraPlayServiceImpl;
-import com.xyst.dinas.production.service.CameraPlayService;
-import com.xyst.dinas.production.web.CameraPlayController;
+import com.xyst.dinas.camera.dao.CameraPlayDao;
+import com.xyst.dinas.camera.internal.dao.CameraPlayDaoImpl;
+import com.xyst.dinas.camera.internal.service.CameraPlayServiceImpl;
+import com.xyst.dinas.camera.service.CameraPlayService;
+import com.xyst.dinas.camera.web.CameraPlayController;
 import org.springframework.context.annotation.Bean;
 
 public class CameraPlayConfiguration {
 
     //CameraPlay相关bean配置
     @Bean
-    public CameraPlayDao CameraPlayDao() {
+    public CameraPlayDao cameraPlayDao() {
         return new CameraPlayDaoImpl();
     }
     @Bean
-    public CameraPlayService CameraPlayService(){
+    public CameraPlayService cameraPlayService(){
         return new CameraPlayServiceImpl();
     }
     @Bean
-    public CameraPlayController CameraPlayController(){
+    public CameraPlayController cameraPlayController(){
         return new CameraPlayController();
     }
 

backend/xyst.dinas.station/src/main/java/com/xyst/dinas/station/config/StationCameraConfiguration.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/config/StationCameraConfiguration.java

-package com.xyst.dinas.station.config;
+package com.xyst.dinas.camera.config;
 
 
-import com.xyst.dinas.station.web.StationCameraPlayController;
+import com.xyst.dinas.camera.web.StationCameraPlayController;
 import org.springframework.context.annotation.Bean;
 
 public class StationCameraConfiguration {
 
     @Bean
-    public StationCameraPlayController cameraPlayController(){
+    public StationCameraPlayController stationCameraPlayController(){
         return new StationCameraPlayController();
     }
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/constant/CameraInfoConstant.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/constant/CameraInfoConstant.java

-package com.xyst.dinas.biz.constant;
+package com.xyst.dinas.camera.constant;
 
 public interface CameraInfoConstant {
 
@@ -16,6 +16,6 @@ public interface CameraInfoConstant {
 	/**
 	 * 实体名
 	 */
-	String ENTITY = "com.xyst.dinas.biz.datamodel.CameraInfo";
+	String ENTITY = "com.xyst.dinas.camera.datamodel.CameraInfo";
 
 }

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/constant/CameraPlayConstant.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/constant/CameraPlayConstant.java

-package com.xyst.dinas.production.constant;
+package com.xyst.dinas.camera.constant;
 
 /**
  * @author scol

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/CameraInfoDao.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/dao/CameraInfoDao.java

-package com.xyst.dinas.biz.dao;
+package com.xyst.dinas.camera.dao;
 
 import com.beecode.bap.attachment.common.Page;
 import com.beecode.bcp.type.KObject;

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/dao/CameraPlayDao.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/dao/CameraPlayDao.java

-package com.xyst.dinas.production.dao;
+package com.xyst.dinas.camera.dao;
 
 import com.beecode.bap.attachment.common.Page;
 import com.beecode.bcp.type.KObject;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/CameraInfoDaoImpl.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/internal/dao/CameraInfoDaoImpl.java

-package com.xyst.dinas.biz.internal.dao;
+package com.xyst.dinas.camera.internal.dao;
 
 import com.beecode.amino.core.Amino;
 import com.beecode.bap.attachment.common.Page;
-import com.beecode.bap.org.BapOrgConstants;
 import com.beecode.bcp.core.context.AminoContextHolder;
 import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
-import com.xyst.dinas.biz.constant.CameraInfoConstant;
-import com.xyst.dinas.biz.dao.CameraInfoDao;
+import com.xyst.dinas.camera.constant.CameraInfoConstant;
+import com.xyst.dinas.camera.dao.CameraInfoDao;
 import com.xyst.dinas.biz.enumeration.OrganizationTypeEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.criterion.DetachedCriteria;
@@ -98,7 +97,7 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
         kobject.set("creator", id.get("creator"));
         kobject.set("createTime", id.getDate("createTime"));
         kobject.set("regionalCompany", currentLoginRegionalCompany);
-        Object cameraAccount = template.load("com.xyst.dinas.biz.dict.datamodel.CameraAccount", kobject.get("cameraAccount").getUuid("id"));
+        Object cameraAccount = template.load("com.xyst.dinas.camera.dict.datamodel.CameraAccount", kobject.get("cameraAccount").getUuid("id"));
         Object regionalStation = template.load("com.xyst.dinas.biz.datamodel.Station", kobject.get("regionalStation").getUuid("id"));
         kobject.set("cameraAccount",cameraAccount);
         kobject.set("regionalStation",regionalStation);
@@ -115,7 +114,7 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
     public UUID create(KObject object, KObject regionalCompany) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         object.set("id", UUID.randomUUID());
-        Object cameraAccount = template.load("com.xyst.dinas.biz.dict.datamodel.CameraAccount", object.get("cameraAccount").getUuid("id"));
+        Object cameraAccount = template.load("com.xyst.dinas.camera.dict.datamodel.CameraAccount", object.get("cameraAccount").getUuid("id"));
         Object regionalStation = template.load("com.xyst.dinas.biz.datamodel.Station", object.get("regionalStation").getUuid("id"));
         object.set("cameraAccount",cameraAccount);
         object.set("regionalStation",regionalStation);

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/CameraPlayDaoImpl.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/internal/dao/CameraPlayDaoImpl.java

-package com.xyst.dinas.production.internal.dao;
+package com.xyst.dinas.camera.internal.dao;
 
-import com.beecode.amino.core.Amino;
-import com.beecode.bap.attachment.common.Page;
-import com.beecode.bcp.core.context.AminoContextHolder;
-import com.beecode.bcp.type.KClass;
-import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
-import com.xyst.dinas.biz.constant.CameraInfoConstant;
-import com.xyst.dinas.biz.dao.CameraInfoDao;
-import com.xyst.dinas.production.dao.CameraPlayDao;
-import org.hibernate.criterion.DetachedCriteria;
-import org.hibernate.criterion.Restrictions;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.xyst.dinas.camera.constant.CameraInfoConstant;
+import com.xyst.dinas.camera.dao.CameraPlayDao;
 import org.springframework.orm.hibernate5.HibernateTemplate;
 
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
 public class CameraPlayDaoImpl extends AbstractBaseDao implements CameraPlayDao, CameraInfoConstant {
 
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/CameraInfoServiceImpl.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/internal/service/CameraInfoServiceImpl.java

-package com.xyst.dinas.biz.internal.service;
+package com.xyst.dinas.camera.internal.service;
 
 import com.beecode.bap.attachment.common.Page;
 import com.beecode.bap.staff.BapContext;
 import com.beecode.bcp.type.KObject;
-import com.xyst.dinas.biz.dao.CameraInfoDao;
-import com.xyst.dinas.biz.service.CameraInfoService;
+import com.xyst.dinas.camera.dao.CameraInfoDao;
+import com.xyst.dinas.camera.service.CameraInfoService;
 import com.xyst.dinas.biz.service.DinasOrganizationService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/CameraPlayServiceImpl.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/internal/service/CameraPlayServiceImpl.java

-package com.xyst.dinas.production.internal.service;
+package com.xyst.dinas.camera.internal.service;
 
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
-import com.xyst.dinas.biz.constant.CameraInfoConstant;
-import com.xyst.dinas.biz.dao.CameraInfoDao;
-import com.xyst.dinas.production.service.CameraPlayService;
-import com.xyst.dinas.production.util.CameraContrUtil;
-import com.xyst.dinas.production.util.PTZVo;
+import com.xyst.dinas.camera.constant.CameraInfoConstant;
+import com.xyst.dinas.camera.dao.CameraInfoDao;
+import com.xyst.dinas.camera.service.CameraPlayService;
+import com.xyst.dinas.camera.util.CameraContrUtil;
+import com.xyst.dinas.camera.util.PTZVo;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/CameraInfoService.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/service/CameraInfoService.java

-package com.xyst.dinas.biz.service;
+package com.xyst.dinas.camera.service;
 
 import com.beecode.bap.attachment.common.Page;
 import com.beecode.bcp.type.KObject;

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/service/CameraPlayService.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/service/CameraPlayService.java

-package com.xyst.dinas.production.service;
+package com.xyst.dinas.camera.service;
 
 import com.beecode.inz.basis.team.pojo.ResponseObj;
 import org.json.JSONObject;

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/util/CameraContrUtil.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/util/CameraContrUtil.java

-package com.xyst.dinas.production.util;
+package com.xyst.dinas.camera.util;
 
-import com.xyst.dinas.production.constant.CameraPlayConstant;
+import com.xyst.dinas.camera.constant.CameraPlayConstant;
+import com.xyst.dinas.camera.util.PTZVo;
 import org.apache.http.HttpException;
 import org.json.JSONArray;
 import org.json.JSONObject;

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/util/PTZVo.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/util/PTZVo.java

 
-package com.xyst.dinas.production.util;
+package com.xyst.dinas.camera.util;
 
 import java.io.Serializable;
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/CameraInfoController.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/web/CameraInfoController.java

-package com.xyst.dinas.biz.web;
+package com.xyst.dinas.camera.web;
 
 
 import com.beecode.amino.core.Amino;
@@ -8,9 +8,8 @@ import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
 import com.beecode.nlib.utils.StringUtils;
-import com.xyst.dinas.biz.constant.CameraInfoConstant;
-import com.xyst.dinas.biz.constant.DinasTypeConstant;
-import com.xyst.dinas.biz.service.CameraInfoService;
+import com.xyst.dinas.camera.constant.CameraInfoConstant;
+import com.xyst.dinas.camera.service.CameraInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/web/CameraPlayController.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/web/CameraPlayController.java

-package com.xyst.dinas.production.web;
+package com.xyst.dinas.camera.web;
 
 
 import com.beecode.bap.attachment.common.Page;
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
-import com.xyst.dinas.biz.service.CameraInfoService;
+import com.xyst.dinas.camera.service.CameraInfoService;
 import com.xyst.dinas.biz.service.StationService;
-import com.xyst.dinas.production.service.CameraPlayService;
-import org.json.JSONObject;
+import com.xyst.dinas.camera.service.CameraPlayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

backend/xyst.dinas.station/src/main/java/com/xyst/dinas/station/web/StationCameraPlayController.java → backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/web/StationCameraPlayController.java

-package com.xyst.dinas.station.web;
+package com.xyst.dinas.camera.web;
 
 
 import com.beecode.bap.attachment.common.Page;
@@ -7,9 +7,9 @@ import com.beecode.inz.authentication.constants.AuthcConstants;
 import com.beecode.inz.basis.pojo.WarehouseUser;
 import com.beecode.inz.basis.service.WarehouseUserService;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
-import com.xyst.dinas.biz.service.CameraInfoService;
+import com.xyst.dinas.camera.service.CameraInfoService;
 import com.xyst.dinas.biz.service.StationService;
-import com.xyst.dinas.production.service.CameraPlayService;
+import com.xyst.dinas.camera.service.CameraPlayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -20,8 +20,8 @@ import java.util.*;
 /**
  * @author scol
  */
-@RestController
 @RequestMapping("/warehouse/api/cameraPlay")
+@RestController
 public class StationCameraPlayController {
 
     @Autowired

backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/dict/CameraAccountDict.mk → backend/xyst.dinas.camera/src/main/model/com/xyst/dinas/camera/datamodel/dict/CameraAccountDict.mk

 <model>
     <header>
         <type>bcp.dict.Dict</type>
-        <package>com.xyst.dinas.biz.dict</package>
+        <package>com.xyst.dinas.camera.dict</package>
         <name>CameraAccountDict</name>
         <title>摄像头账户表</title>
         <tags></tags>
@@ -9,7 +9,7 @@
     </header>
     <content>
         <dict id='3086770b-280c-4613-bc97-c6aa9d719e08' listid='a51c942c-4a05-4c4c-b6ee-f11e14c6a532'>
-            <type>com.xyst.dinas.biz.dict.datamodel.CameraAccount</type>
+            <type>com.xyst.dinas.camera.dict.datamodel.CameraAccount</type>
             <config>
                 <structure>list</structure>
                 <code-rule></code-rule>

backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/dict/datamodel/CameraAccount.mk → backend/xyst.dinas.camera/src/main/model/com/xyst/dinas/camera/datamodel/dict/datamodel/CameraAccount.mk

 <model>
 	<header>
 		<type>bcp.type.DataModel</type>
-		<package>com.xyst.dinas.biz.dict.datamodel</package>
+		<package>com.xyst.dinas.camera.dict.datamodel</package>
 		<title>摄像头账户表</title>
 		<name>CameraAccount</name>
 		<tags></tags>
@@ -20,7 +20,7 @@
  				<annotation id='0a3a98dc-1b44-48f3-ba47-775d3fd87d28' attributeId='579095bf-e879-4a92-b322-eea63ed4ba0a' name='length' value='100'>
  				</annotation>
 			</attribute>
-			<hibernate>/xyst.dinas.biz/src/main/resources/config/CameraAccount.hbm.xml</hibernate>
+			<hibernate>/xyst.dinas.camera/src/main/resources/config/CameraAccount.hbm.xml</hibernate>
 		</dataModel>
 	</content>
 </model>

backend/xyst.dinas.station/src/main/resources/META-INF/spring.factories → backend/xyst.dinas.camera/src/main/resources/META-INF/spring.factories

 # Auto Configure
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.xyst.dinas.station.config.StationCameraConfiguration
+com.xyst.dinas.camera.config.StationCameraConfiguration,\
\ No newline at end of file
+com.xyst.dinas.camera.config.CameraPlayConfiguration,\
+com.xyst.dinas.camera.config.CameraConfiguration
\ No newline at end of file

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/CameraInfo.jmx → backend/xyst.dinas.camera/src/main/resources/com/xyst/dinas/camera/datamodel/CameraInfo.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
 	<specification>1.0</specification>
 	<id>e8249aa2-51af-444b-a3e3-fec7c5c8a12d</id>
-	<name>com.xyst.dinas.biz.datamodel.CameraInfo</name>
+	<name>com.xyst.dinas.camera.datamodel.CameraInfo</name>
 	<title>摄像头管理</title>
 	<description>摄像头管理</description>
 	<define>bcp.type.Class</define>
@@ -13,7 +13,7 @@
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.Organization</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
-	<dependency>com.xyst.dinas.biz.dict.datamodel.CameraAccount</dependency>
+	<dependency>com.xyst.dinas.camera.dict.datamodel.CameraAccount</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<content>
 		<m:class>
@@ -160,7 +160,7 @@
 					<m:id>0a0bf871-7f98-4fe8-b91e-6813e9794264</m:id>
 					<m:name>cameraAccount</m:name>
 					<m:title>摄像头账号</m:title>
-					<m:type>com.xyst.dinas.biz.dict.datamodel.CameraAccount</m:type>
+					<m:type>com.xyst.dinas.camera.dict.datamodel.CameraAccount</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/dict/CameraAccountDict$listSelector.jmx → backend/xyst.dinas.camera/src/main/resources/com/xyst/dinas/camera/dict/CameraAccountDict$listSelector.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-selector">
 	<specification>1.0</specification>
 	<id>a51c942c-4a05-4c4c-b6ee-f11e14c6a532</id>
-	<name>com.xyst.dinas.biz.dict.CameraAccountDict$listSelector</name>
+	<name>com.xyst.dinas.camera.dict.CameraAccountDict$listSelector</name>
 	<title>listSelector</title>
 	<define>bcp.selector.ListSelector</define>
 	<define-version>1.0</define-version>
@@ -61,7 +61,7 @@
 			<m:adapter>
 				<m:name>com.beecode.bap.biztrait.BasicBillDictListSelectorAdaptor</m:name>
 			</m:adapter>
-			<m:config>com.xyst.dinas.biz.dict.CameraAccountDict</m:config>
+			<m:config>com.xyst.dinas.camera.dict.CameraAccountDict</m:config>
 		</m:list-selector>
 	</content>
 </metadata>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/dict/CameraAccountDict.jmx → backend/xyst.dinas.camera/src/main/resources/com/xyst/dinas/camera/dict/CameraAccountDict.jmx

@@ -2,14 +2,14 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-dict">
 	<specification>1.0</specification>
 	<id>3086770b-280c-4613-bc97-c6aa9d719e08</id>
-	<name>com.xyst.dinas.biz.dict.CameraAccountDict</name>
+	<name>com.xyst.dinas.camera.dict.CameraAccountDict</name>
 	<title>摄像头账户表</title>
 	<define>bcp.dict</define>
 	<define-version>1.0</define-version>
-	<dependency>com.xyst.dinas.biz.dict.datamodel.CameraAccount</dependency>
+	<dependency>com.xyst.dinas.camera.dict.datamodel.CameraAccount</dependency>
 	<content>
 		<m:dict>
-			<m:type>com.xyst.dinas.biz.dict.datamodel.CameraAccount</m:type>
+			<m:type>com.xyst.dinas.camera.dict.datamodel.CameraAccount</m:type>
 			<m:config>
 				<m:structure>list</m:structure>
 				<m:code-rule></m:code-rule>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/dict/datamodel/CameraAccount.jmx → backend/xyst.dinas.camera/src/main/resources/com/xyst/dinas/camera/dict/datamodel/CameraAccount.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-type">
 	<specification>1.0</specification>
 	<id>f200e311-dee1-4faf-bf25-65f26fcefab3</id>
-	<name>com.xyst.dinas.biz.dict.datamodel.CameraAccount</name>
+	<name>com.xyst.dinas.camera.dict.datamodel.CameraAccount</name>
 	<title>摄像头账户表</title>
 	<description>摄像头账户表</description>
 	<define>bcp.type.Class</define>

backend/xyst.dinas.biz/src/main/resources/config/CameraAccount.hbm.xml → backend/xyst.dinas.camera/src/main/resources/config/CameraAccount.hbm.xml

@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
 		http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
-	 <union-subclass entity-name="com.xyst.dinas.biz.dict.datamodel.CameraAccount" table="xyst_dinas_position_camera_account" extends = "com.beecode.bcp.dict.datamodel.BasicDictRequirement">
+	 <union-subclass entity-name="com.xyst.dinas.camera.dict.datamodel.CameraAccount" table="xyst_dinas_position_camera_account" extends = "com.beecode.bcp.dict.datamodel.BasicDictRequirement">
     	<tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
 		<property name="buildinParamFir" type="nstring" not-null="false">
 			<column name="buildin_param_fir"  length="100"/>

backend/xyst.dinas.biz/src/main/resources/config/CameraInfo.hbm.xml → backend/xyst.dinas.camera/src/main/resources/config/CameraInfo.hbm.xml

@@ -3,7 +3,7 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
 		http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
-    <class entity-name="com.xyst.dinas.biz.datamodel.CameraInfo" table="xyst_dinas_biz_camera_info" optimistic-lock="version"
+    <class entity-name="com.xyst.dinas.camera.datamodel.CameraInfo" table="xyst_dinas_biz_camera_info" optimistic-lock="version"
     >
         <tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer"/>
         <id name="id" type="uuid-binary" column="id" length="16">
@@ -113,7 +113,7 @@
                 <comment>所属场站</comment>
             </column>
         </many-to-one>
-        <many-to-one name="cameraAccount" entity-name="com.xyst.dinas.biz.dict.datamodel.CameraAccount" fetch="select">
+        <many-to-one name="cameraAccount" entity-name="com.xyst.dinas.camera.dict.datamodel.CameraAccount" fetch="select">
             <column name="camera_account" >
                 <comment>摄像头账号</comment>
             </column>

backend/xyst.dinas.production/src/main/resources/META-INF/spring.factories

 # Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.xyst.dinas.production.config.CameraPlayConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=
\ No newline at end of file
\ No newline at end of file

backend/xyst.dinas.station/settings.gradle

-rootProject.name = 'xyst.dinas.station'