Merge remote-tracking branch 'origin/feature/biz_ship' into develop

# Conflicts:
#	backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/CameraInfoController.java

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/ShipConfiguration.java

+package com.xyst.dinas.biz.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.ShipInfoConstant;
+import com.xyst.dinas.biz.dao.PositionDao;
+import com.xyst.dinas.biz.dao.ShipInfoDao;
+import com.xyst.dinas.biz.internal.dao.PositionDaoImpl;
+import com.xyst.dinas.biz.internal.dao.ShipInfoDaoImpl;
+import com.xyst.dinas.biz.internal.service.PositionServiceImpl;
+import com.xyst.dinas.biz.internal.service.ShipInfoServiceImpl;
+import com.xyst.dinas.biz.service.PositionService;
+import com.xyst.dinas.biz.web.PositionController;
+import com.xyst.dinas.biz.web.ShipInfoController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.ClassPathResource;
+
+public class ShipConfiguration {
+
+    @Autowired
+    @Qualifier(TypeConstants.CLASS_MECH)
+    private MetadataMech<KClass> typeMech;
+
+
+    //ShipDaoImpl相关bean配置
+    @Bean
+    public ShipInfoDao shipInfoDao() {
+        return new ShipInfoDaoImpl();
+    }
+    @Bean
+    public ShipInfoServiceImpl shipInfoServiceImpl(){
+        return new ShipInfoServiceImpl();
+    }
+
+    @Bean
+    public ShipInfoController shipInfoController(){
+        return new ShipInfoController();
+    }
+
+
+    @Bean(ShipInfoConstant.ENTITY)
+    public KClass shipInfoInfoEntity() {
+        return typeMech.createStaticBeanByResource(
+                new ClassPathResource("/com/xyst/dinas/biz/datamodel/ShipInfo.jmx", KClass.class));
+    }
+
+
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/constant/ShipInfoConstant.java

+package com.xyst.dinas.biz.constant;
+
+public interface ShipInfoConstant {
+
+
+	/**
+	 * 业务类型名称
+	 */
+	String BIZ_TYPE = "ShipInfo";
+	
+	/**
+	 * 业务类型标题
+	 */
+	String BIZ_TITLE = "船舶备案";
+	
+	/**
+	 * 实体名
+	 */
+	String ENTITY = "com.xyst.dinas.biz.datamodel.ShipInfo";
+
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/ShipInfoDao.java

+package com.xyst.dinas.biz.dao;
+
+import com.beecode.bap.attachment.common.Page;
+import com.beecode.bcp.type.KObject;
+import com.beecode.inz.basis.dao.BaseDao;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface ShipInfoDao extends BaseDao {
+
+    KObject load(UUID id);
+
+    Page<KObject> listPaging(Page<KObject> page, String shipName,String shipCodeNum);
+
+    UUID create(KObject kObject);
+
+    void deleteById(UUID id);
+
+    List<KObject> getByName(String name, UUID id);
+
+    void modify(KObject kobject);
+}

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

@@ -99,7 +99,6 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
     @Override
     public UUID create(KObject kObject) {
         KObject staff = AminoContextHolder.getContext().getStaff();
-        kObject.set("department", staff.get("department"));
         kObject.set("id", UUID.randomUUID());
         kObject.set("creator", staff);
         kObject.set("createTime", new Date());

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

@@ -58,10 +58,10 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
 
     @Override
     public Page<KObject> listDinasTypeInfoPaging(Page<KObject> page) {
-        UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
+//        UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
         KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
-        detachedCriteria.add(Restrictions.eq("department.id", departmentId));
+//        detachedCriteria.add(Restrictions.eq("department.id", departmentId));
         detachedCriteria.add(Restrictions.eq("del", false));
         int offset = page.getPageSize() * (page.getPageNo() - 1);
         List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize());
@@ -73,10 +73,10 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
 
     @Override
     public List<KObject> getByName(String name, UUID id) {
-        UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
+//        UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
         KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
-        detachedCriteria.add(Restrictions.eq("department.id", departmentId));
+//        detachedCriteria.add(Restrictions.eq("department.id", departmentId));
         detachedCriteria.add(Restrictions.eq("del", false));
         detachedCriteria.add(Restrictions.eq("dinasTypeName", name));
         if (id != null) {
@@ -147,7 +147,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
     @Override
     public UUID create(KObject kObject) {
         KObject staff = AminoContextHolder.getContext().getStaff();
-        kObject.set("department", staff.get("department"));
+//        kObject.set("department", staff.get("department"));
         kObject.set("id", UUID.randomUUID());
         kObject.set("creator", staff);
         kObject.set("createTime", new Date());

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

+package com.xyst.dinas.biz.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.constant.ShipInfoConstant;
+import com.xyst.dinas.biz.dao.CameraInfoDao;
+import com.xyst.dinas.biz.dao.ShipInfoDao;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.criterion.DetachedCriteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.hibernate5.HibernateTemplate;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, ShipInfoConstant {
+
+
+    @Autowired
+    private HibernateTemplate template;
+
+    /**
+     * 抽象方法，需要实现类提供HibernateTemplate
+     *
+     * @return
+     */
+    @Override
+    protected HibernateTemplate getHibernateTemplate() {
+        return template;
+    }
+
+    /**
+     * 抽象方法，需要实现类提供当前ModelName
+     *
+     * @return
+     */
+    @Override
+    protected String getModelName() {
+        return null;
+    }
+
+    @Override
+    public KObject load(UUID id) {
+        return (KObject) template.load(ENTITY, id);
+    }
+
+
+    @Override
+    public Page<KObject> listPaging(Page<KObject> page, String shipName,
+                                              String shipCodeNum) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        detachedCriteria.add(Restrictions.eq("del", false));
+        if(StringUtils.isNotBlank(shipName)){
+            detachedCriteria.add(Restrictions.like("shipName", "%"+shipName+"%"));
+
+        }
+        if(StringUtils.isNotBlank(shipCodeNum)){
+            detachedCriteria.add(Restrictions.like("shipCodeNum", "%"+shipCodeNum+"%"));
+        }
+        int offset = page.getPageSize() * (page.getPageNo() - 1);
+        List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria, offset, page.getPageSize());
+        page.setDatas(list);
+        page.setTotal(template.findByCriteria(detachedCriteria).size());
+        return page;
+    }
+
+
+    @Override
+    public List<KObject> getByName(String name, UUID id) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        detachedCriteria.add(Restrictions.eq("del", false));
+        detachedCriteria.add(Restrictions.eq("shipName", name));
+        if (id != null) {
+            detachedCriteria.add(Restrictions.ne("id", id));
+        }
+        return (List<KObject>) template.findByCriteria(detachedCriteria);
+    }
+
+    @Override
+    public void modify(KObject kobject) {
+        KObject id = load(kobject.getUuid("id"));
+        kobject.set("creator", id.get("creator"));
+        kobject.set("createTime", id.getDate("createTime"));
+        KObject staff = AminoContextHolder.getContext().getStaff();
+        kobject.set("modifyTime", new Date());
+        kobject.set("modifier", staff.getUuid("id"));
+        kobject.set("del", false);
+        template.merge(kobject);
+    }
+
+
+
+    @Override
+    public UUID create(KObject kObject) {
+        KObject staff = AminoContextHolder.getContext().getStaff();
+        if(null!=kObject.getUuid("id")){
+            kObject.set("id", UUID.randomUUID());
+        }
+        kObject.set("creator", staff);
+        kObject.set("createTime", new Date());
+        kObject.set("del", false);
+        kObject.validate();
+        return ((UUID) template.save(kObject));
+    }
+
+    @Override
+    public void deleteById(UUID id) {
+        KObject staff = AminoContextHolder.getContext().getStaff();
+        KObject kobject = (KObject) template.load(ENTITY, id);
+        kobject.set("modifyTime", new Date());
+        kobject.set("modifier", staff);
+        kobject.set("del", true);
+        template.update(kobject);
+    }
+
+}

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

@@ -32,10 +32,10 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
 
     @Override
     public Page<KObject> listStationInfoPaging(Page<KObject> page) {
-        UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
+//        UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
         KClass bean = Amino.getStaticMetadataContext().getBean(StationConstant.ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
-        detachedCriteria.add(Restrictions.eq("department.id", departmentId));
+//        detachedCriteria.add(Restrictions.eq("department.id", departmentId));
         detachedCriteria.add(Restrictions.eq("del", false));
         int offset = page.getPageSize() * (page.getPageNo() - 1);
         List<KObject> list = (List<KObject>) template.findByCriteria(detachedCriteria,offset,page.getPageSize());
@@ -47,10 +47,10 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
 
     @Override
     public List<KObject> getByName(String name, UUID id) {
-        UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
+//        UUID departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id");
         KClass bean = Amino.getStaticMetadataContext().getBean(StationConstant.ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
-        detachedCriteria.add(Restrictions.eq("department.id", departmentId));
+//        detachedCriteria.add(Restrictions.eq("department.id", departmentId));
         detachedCriteria.add(Restrictions.eq("del", false));
         detachedCriteria.add(Restrictions.eq("stationName", name));
         if(id!=null){
@@ -76,7 +76,7 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
     @Override
     public UUID create(KObject kObject) {
         KObject staff = AminoContextHolder.getContext().getStaff();
-        kObject.set("department", staff.get("department"));
+//        kObject.set("department", staff.get("department"));
 //        kObject.set("id",UUID.randomUUID());
         kObject.set("creator",staff);
         kObject.set("createTime", new Date());

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

+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;
+
+@Transactional(rollbackFor = Exception.class)
+public class ShipInfoServiceImpl implements ShipInfoService {
+
+    @Autowired
+    private ShipInfoDao shipInfoDao;
+
+    @Override
+    public Page<KObject> queryByPaging(Page<KObject> page, String shipName,
+                                       String shipCodeNum) throws Exception {
+        if(page.getPageNo()==0||page.getPageSize()==0) {
+            throw new Exception("pageSize or offset is null");
+        }
+        return shipInfoDao.listPaging(page,shipName,shipCodeNum);
+    }
+
+    @Override
+    public UUID add(KObject kObject) {
+        return shipInfoDao.create(kObject);
+    }
+
+    @Override
+    public KObject getById(UUID id) {
+        return shipInfoDao.load(id);
+    }
+
+    @Override
+    public KObject getByName(String name, UUID id) {
+        List<KObject> kObjects = shipInfoDao.getByName(name,id);
+        if(CollectionUtils.isEmpty(kObjects)){
+            return null;
+        }
+        return kObjects.get(0);
+    }
+
+    @Override
+    public void update(KObject kobject) {
+        shipInfoDao.modify(kobject);
+    }
+
+    @Override
+    public void deleteById(UUID id) {
+        shipInfoDao.deleteById(id);
+    }
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/ShipInfoService.java

+package com.xyst.dinas.biz.service;
+
+import com.beecode.bap.attachment.common.Page;
+import com.beecode.bcp.type.KObject;
+
+import java.util.UUID;
+
+public interface ShipInfoService {
+
+    Page<KObject> queryByPaging(Page<KObject> page, String shipName,String shipCodeNum) throws Exception;
+
+    UUID add(KObject kObject);
+
+    KObject getById(UUID id);
+
+    KObject getByName(String name, UUID id);
+
+    void update(KObject kobject);
+
+    void deleteById(UUID id);
+}

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

@@ -165,4 +165,6 @@ public class CameraInfoController {
         }
         return ResponseObj.success();
     }
+
+
 }

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.UUID;
 
 @RestController()
-@RequestMapping(value="/biz/dinasType")
+@RequestMapping(value="/dinasBiz/dinasType")
 
 public class DinasTypeController {
 

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

+package com.xyst.dinas.biz.web;
+
+
+import com.beecode.amino.core.Amino;
+import com.beecode.bap.attachment.common.Page;
+import com.beecode.bcp.type.KClass;
+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.*;
+
+import java.util.UUID;
+
+@RestController()
+@RequestMapping(value="/dinasBiz/shipInfo")
+
+public class ShipInfoController {
+
+    @Autowired
+    private ShipInfoService shipInfoService;
+
+    @RequestMapping(value = "list/page", method = RequestMethod.GET)
+    public ResponseObj getDinasTypeList(
+            @RequestParam(name = "pageNo", required = false) Integer pageNo,
+            @RequestParam(name = "pageSize", required = false) Integer pageSize,
+            @RequestParam(name = "shipName", required = false) String shipName,
+            @RequestParam(name = "shipCodeNum", required = false) String shipCodeNum
+            ) throws Exception {
+
+        Page<KObject> objectPage = new Page<>();
+        objectPage.setPageNo(pageNo);
+        objectPage.setPageSize(pageSize);
+        return ResponseObj.success("操作成功",shipInfoService.queryByPaging(objectPage,shipName,shipCodeNum));
+    }
+
+    /**
+     * 新建
+     * @param body json
+     * @return ResponseObj
+     */
+    @PostMapping
+    public ResponseObj create(@RequestBody String body){
+        KObject kobject = JSONObjectUtils.toObject(body, Amino.getApplicationMetadataContext().getBean(ShipInfoConstant.ENTITY, KClass.class));
+        kobject.validate();
+        UUID id = shipInfoService.add(kobject);
+        return ResponseObj.success("保存成功", id);
+    }
+
+    /**
+     * 修改
+     * @param body json
+     * @return ResponseObj
+     */
+    @PutMapping
+    public ResponseObj update(@RequestBody String body){
+        KObject kobject = JSONObjectUtils.toObject(body,Amino.getApplicationMetadataContext().getBean(ShipInfoConstant.ENTITY, KClass.class));
+        kobject.validate();
+        if(kobject.getUuid("id") == null){
+            return ResponseObj.error(400,"'id' must be not null!");
+        }
+        shipInfoService.update(kobject);
+        return ResponseObj.success("修改成功");
+    }
+
+    /**
+     * 根据id获取信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public ResponseObj<Object> getById(@PathVariable("id") UUID id){
+        if(id == null){
+            return ResponseObj.error(400,"'id' must be not null!");
+        }
+        KObject station =  shipInfoService.getById(id);
+        return ResponseObj.success("查询成功",station);
+    }
+
+    /**
+     * 根据Id删除船舶信息
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    public ResponseObj<Object> deleteById(@PathVariable("id") UUID id){
+        if(id == null){
+            return ResponseObj.error(400,"'id' must be not null!");
+        }
+        shipInfoService.deleteById(id);
+        return ResponseObj.success("删除成功");
+    }
+
+
+    /**
+     * 查询是否有重名
+     * @param name
+     * @return
+     */
+    @GetMapping("/validateName")
+    public ResponseObj validateName(@RequestParam("name") String name, @RequestParam(value = "id",required = false) UUID id){
+        if(StringUtils.isEmpty(name)){
+            return ResponseObj.error(400,"船舶名称不能为空");
+        }
+        KObject kObject = shipInfoService.getByName(name,id);
+        if(kObject != null){
+            return ResponseObj.error("船舶名称已存在!");
+        }
+        return ResponseObj.success();
+    }
+
+
+}

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

@@ -20,7 +20,7 @@ import java.util.UUID;
  * @author scol
  */
 @RestController()
-@RequestMapping(value="/biz/stationInfo")
+@RequestMapping(value="/dinasBiz/stationInfo")
 
 public class StationController {
 	

backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/bill/ShipInfo.mk

+<model>
+    <header>
+        <type>bcp.biz.Bill</type>
+        <package>com.xyst.dinas.biz.bill</package>
+        <title>船舶备案</title>
+        <name>Station</name>
+        <description>船舶备案</description>
+    </header>
+    <content>
+        <bill>
+            <data>
+                 {"baseData":{"name":"ShipInfo","title":"船舶备案","billModel":"com.beecode.bap.biztrait.BasicBillBiztrait","functionLibrarys":[],"description":"船舶备案","dataModel":"com.xyst.dinas.biz.datamodel.ShipInfo"},"serial":{"serialData":[{"segment":"literal","segmentData":"SI"},{"segment":"sequence","segmentData":{"start-with":0,"increment":1,"min":0,"max":99999,"length":5,"cycle":true,"cut-direction":"left","pad-string":"0","pad-direction":"left","cache-size":10}}],"buildTime":"add"},"formula":[],"workflow":{"workflow":"","processParamConfig":[]},"print":[],"authority":[]}
+            </data>
+        </bill>
+    </content>
+</model>
\ No newline at end of file

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

@@ -2,4 +2,5 @@
 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
\ No newline at end of file

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$sequence.jmx

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
+	<specification>1.0</specification>
+	<id>4ff3e254-4725-430c-a508-24e2790819d2</id>
+	<name>com.xyst.dinas.biz.bill.ShipInfo$sequence</name>
+	<title>船舶备案$sequence</title>
+	<description>船舶备案</description>
+	<define>bcp.sequence</define>
+	<define-version>1.0</define-version>
+	<content>
+		<m:sequence>
+			<m:start-with>0</m:start-with>
+			<m:increment>1</m:increment>
+			<m:max>99999</m:max>
+			<m:min>0</m:min>
+			<m:cycle>true</m:cycle>
+			<m:cache-size>10</m:cache-size>
+		</m:sequence>
+	</content>
+</metadata>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo$serial.jmx

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
+	<specification>1.0</specification>
+	<id>8b693bcf-852e-4f05-85e3-b70c0c132d6d</id>
+	<name>com.xyst.dinas.biz.bill.ShipInfo$serial</name>
+	<title>船舶备案$serial</title>
+	<description>船舶备案</description>
+	<define>bcp.serial</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.biz.datamodel.ShipInfo</dependency>
+	<dependency>com.xyst.dinas.biz.bill.ShipInfo$sequence</dependency>
+	<content>
+		<m:serial>
+			<m:input>com.xyst.dinas.biz.datamodel.ShipInfo</m:input>
+			<m:functionLibrarys/>
+			<m:segments>
+				<m:literal>
+					<m:value>SI</m:value>
+				</m:literal>
+				<m:sequence>
+					<m:length>5</m:length>
+					<m:pad-direction>left</m:pad-direction>
+					<m:pad-string>0</m:pad-string>
+					<m:key>com.xyst.dinas.biz.bill.ShipInfo$serial</m:key>
+					<m:sequenceName>com.xyst.dinas.biz.bill.ShipInfo$sequence</m:sequenceName>
+				</m:sequence>
+			</m:segments>
+		</m:serial>
+	</content>
+</metadata>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/ShipInfo.jmx

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
+	<specification>1.0</specification>
+	<id>d448c109-3a1d-439e-b117-e3dceb0f236c</id>
+	<name>com.xyst.dinas.biz.bill.ShipInfo</name>
+	<title>船舶备案</title>
+	<description>船舶备案</description>
+	<define>bcp.biz.Biztype</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.biz.bill.ShipInfo$serial</dependency>
+	<dependency>com.xyst.dinas.biz.datamodel.ShipInfo</dependency>
+	<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
+	<content>
+		<m:biztype>
+			<m:type>com.xyst.dinas.biz.datamodel.ShipInfo</m:type>
+			<m:inheritances>
+				<m:inheritance>
+					<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
+					<m:config type="xml">
+						<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.biz.bill.ShipInfo$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
+					</m:config>
+				</m:inheritance>
+			</m:inheritances>
+			<m:methodAuthorityItems/>
+		</m:biztype>
+	</content>
+</metadata>

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

@@ -11,7 +11,7 @@
     <dependency>bcp.type.constraint.NotNull</dependency>
 	<dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
-	<dependency>com.beecode.bap.department.datamodel.Department</dependency>
+	<dependency>com.xyst.dinas.biz.datamodel.Organization</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<content>
 		<m:class>
@@ -25,6 +25,7 @@
 						<m:annotation>
 							<m:type>bcp.type.constraint.NotNull</m:type>
 						</m:annotation>
+
 					</m:annotations>
 					<m:id>efc8163c-c3d1-40b2-9482-ecdb27bfe3ca</m:id>
 					<m:name>cameraName</m:name>
@@ -38,7 +39,8 @@
 						<m:annotation>
 							<m:type>bcp.type.constraint.NotNull</m:type>
 						</m:annotation>
-					</m:annotations>					<m:id>d7de9de5-9472-4ea1-af61-43e9cb45d9b8</m:id>
+					</m:annotations>
+					<m:id>d7de9de5-9472-4ea1-af61-43e9cb45d9b8</m:id>
 					<m:name>cameraType</m:name>
 					<m:title>摄像头类型</m:title>
 					<m:type>int</m:type>
@@ -50,7 +52,8 @@
 						<m:annotation>
 							<m:type>bcp.type.constraint.NotNull</m:type>
 						</m:annotation>
-					</m:annotations>					<m:id>aa7a225d-b739-4e7e-925d-d4fefab61119</m:id>
+					</m:annotations>
+					<m:id>aa7a225d-b739-4e7e-925d-d4fefab61119</m:id>
 					<m:name>cameraAggType</m:name>
 					<m:title>摄像头集成类型</m:title>
 					<m:type>int</m:type>
@@ -122,9 +125,9 @@
 				<m:attribute>
 					<m:annotations/>
 					<m:id>2b56d674-b574-428a-bc69-2c3274ee2159</m:id>
-					<m:name>department</m:name>
-					<m:title>所属部门</m:title>
-					<m:type>com.beecode.bap.department.datamodel.Department</m:type>
+					<m:name>regionalCompany</m:name>
+					<m:title>所属组织机构</m:title>
+					<m:type>com.xyst.dinas.biz.datamodel.Organization</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/DinasType.jmx

@@ -11,7 +11,7 @@
 	<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
 	<dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
-	<dependency>com.beecode.bap.department.datamodel.Department</dependency>
+	<dependency>com.xyst.dinas.biz.datamodel.Organization</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<content>
 		<m:class>
@@ -41,9 +41,9 @@
 				<m:attribute>
 					<m:annotations/>
 					<m:id>19f58e91-61b8-4a8d-a5e0-d530fdf38cf8</m:id>
-					<m:name>department</m:name>
-					<m:title>所属部门</m:title>
-					<m:type>com.beecode.bap.department.datamodel.Department</m:type>
+					<m:name>regionalCompany</m:name>
+					<m:title>所属组织机构</m:title>
+					<m:type>com.xyst.dinas.biz.datamodel.Organization</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/ShipInfo.jmx

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
+
+	<specification>1.0</specification>
+	<id>0b2ddf6d-09b3-4212-b57d-8c64eb3ab744</id>
+	<name>com.xyst.dinas.biz.datamodel.ShipInfo</name>
+	<title>船舶备案</title>
+	<description>船舶备案</description>
+	<define>bcp.type.Class</define>
+	<define-version>1.0</define-version>
+	<dependency>bcp.type.constraint.StringLength</dependency>
+    <dependency>bcp.type.constraint.NotNull</dependency>
+	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
+	<dependency>com.xyst.dinas.biz.datamodel.Organization</dependency>
+	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
+	<content>
+		<m:class>
+			<m:parents>
+				<m:parent>com.beecode.inz.common.datamodel.BaseInfo</m:parent>
+                <m:parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</m:parent>
+			</m:parents>
+			<m:attributes>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.NotNull</m:type>
+						</m:annotation>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>30</m:value>
+						</m:annotation>
+					</m:annotations>
+					<m:id>ddb85de0-8ba2-11eb-9292-98039b285ed0</m:id>
+					<m:name>shipName</m:name>
+					<m:title>船舶名称</m:title>
+					<m:type>string</m:type>
+					<m:description>船舶名称</m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.NotNull</m:type>
+						</m:annotation>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>30</m:value>
+						</m:annotation>
+					</m:annotations>
+					<m:id>ddb85de0-8ba2-11eb-9292-98039b285ed0</m:id>
+					<m:name>shipCodeNum</m:name>
+					<m:title>船舶编号</m:title>
+					<m:type>string</m:type>
+					<m:description>船舶编号</m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.NotNull</m:type>
+						</m:annotation>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>30</m:value>
+						</m:annotation>
+					</m:annotations>
+					<m:id>32999a24-2ee0-4183-b7a6-211cff480a8e</m:id>
+					<m:name>companyName</m:name>
+					<m:title>所属公司名称</m:title>
+					<m:type>string</m:type>
+					<m:description>所属公司名称</m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations/>
+					<m:id>e37b2b41-5284-4af9-9cc4-32c6acfc15cd</m:id>
+					<m:name>regionalCompany</m:name>
+					<m:title>所属区域公司</m:title>
+					<m:type>com.xyst.dinas.biz.datamodel.Organization</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>30</m:value>
+						</m:annotation>
+					</m:annotations>
+					<m:id>22276007-8ba3-11eb-9292-98039b285ed0</m:id>
+					<m:name>deviceNumber</m:name>
+					<m:title>设备号</m:title>
+					<m:type>string</m:type>
+					<m:description>设备号</m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>30</m:value>
+						</m:annotation>
+					</m:annotations>
+					<m:id>ed34a415-dbb1-4914-8cf4-0fb9fa7545ee</m:id>
+					<m:name>account</m:name>
+					<m:title>账号</m:title>
+					<m:type>string</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>30</m:value>
+						</m:annotation>
+					</m:annotations>
+					<m:id>10e04d94-8381-4522-bb16-2d7e85d1230c</m:id>
+					<m:name>accountPassword</m:name>
+					<m:title>账户的密码</m:title>
+					<m:type>string</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations>
+						<m:annotation>
+							<m:type>bcp.type.constraint.StringLength</m:type>
+							<m:value>300</m:value>
+						</m:annotation>
+					</m:annotations>
+					<m:id>c50923e6-00df-401e-ab57-8699472d49f1</m:id>
+					<m:name>reason</m:name>
+					<m:title>备注</m:title>
+					<m:type>string</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+               <m:attribute>
+					<m:annotations></m:annotations>
+                    <m:id>7be63807-31fd-4f4b-85c1-293e433195cc</m:id>
+					<m:name>sortOrder</m:name>
+					<m:title>排序</m:title>
+					<m:type>int</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+			</m:attributes>
+		</m:class>
+	</content>
+</metadata>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Station.jmx

@@ -10,7 +10,7 @@
 	<dependency>bcp.type.constraint.StringLength</dependency>
 	<dependency>com.beecode.bap.staff.datamodel.Staff</dependency>
 	<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
-	<dependency>com.beecode.bap.department.datamodel.Department</dependency>
+	<dependency>com.xyst.dinas.biz.datamodel.Organization</dependency>
 	<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
 	<dependency>com.xyst.dinas.biz.datamodel.DinasType</dependency>
 	<content>
@@ -41,9 +41,9 @@
 				<m:attribute>
 					<m:annotations/>
 					<m:id>19f58e91-61b8-4a8d-a5e0-d530fdf38cf8</m:id>
-					<m:name>department</m:name>
-					<m:title>所属部门</m:title>
-					<m:type>com.beecode.bap.department.datamodel.Department</m:type>
+					<m:name>regionalCompany</m:name>
+					<m:title>所属区域公司</m:title>
+					<m:type>com.xyst.dinas.biz.datamodel.Organization</m:type>
 					<m:description></m:description>
 					<m:default></m:default>
 				</m:attribute>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/ShipInfo.jmx

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
+	<specification>1.0</specification>
+	<id>c50923e6-00df-401e-ab57-8699472d49f1</id>
+	<name>com.xyst.dinas.biz.query.ShipInfo</name>
+	<title>船舶备案</title>
+	<description>船舶备案</description>
+	<define>inz.query.Query</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.biz.datamodel.ShipInfo</dependency>
+	<content>
+		<m:query>
+			<m:type>com.xyst.dinas.biz.datamodel.ShipInfo</m:type>
+			<m:dataProcessor/>
+			<m:authorityItem/>
+			<m:innerScenes>
+				<m:innerScene>
+					<m:id>28b446ed-5923-4820-ba46-a711feb1a114</m:id>
+					<m:title>全部</m:title>
+					<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
+					<m:defaultExecute></m:defaultExecute>
+					<m:hide></m:hide>
+				</m:innerScene>
+				<m:innerScene>
+					<m:id>eeabf2ef-83a2-4c21-aeec-70b2440cc5e9</m:id>
+					<m:title>已废弃</m:title>
+					<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
+					<m:defaultExecute></m:defaultExecute>
+					<m:hide></m:hide>
+				</m:innerScene>
+			</m:innerScenes>
+			<m:fields>
+				<m:field>
+					<m:name>id</m:name>
+					<m:title>id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>regionalCompany.id</m:name>
+					<m:title>区域公司</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.Organization</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>regionalCompany.name</m:name>
+					<m:title>区域公司名称</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.Organization</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>createTime</m:name>
+					<m:title>创建时间</m:title>
+					<m:type>datetime</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>creator.name</m:name>
+					<m:title>创建人</m:title>
+					<m:type>string</m:type>
+					<m:ref/>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>modifyTime</m:name>
+					<m:title>修改时间</m:title>
+					<m:type>datetime</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>modifier</m:name>
+					<m:title>修改人</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>discard</m:name>
+					<m:title>废弃</m:title>
+					<m:type>boolean</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>shipName</m:name>
+					<m:title>船舶名称</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>shipCodeNum</m:name>
+					<m:title>船舶编号</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>deviceNumber</m:name>
+					<m:title>设备序列号</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>description</m:name>
+					<m:title>描述</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>account</m:name>
+					<m:title>账户</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>accountPassword</m:name>
+					<m:title>密码</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>del</m:name>
+					<m:title>是否删除</m:title>
+					<m:type>boolean</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>sortOrder</m:name>
+					<m:title>排序</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+			</m:fields>
+		</m:query>
+	</content>
+</metadata>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/StationInfoApply.jmx

@@ -61,21 +61,21 @@
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>department.id</m:name>
+					<m:name>regionalCompany.id</m:name>
 					<m:title>所属部门id</m:title>
 					<m:type>uuid</m:type>
 					<m:ref>
-						<m:name>com.beecode.bap.department.datamodel.Department</m:name>
+						<m:name>com.xyst.dinas.biz.datamodel.Organization</m:name>
 						<m:type></m:type>
 					</m:ref>
 					<m:desc></m:desc>
 				</m:field>
 				<m:field>
-					<m:name>department.name</m:name>
+					<m:name>regionalCompany.name</m:name>
 					<m:title>所属部门名称</m:title>
 					<m:type>string</m:type>
 					<m:ref>
-						<m:name>com.beecode.bap.department.datamodel.Department</m:name>
+						<m:name>com.xyst.dinas.biz.datamodel.Organization</m:name>
 						<m:type></m:type>
 					</m:ref>
 					<m:desc></m:desc>

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

@@ -11,27 +11,39 @@
         </id>
         <version name="version" type="int" column="version"/>
         <property name="createTime" type="timestamp" not-null="false">
-            <column name="create_time"/>
+            <column name="create_time"></column>
         </property>
         <many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
             <column name="creator_id"  not-null="false"/>
         </many-to-one>
         <property name="modifyTime" type="timestamp" not-null="false">
-            <column name="modify_time"/>
+            <column name="modify_time"></column>
         </property>
         <many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
             <column name="modifier_id"  not-null="false"/>
         </many-to-one>
-        <property name="del" type="boolean" not-null="false">
-            <column name="del" default="false"/>
+        <property name="billState" type="nstring" not-null="false">
+            <column name="bill_state" length="100"></column>
+        </property>
+        <many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
+            <column name="biz_process_id"  not-null="false"/>
+        </many-to-one>
+        <property name="billCode" type="nstring" not-null="false">
+            <column name="bill_code" length="200"></column>
         </property>
         <property name="discard" type="boolean" not-null="false">
-            <column name="discard" default="false" />
+            <column name="discard"></column>
+        </property>
+        <property name="del" type="boolean" not-null="false">
+            <column name="del"></column>
+        </property>
+        <property name="approveState" type="integer" not-null="false">
+            <column name="approve_state"></column>
         </property>
 
-        <many-to-one name="department" entity-name="com.beecode.bap.department.datamodel.Department" fetch="select">
-            <column name="department"  not-null="false">
-                <comment>所属部门</comment>
+        <many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.Organization" fetch="select">
+            <column name="regional_company"  not-null="false">
+                <comment>所属组织机构</comment>
             </column>
         </many-to-one>
         <property name="cameraName" type="nstring" not-null="true">

backend/xyst.dinas.biz/src/main/resources/config/DinasType.hbm.xml

@@ -11,27 +11,39 @@
         </id>
         <version name="version" type="int" column="version"/>
         <property name="createTime" type="timestamp" not-null="false">
-            <column name="create_time"/>
+            <column name="create_time"></column>
         </property>
         <many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
             <column name="creator_id"  not-null="false"/>
         </many-to-one>
         <property name="modifyTime" type="timestamp" not-null="false">
-            <column name="modify_time"/>
+            <column name="modify_time"></column>
         </property>
         <many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
             <column name="modifier_id"  not-null="false"/>
         </many-to-one>
-        <property name="del" type="boolean" not-null="false">
-            <column name="del" default="false"/>
+        <property name="billState" type="nstring" not-null="false">
+            <column name="bill_state" length="100"></column>
+        </property>
+        <many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
+            <column name="biz_process_id"  not-null="false"/>
+        </many-to-one>
+        <property name="billCode" type="nstring" not-null="false">
+            <column name="bill_code" length="200"></column>
         </property>
         <property name="discard" type="boolean" not-null="false">
-            <column name="discard" default="false" />
+            <column name="discard"></column>
+        </property>
+        <property name="del" type="boolean" not-null="false">
+            <column name="del"></column>
+        </property>
+        <property name="approveState" type="integer" not-null="false">
+            <column name="approve_state"></column>
         </property>
 
-        <many-to-one name="department" entity-name="com.beecode.bap.department.datamodel.Department" fetch="select">
-            <column name="department"  not-null="false">
-                <comment>所属部门</comment>
+        <many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.Organization" fetch="select">
+            <column name="regional_company"  not-null="false">
+                <comment>所属组织机构</comment>
             </column>
         </many-to-one>
         <property name="dinasTypeName" type="nstring" not-null="true">

backend/xyst.dinas.biz/src/main/resources/config/ShipInfo.hbm.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
+                   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.ShipInfo" table="xyst_dinas_biz_ship_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">
+            <generator class="assigned" />
+        </id>
+        <version name="version" type="int" column="version"/>
+        <property name="createTime" type="timestamp" not-null="false">
+            <column name="create_time"></column>
+        </property>
+        <many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
+            <column name="creator_id"  not-null="false"/>
+        </many-to-one>
+        <property name="modifyTime" type="timestamp" not-null="false">
+            <column name="modify_time"></column>
+        </property>
+        <many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
+            <column name="modifier_id"  not-null="false"/>
+        </many-to-one>
+        <property name="billState" type="nstring" not-null="false">
+            <column name="bill_state" length="100"></column>
+        </property>
+        <many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
+            <column name="biz_process_id"  not-null="false"/>
+        </many-to-one>
+        <property name="billCode" type="nstring" not-null="false">
+            <column name="bill_code" length="200"></column>
+        </property>
+        <property name="discard" type="boolean" not-null="false">
+            <column name="discard"></column>
+        </property>
+        <property name="del" type="boolean" not-null="false">
+            <column name="del"></column>
+        </property>
+        <property name="approveState" type="integer" not-null="false">
+            <column name="approve_state"></column>
+        </property>
+
+        <many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.Organization" fetch="select">
+            <column name="regional_company"  not-null="false">
+                <comment>所属组织机构</comment>
+            </column>
+        </many-to-one>
+        <property name="shipName" type="nstring">
+            <column name="ship_name" length="30"  >
+                <comment>船舶名称</comment>
+            </column>
+        </property>
+        <property name="shipCodeNum" type="nstring">
+            <column name="ship_code_num" length="30"  >
+                <comment>船舶编号</comment>
+            </column>
+        </property>
+        <property name="companyName" type="nstring">
+            <column name="company_name" length="30"  >
+                <comment>所属公司</comment>
+            </column>
+        </property>
+        <property name="deviceNumber" type="nstring" length="80"  not-null="false">
+            <column name="device_number">
+                <comment>设备序列号</comment>
+            </column>
+        </property>
+        <property name="account" type="nstring" not-null="false">
+            <column name="account">
+                <comment>账号</comment>
+            </column>
+        </property>
+        <property name="accountPassword" type="nstring" not-null="false">
+            <column name="account_password">
+                <comment>账户的密码</comment>
+            </column>
+        </property>
+        <property name="reason" type="nstring" not-null="false">
+            <column name="reason" length="300" >
+                <comment>备注</comment>
+            </column>
+        </property>
+        <property name="sortOrder" type="int" not-null="true"  unique="true" index="station_sort_index" >
+            <column name="sort_order" length="10">
+                <comment >排序</comment>
+            </column>
+        </property>
+    </class>
+</hibernate-mapping>
\ No newline at end of file

backend/xyst.dinas.biz/src/main/resources/config/Station.hbm.xml

@@ -10,34 +10,44 @@
         </id>
         <version name="version" type="int" column="version"/>
         <property name="createTime" type="timestamp" not-null="false">
-            <column name="create_time"/>
+            <column name="create_time"></column>
         </property>
         <many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
             <column name="creator_id"  not-null="false"/>
         </many-to-one>
         <property name="modifyTime" type="timestamp" not-null="false">
-            <column name="modify_time"/>
+            <column name="modify_time"></column>
         </property>
         <many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
             <column name="modifier_id"  not-null="false"/>
         </many-to-one>
-        <property name="del" type="boolean" not-null="false">
-            <column name="del" default="false"/>
+        <property name="billState" type="nstring" not-null="false">
+            <column name="bill_state" length="100"></column>
+        </property>
+        <many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
+            <column name="biz_process_id"  not-null="false"/>
+        </many-to-one>
+        <property name="billCode" type="nstring" not-null="false">
+            <column name="bill_code" length="200"></column>
         </property>
         <property name="discard" type="boolean" not-null="false">
-            <column name="discard" default="false" />
+            <column name="discard"></column>
+        </property>
+        <property name="del" type="boolean" not-null="false">
+            <column name="del"></column>
+        </property>
+        <property name="approveState" type="integer" not-null="false">
+            <column name="approve_state"></column>
         </property>
 
-        <many-to-one name="department" entity-name="com.beecode.bap.department.datamodel.Department" fetch="select">
-            <column name="department"  not-null="false">
+        <many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.Organization" fetch="select">
+            <column name="regional_company"  not-null="false">
                 <comment>所属部门</comment>
-
             </column>
         </many-to-one>
         <property name="stationName" type="nstring" not-null="true">
             <column name="station_name" length="30"  >
                 <comment>场站名称</comment>
-
             </column>
         </property>
         <property name="stationAddress" type="nstring" length="80"  not-null="false">
@@ -61,13 +71,11 @@
         <property name="linkMan" type="nstring" not-null="false">
             <column name="link_man">
                 <comment>联系人</comment>
-
             </column>
         </property>
         <property name="openingDate" type="timestamp" not-null="false">
             <column name="opening_date">
                 <comment>开业时间</comment>
-
             </column>
         </property>
         <property name="telephone" type="nstring" not-null="false">