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

# Conflicts:
#	backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/StationConfiguration.java

backend/build.war/settings.gradle

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

backend/inz.basis/src/main/java/com/beecode/inz/basis/internal/dao/AbstractBaseDao.java

@@ -156,9 +156,9 @@ public abstract class AbstractBaseDao {
 			if(whereAttributes != null && whereAttributes.size() > 0) {
 				StringBuffer where = new StringBuffer();
 				whereAttributes.keySet().forEach(key -> {
-					where.append(String.format("AND %s=:%s", key, key));
+					where.append(String.format(" AND %s=:%s", key, key));
 				});
-				where.replace(0, 3, " WHERE ");
+				where.replace(0, 4, " WHERE ");
 				
 				sql.append(where);
 			}

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

+package com.xyst.dinas.biz.constant;
+
+public interface StationConstant {
+
+	/**
+	 *
+	 */
+	String STATION = "com.xyst.dinas.biz.datamodel.Station";
+	
+	/**
+	 * 业务类型名称
+	 */
+	String BIZ_TYPE = "Station";
+	
+	/**
+	 * 业务类型标题
+	 */
+	String BIZ_TITLE = "场站管理";
+	
+	/**
+	 * 实体名
+	 */
+	String ENTITY = "com.xyst.dinas.biz.datamodel.Station";
+
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/dao/StationDao.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 StationDao extends BaseDao {
+
+    KObject load(UUID id);
+
+    Page<KObject> listStationInfoPaging(Page<KObject> page);
+
+    UUID create(KObject kObject);
+
+    int selectCountByName(String stationName);
+
+    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/entity/Station.java

+package com.xyst.dinas.biz.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+*  xyst_dinas_biz_station
+* @author scol 2021-03-15
+*/
+public class Station implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * id
+    */
+    private String id;
+
+    /**
+    * version
+    */
+    private Integer version;
+
+    /**
+    * create_time
+    */
+    private Date createTime;
+
+    /**
+    * creator_id
+    */
+    private String creatorId;
+
+    /**
+    * modify_time
+    */
+    private Date modifyTime;
+
+    /**
+    * modifier_id
+    */
+    private String modifierId;
+
+    /**
+    * del
+    */
+    private String del;
+
+    /**
+    * department
+    */
+    private String department;
+
+    /**
+    * station_name
+    */
+    private String stationName;
+
+    /**
+    * station_address
+    */
+    private String stationAddress;
+
+    /**
+    * station_status
+    */
+    private Integer stationStatus;
+
+    /**
+    * station_coordinate
+    */
+    private String stationCoordinate;
+
+    /**
+    * link_man
+    */
+    private String linkMan;
+
+    /**
+    * opening_date
+    */
+    private Date openingDate;
+
+    /**
+    * telephone
+    */
+    private String telephone;
+
+    /**
+    * reason
+    */
+    private String reason;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(String creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public String getDel() {
+        return del;
+    }
+
+    public void setDel(String del) {
+        this.del = del;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getStationAddress() {
+        return stationAddress;
+    }
+
+    public void setStationAddress(String stationAddress) {
+        this.stationAddress = stationAddress;
+    }
+
+    public Integer getStationStatus() {
+        return stationStatus;
+    }
+
+    public void setStationStatus(Integer stationStatus) {
+        this.stationStatus = stationStatus;
+    }
+
+    public String getStationCoordinate() {
+        return stationCoordinate;
+    }
+
+    public void setStationCoordinate(String stationCoordinate) {
+        this.stationCoordinate = stationCoordinate;
+    }
+
+    public String getLinkMan() {
+        return linkMan;
+    }
+
+    public void setLinkMan(String linkMan) {
+        this.linkMan = linkMan;
+    }
+
+    public Date getOpeningDate() {
+        return openingDate;
+    }
+
+    public void setOpeningDate(Date openingDate) {
+        this.openingDate = openingDate;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/StationInfoQueryProcessor.java

+package com.xyst.dinas.biz.internal;
+
+import com.beecode.inz.query.entity.RowData;
+import com.beecode.inz.query.processor.DataProcessor;
+import com.beecode.inz.query.processor.DataProcessorContext;
+
+import java.util.List;
+
+/**
+ * @author scol
+ */
+public class StationInfoQueryProcessor implements DataProcessor {
+
+    @Override
+    public void process(DataProcessorContext context) {
+        List<RowData> rowDatas = context.getRowDatas();
+        for (RowData rowData : rowDatas) {
+            Object stationStatus = rowData.get("stationStatus");
+            String stationStatusShowName = "";
+            if("0".equals(stationStatus)){
+                stationStatusShowName="已停业";
+            }else if ("1".equals(stationStatus)){
+                stationStatusShowName="经营中";
+            }
+            rowData.put("stationStatusShowName",stationStatusShowName);
+        }
+    }
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/StationDaoImpl.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.StationConstant;
+import com.xyst.dinas.biz.dao.StationDao;
+import org.hibernate.criterion.DetachedCriteria;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.hibernate5.HibernateOperations;
+import org.springframework.orm.hibernate5.HibernateTemplate;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+public class StationDaoImpl  extends AbstractBaseDao implements StationDao, StationConstant {
+	
+	@Autowired
+	private HibernateOperations operations;
+
+    @Autowired
+    private HibernateTemplate template;
+	@Override
+	public KObject load(UUID id) {
+		return (KObject) template.load(ENTITY, id);
+	}
+
+    @Override
+    public Page<KObject> listStationInfoPaging(Page<KObject> page) {
+        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("del", false));
+        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) {
+        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("del", false));
+        detachedCriteria.add(Restrictions.eq("stationName", 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",true);
+        template.merge(kobject);
+    }
+
+
+    @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());
+        kObject.set("del",false);
+        return ((UUID)template.save(kObject));
+    }
+
+    @Override
+    public int selectCountByName(String stationName) {
+        String departmentId = AminoContextHolder.getContext().getStaff().get("department").getUuid("id").toString();
+        return 0;
+    }
+
+    @Override
+    public void deleteById(UUID id) {
+        KObject staff = AminoContextHolder.getContext().getStaff();
+        KObject kobject = (KObject) template.load(STATION, id);
+        kobject.set("modifyTime",new Date());
+        kobject.set("modifier.id",staff.getUuid("id"));
+        kobject.set("del",true);
+        template.update(kobject);
+    }
+
+
+    /**
+     * 抽象方法，需要实现类提供HibernateTemplate
+     *
+     * @return HibernateTemplate
+     */
+    @Override
+    protected HibernateTemplate getHibernateTemplate() {
+        return template;
+    }
+
+    /**
+     * 抽象方法，需要实现类提供当前ModelName
+     *
+     * @return String
+     */
+    @Override
+    protected String getModelName() {
+        return StationConstant.ENTITY;
+    }
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/StationServiceImpl.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.StationDao;
+import com.xyst.dinas.biz.service.StationService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.UUID;
+
+@Transactional(rollbackFor = Exception.class)
+public class StationServiceImpl implements StationService {
+
+	@Autowired
+	private StationDao stationDao;
+
+    @Override
+    public Page<KObject> queryByPaging(Page<KObject> page) throws Exception {
+        if(page.getPageNo()==0||page.getPageSize()==0) {
+            throw new Exception("pageSize or offset is null");
+        }
+        return stationDao.listStationInfoPaging(page);
+    }
+
+    @Override
+    public UUID addStation(KObject kObject) {
+        return stationDao.create(kObject);
+    }
+
+    @Override
+    public KObject getById(UUID id) {
+        return stationDao.load(id);
+    }
+
+    @Override
+    public int selectCountByName(String stationName) {
+        return stationDao.selectCountByName(stationName);
+    }
+
+    @Override
+    public KObject getByName(String name, UUID id) {
+        List<KObject> kObjects = stationDao.getByName(name,id);
+        if(CollectionUtils.isEmpty(kObjects)){
+            return null;
+        }
+        return kObjects.get(0);
+    }
+
+    @Override
+    public void update(KObject kobject) {
+
+      stationDao.modify(kobject);
+    }
+
+    @Override
+    public void deleteById(UUID id) {
+        stationDao.deleteById(id);
+    }
+}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/service/StationService.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 StationService {
+
+    Page<KObject> queryByPaging(Page<KObject> page) throws Exception;
+
+    UUID addStation(KObject kObject);
+
+    KObject getById(UUID id);
+
+    int selectCountByName(String stationName);
+
+    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/StationController.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.entity.OperationTeam;
+import com.beecode.inz.basis.team.pojo.ResponseObj;
+import com.beecode.inz.message.internal.QueryParam;
+import com.beecode.inz.message.remind.RemindSettingsInfo;
+import com.beecode.inz.workflow.constants.InzWorkflowDefinitionConstants;
+import com.beecode.nlib.utils.StringUtils;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.xyst.dinas.biz.constant.StationConstant;
+import com.xyst.dinas.biz.entity.Station;
+import com.xyst.dinas.biz.service.StationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author scol
+ */
+@RestController()
+@RequestMapping(value="/biz/stationInfo")
+
+public class StationController {
+	
+	private static final Logger logger = LoggerFactory.getLogger(StationController.class);
+
+	@Autowired
+	private StationService stationService;
+
+
+
+
+    @RequestMapping(value = "list/page", method = RequestMethod.GET)
+    public Page<KObject> getStaffByRole(
+                                          @RequestParam(name = "pageNo", required = false) Integer pageNo,
+                                          @RequestParam(name = "pageSize", required = false) Integer pageSize) throws Exception {
+
+        Page<KObject> objectPage = new Page<>();
+        objectPage.setPageNo(pageNo);
+        objectPage.setPageSize(pageSize);
+        return stationService.queryByPaging(objectPage);
+    }
+
+
+    /**
+     * 新建场站
+     * @param body
+     * @return ResponseObj
+     */
+    @PostMapping
+    public ResponseObj create(@RequestBody String body){
+        KObject kobject = JSONObjectUtils.toObject(body,Amino.getApplicationMetadataContext().getBean(StationConstant.ENTITY, KClass.class));
+
+        if(StringUtils.isEmpty(kobject.getString("stationName"))){
+            return ResponseObj.error(400,"场站名称不能为空");
+        }
+        if(StringUtils.isEmpty(kobject.getString("stationAddress"))){
+            return ResponseObj.error(400,"场站地址不能为空");
+        }
+        if(StringUtils.isEmpty(kobject.getString("stationCoordinate"))){
+            return ResponseObj.error(400,"坐标点不能为空");
+        }
+        if(StringUtils.isEmpty(kobject.getString("linkMan"))){
+            return ResponseObj.error(400,"联系人不能为空");
+        }
+        if(StringUtils.isEmpty(kobject.getString("telephone"))){
+            return ResponseObj.error(400,"联系人电话不能为空");
+        }
+        UUID id = stationService.addStation(kobject);
+        return ResponseObj.success("保存成功", id);
+    }
+
+    /**
+     * 修改场站
+     * @param body 场站json
+     * @return
+     */
+    @PutMapping
+    public ResponseObj update(@RequestBody String body){
+        KObject kobject = JSONObjectUtils.toObject(body,Amino.getApplicationMetadataContext().getBean(StationConstant.ENTITY, KClass.class));
+
+        if(StringUtils.isEmpty(kobject.getString("stationName"))){
+            return ResponseObj.error(400,"场站名称不能为空");
+        }
+        if(StringUtils.isEmpty(kobject.getString("stationAddress"))){
+            return ResponseObj.error(400,"场站地址不能为空");
+        }
+        if(StringUtils.isEmpty(kobject.getString("stationCoordinate"))){
+            return ResponseObj.error(400,"坐标点不能为空");
+        }
+        if(StringUtils.isEmpty(kobject.getString("linkMan"))){
+            return ResponseObj.error(400,"联系人不能为空");
+        }
+        if(StringUtils.isEmpty(kobject.getString("telephone"))){
+            return ResponseObj.error(400,"联系人电话不能为空");
+        }
+        if(kobject.getUuid("id") == null){
+            return ResponseObj.error(400,"'id' must be not null!");
+        }
+        stationService.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 =  stationService.getById(id);
+        return ResponseObj.success("修改成功",station);
+    }
+
+    /**
+     * 根据Id删除场站
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    public ResponseObj<Object> deleteMemberByStaffId(@PathVariable("id") UUID id){
+        if(id == null){
+            return ResponseObj.error(400,"'id' must be not null!");
+        }
+        stationService.deleteById(id);
+        return ResponseObj.success("删除成功");
+    }
+
+
+    /**
+     * 查询是否有重名
+     * @param name
+     * @return
+     */
+    @GetMapping("/validateName")
+    public ResponseObj<Object> validateName(@RequestParam("name") String name,@RequestParam("id") UUID id){
+        if(StringUtils.isEmpty(name)){
+            return ResponseObj.error(400,"场站名称不能为空");
+        }
+        KObject kObject = stationService.getByName(name,id);
+        if(kObject != null){
+            return ResponseObj.error("场站名称已存在!");
+        }
+        return ResponseObj.success();
+    }
+
+}
\ No newline at end of file

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Station.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-type">
+	<specification>1.0</specification>
+	<id>4ce6ac23-0efc-48fd-be06-9f5d284e1ecd</id>
+	<name>com.xyst.dinas.biz.datamodel.Station</name>
+	<title>场站管理</title>
+	<description>场站管理</description>
+	<define>bcp.type.Class</define>
+	<define-version>1.0</define-version>
+	<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.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:id>454f133a-ec58-46d0-bdc5-2857efac8ee6</m:id>
+					<m:name>stationName</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>f4427592-4ea6-4c6c-ab0b-834792e0828f</m:id>
+					<m:name>stationAddress</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>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:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations/>
+					<m:id>c7e790b4-efc8-4cc4-99f1-324ca09579e7</m:id>
+					<m:name>stationStatus</m:name>
+					<m:title>场站状态</m:title>
+					<m:type>int</m:type>
+					<m:description></m:description>
+					<m:default></m:default>
+				</m:attribute>
+				<m:attribute>
+					<m:annotations/>
+					<m:id>4957fc36-a43a-48d5-b0b2-4c551d677778</m:id>
+					<m:name>stationCoordinate</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>50</m:value>
+                        </m:annotation>
+                    </m:annotations>
+					<m:id>77d699e5-fb54-417c-98c2-9a950a14b662</m:id>
+					<m:name>linkMan</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>b4211477-b5b7-4036-9814-7e5affff7ea0</m:id>
+					<m:name>openingDate</m:name>
+					<m:title>开业时间</m:title>
+					<m:type>datetime</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>20</m:value>
+						</m:annotation>
+					</m:annotations>
+					<m:id>f77a03a0-6fdb-43a1-9be9-93c8857aae1c</m:id>
+					<m:name>telephone</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>07df337f-d640-4873-8bd7-e0878d56c187</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:attributes>
+		</m:class>
+	</content>
+</metadata>

backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/StationInfoApply.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>17949029-14df-48e6-8b8b-383e44383095</id>
+	<name>com.xyst.dinas.biz.query.StationInfoApply</name>
+	<title>场站管理</title>
+	<description>场站管理</description>
+	<define>inz.query.Query</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.biz.datamodel.Station</dependency>
+	<content>
+		<m:query>
+			<m:type>com.xyst.dinas.biz.datamodel.Station</m:type>
+			<m:dataProcessor>com.xyst.dinas.biz.internal.StationInfoQueryProcessor</m:dataProcessor>
+			<m:authorityItem></m:authorityItem>
+			<m:innerScenes>
+				<m:innerScene>
+					<m:id>054ad121-1501-4047-9574-0268bd08ba1b</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>d40d3b3b-5f67-4c96-bed3-3bc186d6433b</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>stationName</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>stationAddress</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>department.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:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>department.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: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.id</m:name>
+					<m:title>创建人id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.beecode.bap.staff.datamodel.Staff</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:name></m:name>
+						<m:type></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.name</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>modifier.id</m:name>
+					<m:title>修改人id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.beecode.bap.staff.datamodel.Staff</m:name>
+						<m:type>数据字典</m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>stationStatus</m:name>
+					<m:title>场站状态</m:title>
+					<m:type>int</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>
\ No newline at end of file

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

+<model>
+  <header>
+    <type>inz.query.Query</type>
+    <package>com.xyst.dinas.biz.datamodel.station.query</package>
+    <name>StationInfoApply</name>
+    <title>场站管理</title>
+    <tags></tags>
+    <description>场站管理</description>
+  </header>
+  <content>
+  <dataProcessor>com.xyst.dinas.biz.internal.StationInfoQueryProcessor</dataProcessor>
+    <customQuery id='18786102-8504-4c1f-a170-669a598b28a8'>
+      <kclass>com.xyst.dinas.biz.datamodel.Station</kclass>
+      <authorityItem></authorityItem>
+      <innerScene title='全部'>
+        <id>eb42e933-2469-4b9a-80b5-3b2cc2a363a8</id>
+        <javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
+        <defaultExecute></defaultExecute>
+        <hide></hide>
+      </innerScene>
+      <innerScene title='已废弃'>
+        <id>94b4afba-c7d4-4fed-a0ac-8c8df7fe36d2</id>
+        <javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
+        <defaultExecute></defaultExecute>
+        <hide></hide>
+      </innerScene>
+      <field title='id'>
+        <name>id</name>
+        <type>uuid</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='场站名称'>
+        <name>stationName</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='场站地址'>
+        <name>stationAddress</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='场站状态'>
+        <name>stationStatus_v</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+
+    </customQuery>
+  </content>
+</model>
\ No newline at end of file

backend/xyst.dinas.biz/src/main/resources/config/Station.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.Station" table="xyst_dinas_biz_station" 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"/>
+        </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"/>
+        </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>
+        <property name="discard" type="boolean" not-null="false">
+            <column name="discard" default="false" />
+        </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>
+        <property name="stationName" type="nstring" not-null="true">
+            <column name="station_name" length="30"  />
+        </property>
+        <property name="stationAddress" type="nstring" length="80"  not-null="false">
+            <column name="station_address"/>
+        </property>
+        <property name="stationStatus" type="integer" not-null="true">
+            <column name="station_status" />
+        </property>
+        <property name="stationCoordinate" type="nstring" not-null="false">
+            <column name="station_coordinate"/>
+        </property>
+        <property name="linkMan" type="nstring" not-null="false">
+            <column name="link_man"/>
+        </property>
+        <property name="openingDate" type="timestamp" not-null="false">
+            <column name="opening_date"/>
+        </property>
+        <property name="telephone" type="nstring" not-null="false">
+            <column name="telephone" length="50"/>
+        </property>
+        <property name="reason" type="nstring" not-null="false">
+            <column name="reason" length="300"/>
+        </property>
+    </class>
+</hibernate-mapping>
\ No newline at end of file