Skip to content

C
cloud-fb
Commit 0183111d by 王衍超
Options

解决冲突

parents 652bd6f0 e059398f
Showing with 546 additions and 137 deletions
backend/build.war/build.gradle
......@@ -139,6 +139,7 @@ dependencies {
compile "com.beecode:xyst.dinas.project:${inzVersion}"
compile "com.beecode:xyst.dinas.production:${inzVersion}"
compile "com.beecode:xyst.dinas.contract:${inzVersion}"
compile "com.beecode:xyst.dinas.camera:${inzVersion}"
providedRuntime lib.spring_boot_starter_tomcat
}
......
backend/build.war/settings.gradle
......@@ -16,6 +16,7 @@ includeBuild("../") {
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.contract') with project(':xyst.dinas.contract')
substitute module('com.beecode:xyst.dinas.camera') with project(':xyst.dinas.camera')
}
}
......
backend/inz.authentication/src/main/java/com/beecode/inz/authentication/handler/RESTWarehouseUserAuthenticationSuccessHandler.java
......@@ -56,6 +56,7 @@ public class RESTWarehouseUserAuthenticationSuccessHandler extends SimpleUrlAuth
session.setAttribute(AuthcConstants.USERNAME, warehouseUser.getUsername());
session.setAttribute(AuthcConstants.TELEPHONE, warehouseUser.getTelephone());
session.setAttribute(AuthcConstants.TITLE, warehouseUser.getTitle());
session.setAttribute("stationId", warehouseUser.getStationId());
session.setAttribute("mobile", true);
session.setMaxInactiveInterval(30 * 24 * 60 * 60);
......@@ -69,6 +70,7 @@ public class RESTWarehouseUserAuthenticationSuccessHandler extends SimpleUrlAuth
returnJson.put(AuthcConstants.USERNAME, warehouseUser.getUsername());
returnJson.put(AuthcConstants.TELEPHONE, warehouseUser.getTelephone());
returnJson.put(AuthcConstants.TITLE, warehouseUser.getTitle());
returnJson.put("stationId", warehouseUser.getStationId());
returnJson.put(AuthcConstants.MESSAGE, "success");
returnJson.put(AuthcConstants.TOKEN, attr.getSessionId());
returnJson.put(AuthcConstants.TENANT, tenant);
......
backend/inz.authentication/src/main/java/com/beecode/inz/authentication/handler/SandUserAuthenticationSuccessHandler.java
......@@ -55,6 +55,7 @@ public class SandUserAuthenticationSuccessHandler extends SimpleUrlAuthenticatio
request.getSession().setAttribute(AuthcConstants.USERNAME, SandUser.getUsername());
request.getSession().setAttribute(AuthcConstants.TELEPHONE, SandUser.getTelephone());
request.getSession().setAttribute(AuthcConstants.TITLE, SandUser.getTitle());
request.getSession().setAttribute("sandId", SandUser.getSandId());
request.getSession().setAttribute("mobile", true);
request.getSession().setMaxInactiveInterval(30 * 24 * 60 * 60);
......@@ -67,6 +68,7 @@ public class SandUserAuthenticationSuccessHandler extends SimpleUrlAuthenticatio
returnJson.put(AuthcConstants.USERNAME, SandUser.getUsername());
returnJson.put(AuthcConstants.TELEPHONE, SandUser.getTelephone());
returnJson.put(AuthcConstants.TITLE, SandUser.getTitle());
returnJson.put("sandId", SandUser.getSandId());
returnJson.put(AuthcConstants.MESSAGE, "success");
returnJson.put(AuthcConstants.TOKEN, attr.getSessionId());
returnJson.put(AuthcConstants.TENANT, tenant);
......
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/CompanyFunctionTree.jmx
......@@ -24,7 +24,7 @@
<m:function-node>
<m:id>4620e40f-16f7-49f6-8057-74aa5d775c90</m:id>
<m:name>project</m:name>
<m:title>项目</m:title>
<m:title>项目管理</m:title>
<m:index>2000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
......@@ -52,7 +52,7 @@
<m:function-node>
<m:id>1e294249-8e89-4f45-a726-0af521eae11f</m:id>
<m:name>contract</m:name>
<m:title>合同</m:title>
<m:title>合同管理</m:title>
<m:index>2000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
......@@ -90,26 +90,26 @@
<m:children>
<m:function-node>
<m:id>11d8825c-b22d-4f63-b09a-900d891089be</m:id>
<m:name>demand_plan_list_company</m:name>
<m:title>日常计划</m:title>
<m:name>demand_plan_list_company_apply</m:name>
<m:title>需用计划申报</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-demand-plan-list-company</m:view>
<m:view>function-demand-plan-list-company-apply</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
</m:function-node>
<m:function-node>
<m:id>502607c8-1f5b-4962-b992-34561e60fe86</m:id>
<m:name>temporary_demand_plan_list_company</m:name>
<m:title>临时计划</m:title>
<m:id>502607c8-1f5b-4962-b992-34561e60e86</m:id>
<m:name>demand_plan_list_company_analyse</m:name>
<m:title>需用计划分析</m:title>
<m:index>2000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-temporary-demand-plan-list-company</m:view>
<m:view>function-demand-plan-list-company-analyse</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
......@@ -144,7 +144,7 @@
<m:function-node>
<m:id>b078b97e-4e8f-40f9-b015-f3de02b29f6e</m:id>
<m:name>refund_detail_company</m:name>
<m:title>退款明细</m:title>
<m:title>退款记录</m:title>
<m:index>2000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
......
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/StationFunctionTree.jmx
......@@ -24,7 +24,7 @@
<m:function-node>
<m:id>ee5fbc98-afad-4cd8-abf6-e6ecc21adca9</m:id>
<m:name>monitoring</m:name>
<m:title>监控</m:title>
<m:title>场站监控</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
......@@ -48,10 +48,116 @@
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
<m:id>6c6d3ec1-86a5-447f-9ec0-9d36478365f1</m:id>
<m:name>market</m:name>
<m:title>销售管理</m:title>
<m:index>1100</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>5df59482-f155-45af-912f-96781f7fb059</m:id>
<m:name>market_plan_view</m:name>
<m:title>销售计划查看</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-market-plan-view</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
</m:function-node>
<m:function-node>
<m:id>01b03c7a-0bda-45aa-891f-50b4d655da10</m:id>
<m:name>vehicle_tation_record</m:name>
<m:title>车辆进出场记录</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-vehicle-station-record</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
</m:function-node>
<m:function-node>
<m:id>9d208f3a-5d03-4f19-ada4-ca1b259cdd6f</m:id>
<m:name>sale_record</m:name>
<m:title>销售明细</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-sale-record</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
<m:id>19158c7d-82e1-4cb9-804b-eb8065f1d4fa</m:id>
<m:name>retail_customer</m:name>
<m:title>散户管理</m:title>
<m:index>1200</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>functions</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>bc7e3b2c-b7ab-4eeb-a1cd-e36f81400380</m:id>
<m:name>retail_customer_list</m:name>
<m:title>散户登记</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-retail-customer-list</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
</m:function-node>
<m:function-node>
<m:id>4a8ae571-915f-4634-820b-1161cdf136fd</m:id>
<m:name>buy_warning</m:name>
<m:title>购买预警</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-buy-warning</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
</m:function-node>
<m:function-node>
<m:id>0f561700-c507-4d38-921b-a31a7e749ed5</m:id>
<m:name>buy_warning_setting</m:name>
<m:title>预警设置</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-buy-warning-setting</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
</m:function-node>
</m:children>
</m:function-node>
<m:function-node>
<m:id>a65c2aa3-65bf-4f17-9964-4909417a1e02</m:id>
<m:name>price</m:name>
<m:title>价格</m:title>
<m:title>价格管理</m:title>
<m:index>2000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
......@@ -62,26 +168,26 @@
<m:children>
<m:function-node>
<m:id>c1c92b1a-2107-452f-be94-37360c29cf2e</m:id>
<m:name>todayPriceStation</m:name>
<m:title>今日砂价</m:title>
<m:name>price_trend</m:name>
<m:title>价格行情</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-today-price-station</m:view>
<m:view>function-price-trend</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
</m:function-node>
<m:function-node>
<m:id>98d7db3e-7ed9-4916-8202-b984f021efe5</m:id>
<m:name>price-history-list-station</m:name>
<m:title>历史价格查询</m:title>
<m:name>modify_price_apply</m:name>
<m:title>调价申请</m:title>
<m:index>2000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
<m:function-definition>
<m:view>function-price-history-list-station</m:view>
<m:view>function-modify-price-apply</m:view>
<m:view-config></m:view-config>
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
......
backend/settings.gradle
......@@ -14,4 +14,5 @@ include "xyst.dinas.biz"
include "xyst.dinas.project"
include "xyst.dinas.production"
include "xyst.dinas.contract"
include "xyst.dinas.camera"
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/CommonConfiguration.java 0 → 100644
package com.xyst.dinas.biz.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.xyst.dinas.biz.web.CommonController;
@Configuration
public class CommonConfiguration {
@Bean
public CommonController commonController() {
return new CommonController();
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasOrganizationDaoImpl.java
......@@ -67,7 +67,7 @@ public class DinasOrganizationDaoImpl implements DinasOrganizationDao, DinasOrga
return template.execute(session -> {
List<Map<String, Object>> result = new ArrayList<>();
String hql = "select f.following.id, f.following.name, f.following.code, f.following.address, f.following.type from " + ORGANIZATION_FOLLOWER_ENTITY + " as f where f.member.id =:id" ;
String hql = "select f.following.id, f.following.name, f.following.code, f.following.address, f.following.department.id as departmentId, f.following.type from " + ORGANIZATION_FOLLOWER_ENTITY + " as f where f.member.id =:id" ;
Query<Tuple> query = session.createQuery(hql, Tuple.class);
query.setParameter("id", id);
List<Tuple> list = query.list();
......@@ -78,13 +78,15 @@ public class DinasOrganizationDaoImpl implements DinasOrganizationDao, DinasOrga
String name = tuple.get(1, String.class);
String code = tuple.get(2, String.class);
String address = tuple.get(3, String.class);
String type = tuple.get(4, String.class);
String type = tuple.get(5, String.class);
UUID departmentId = tuple.get(4, UUID.class);
Map<String, Object> map = new HashMap<>();
map.put("id", fid);
map.put("name", name);
map.put("code", code);
map.put("address", address);
map.put("type", type);
map.put("departmentId", departmentId);
result.add(map);
}
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java
......@@ -10,6 +10,8 @@ import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
import com.xyst.dinas.biz.constant.DinasTypeConstant;
import com.xyst.dinas.biz.dao.DinasOrganizationDao;
import com.xyst.dinas.biz.dao.DinasTypeDao;
import com.xyst.dinas.biz.enumeration.OrganizationTypeEnum;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
......@@ -69,7 +71,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
public Page<KObject> listDinasTypeInfoPaging(Page<KObject> page) {
KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq("regionalCompany.id", getCurrentLoginRegionalCompany().getUuid("id")));
addRegionalConpanyFilter(detachedCriteria);
detachedCriteria.add(Restrictions.eq("del", false));
detachedCriteria.addOrder(Order.desc("sortOrder"));
page.setTotal(template.findByCriteria(detachedCriteria).size());
......@@ -79,6 +81,13 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
return page;
}
private void addRegionalConpanyFilter(DetachedCriteria detachedCriteria) {
KObject currentLoginRegionalCompany = getCurrentLoginRegionalCompany();
if(currentLoginRegionalCompany !=null&& currentLoginRegionalCompany.getString("type").equals(OrganizationTypeEnum.REGIONAL_COMPANY.name())) {
detachedCriteria.add(Restrictions.eq("regionalCompany.id", currentLoginRegionalCompany.getUuid("id")));
}
}
@Override
public List<KObject> getByName(String name, UUID id) {
......@@ -88,7 +97,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
// detachedCriteria.add(Restrictions.eq("department.id", departmentId));
detachedCriteria.add(Restrictions.eq("del", false));
detachedCriteria.add(Restrictions.eq("dinasTypeName", name));
detachedCriteria.add(Restrictions.eq("regionalCompany.id", getCurrentLoginRegionalCompany().getUuid("id")));
addRegionalConpanyFilter(detachedCriteria);
if (id != null) {
detachedCriteria.add(Restrictions.ne("id", id));
......@@ -187,10 +196,10 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
public KObject getCurrentLoginRegionalCompany() {
Map<String, String> map = bapContext.getCurrentUserDatas();
String currentRegionalCompany = map.get("currentRegionalCompany");
JSONObject obj = new JSONObject(currentRegionalCompany);
KObject regionalCompany = dinasOrganizationDao.load(UUID.fromString(obj.getString("id")));
return regionalCompany;
if(StringUtils.isNotBlank(currentRegionalCompany)){
JSONObject obj = new JSONObject(currentRegionalCompany);
return dinasOrganizationDao.load(UUID.fromString(obj.getString("id")));
}
return null;
}
}
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/ShipInfoDaoImpl.java
......@@ -6,12 +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.service.CameraInfoService;
import com.xyst.dinas.biz.enumeration.OrganizationTypeEnum;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.Order;
......@@ -63,7 +61,7 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq("del", false));
detachedCriteria.add(Restrictions.eq("regionalCompany.id", dinasTypeDao.getCurrentLoginRegionalCompany().getUuid("id")));
addRegionalCompanyFilter(detachedCriteria);
if(StringUtils.isNotBlank(shipName)){
detachedCriteria.add(Restrictions.like("shipName", "%"+shipName+"%"));
......@@ -79,6 +77,13 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
return page;
}
private void addRegionalCompanyFilter(DetachedCriteria detachedCriteria) {
KObject currentLoginRegionalCompany = dinasTypeDao.getCurrentLoginRegionalCompany();
if(currentLoginRegionalCompany !=null&& currentLoginRegionalCompany.getString("type").equals(OrganizationTypeEnum.REGIONAL_COMPANY.name())) {
detachedCriteria.add(Restrictions.eq("regionalCompany.id", currentLoginRegionalCompany.getUuid("id")));
}
}
@Override
public List<KObject> getByName(String name, UUID id) {
......
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/CommonController.java 0 → 100644
package com.xyst.dinas.biz.web;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import com.beecode.bap.department.service.DepartmentService;
import com.beecode.bcp.type.KObject;
@RestController
public class CommonController {
@Autowired
public DepartmentService departmentService;
/**
* @Description: 根据部门id查询全公司及其该部门的子部门（包括该部门自身）
* @param id
* @return return_type
* @throws
*/
@ResponseBody
@RequestMapping(value = "/dinasBiz/department/queryDepartmentById", method = RequestMethod.POST)
public List<KObject> queryDepartmentById(@RequestBody String body) {
JSONObject param = new JSONObject(body);
List<KObject> list = new ArrayList<KObject>();
if(param.isNull("id")) {
KObject rootLevel = departmentService.getByCode("quangongsi");
list.add(rootLevel);
} else {
String departmentId = param.getString("id");
Boolean enable = param.getBoolean("enable");
KObject rootLevel = departmentService.getByCode("quangongsi");
KObject regionalLevel = departmentService.getById(UUID.fromString(departmentId));
list.addAll(departmentService.getChildren(UUID.fromString(departmentId), enable));
list.add(rootLevel);
list.add(regionalLevel);
}
return list;
}
}
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/model/com/xyst/dinas/biz/datamodel/Organization.mk
......@@ -37,6 +37,12 @@
<annotation id='27df6ead-3e3a-49b1-aa7c-12d9da85d731' attributeId='52e44d71-7372-4cda-b5b2-481172210181' name='length' value='500'>
</annotation>
</attribute>
<attribute id='8a9c2549-d7fd-4874-970f-a38c7eaf4955' name='department' columnName='department' title='部门' type='com.beecode.bap.department.datamodel.Department' default='' precision='' isArray='false'>
<annotation id='31b269b5-aa63-440d-8ca0-6e9a8d54e5d3' attributeId='b6231426-0fb5-47c3-a7ce-75408c4135b0' name='mappingType' value='many-to-one'>
</annotation>
<annotation id='e5e8f543-dab6-40da-95b5-c2baa57c77ba' attributeId='836d59a8-aab9-413b-88b2-7d533168b02a' name='length' value='undefined'>
</annotation>
</attribute>
<hibernate>/xyst.dinas.biz/src/main/resources/config/Organization.hbm.xml</hibernate>
</dataModel>
</content>
......
backend/xyst.dinas.biz/src/main/model/com/xyst/dinas/biz/query/Organization.mk
......@@ -140,6 +140,24 @@
</ref>
<description></description>
</field>
<field title='所属部门id'>
<name>department.id</name>
<type>uuid</type>
<ref>
<type></type>
<name>com.beecode.bap.department.datamodel.Department</name>
</ref>
<description></description>
</field>
<field title='所属部门名称'>
<name>department.name</name>
<type>string</type>
<ref>
<type></type>
<name>com.beecode.bap.department.datamodel.Department</name>
</ref>
<description></description>
</field>
</customQuery>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.biz/src/main/resources/META-INF/spring.factories
......@@ -3,7 +3,7 @@ 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
com.xyst.dinas.biz.config.BizDataInitializerConfig,\
com.xyst.dinas.biz.config.CommonConfiguration
\ No newline at end of file
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$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>dfb7f056-45df-4e88-87fc-17d27d03dc78</id>
<id>e88766b0-c5c0-4fb5-bae6-ed46df030630</id>
<name>com.xyst.dinas.biz.bill.Organization$sequence</name>
<title>组织机构$sequence</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization$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>02f6bba7-b333-493c-a400-74d6c0588cc1</id>
<id>b368eed4-6214-45a1-8e8d-6051d38baa90</id>
<name>com.xyst.dinas.biz.bill.Organization$serial</name>
<title>组织机构$serial</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/bill/Organization.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>5d8ece8d-d87c-4b01-a700-15425f3747c9</id>
<id>d02a3019-ee62-4861-8819-93e50e78b8fa</id>
<name>com.xyst.dinas.biz.bill.Organization</name>
<title>组织机构</title>
<description>组织机构</description>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/DinasType.jmx
......@@ -40,7 +40,7 @@
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>19f58e91-61b8-4a8d-a5e0-d530fdf38cf8</m:id>
<m:id>cdaced8b-be3f-440e-a0f3-ce9ae701124a</m:id>
<m:name>regionalCompany</m:name>
<m:title>所属组织机构</m:title>
<m:type>com.xyst.dinas.biz.datamodel.Organization</m:type>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/datamodel/Organization.jmx
......@@ -10,6 +10,7 @@
<dependency>bcp.type.constraint.StringLength</dependency>
<dependency>com.beecode.inz.common.datamodel.BaseInfo</dependency>
<dependency>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</dependency>
<dependency>com.beecode.bap.department.datamodel.Department</dependency>
<content>
<m:class>
<m:parents>
......@@ -101,6 +102,15 @@
<m:description></m:description>
<m:default></m:default>
</m:attribute>
<m:attribute>
<m:annotations/>
<m:id>8a9c2549-d7fd-4874-970f-a38c7eaf4955</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:attributes>
</m:class>
</content>
......
backend/xyst.dinas.biz/src/main/resources/com/xyst/dinas/biz/query/Organization.jmx
......@@ -160,6 +160,26 @@
</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:fields>
</m:query>
</content>
......
backend/xyst.dinas.biz/src/main/resources/config/Organization.hbm.xml
......@@ -54,6 +54,9 @@
<property name="address" type="nstring" not-null="false">
<column name="address" length="100"></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>
<property name="description" type="nstring" not-null="false">
<column name="description" length="500"></column>
</property>
......
backend/xyst.dinas.camera/build.gradle 0 → 100644
dependencies {
compile lib.bcp_import
compile lib.bcp_type
compile lib.bcp_store
compile lib.hibernate_core
compile lib.spring_web
compile lib.spring_boot_autoconfigure
compile lib.jackson_datatype_jdk8
compile lib.jackson_datatype_jsr310
compile lib.json
compile "com.beecode:bap2.participant:${aminoVersion}"
compile "com.beecode:bcp.org:${aminoVersion}"
compile "com.beecode:bap2.department:${aminoVersion}"
compile "com.beecode:bap2.staff:${aminoVersion}"
compile 'com.deepoove:poi-tl:1.5.0'
compile project(":inz.common")
compile project(":inz.query")
compile project(":inz.workflow")
compile project(":inz.basis")
compile project(":inz.authentication")
compile project(":xyst.dinas.biz")
compile project(":xyst.dinas.production")
compile project(":xyst.dinas.project")
testCompile lib.amino_boot_web
testCompile lib.mysql_connector
}
backend/xyst.dinas.camera/settings.gradle 0 → 100644
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.camera/src/main/java/com/xyst/dinas/camera/config/StationCameraConfiguration.java 0 → 100644
package com.xyst.dinas.camera.config;
import com.xyst.dinas.camera.web.StationCameraPlayController;
import org.springframework.context.annotation.Bean;
public class StationCameraConfiguration {
@Bean
public StationCameraPlayController stationCameraPlayController(){
return new StationCameraPlayController();
}
}
\ No newline at end of file
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.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;
import org.hibernate.criterion.Order;
......@@ -57,7 +57,9 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq("del", false));
detachedCriteria.add(Restrictions.eq("regionalCompany.id", currentLoginRegionalCompany.getUuid("id")));
if(currentLoginRegionalCompany!=null&&currentLoginRegionalCompany.getString("type").equals(OrganizationTypeEnum.REGIONAL_COMPANY.name())) {
detachedCriteria.add(Restrictions.eq("regionalCompany.id", currentLoginRegionalCompany.getUuid("id")));
}
detachedCriteria.addOrder(Order.desc("sortOrder"));
if(null!=stationId){
detachedCriteria.add(Restrictions.eq("regionalStation.id", stationId));
......@@ -95,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);
......@@ -112,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;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
......@@ -73,11 +74,10 @@ public class CameraInfoServiceImpl implements CameraInfoService {
public KObject getCurrentLoginRegionalCompany() {
Map<String, String> map = bapContext.getCurrentUserDatas();
String currentRegionalCompany = map.get("currentRegionalCompany");
JSONObject obj = new JSONObject(currentRegionalCompany);
KObject regionalCompany = dinasOrganizationService.load(UUID.fromString(obj.getString("id")));
return regionalCompany;
if(StringUtils.isNotBlank(currentRegionalCompany)){
JSONObject obj = new JSONObject(currentRegionalCompany);
return dinasOrganizationService.load(UUID.fromString(obj.getString("id")));
}
return null;
}
}
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.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.camera/src/main/java/com/xyst/dinas/camera/web/StationCameraPlayController.java 0 → 100644
package com.xyst.dinas.camera.web;
import com.beecode.bap.attachment.common.Page;
import com.beecode.bcp.type.KObject;
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.camera.service.CameraInfoService;
import com.xyst.dinas.biz.service.StationService;
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;
import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.*;
/**
* @author scol
*/
@RequestMapping("/warehouse/api/cameraPlay")
@RestController
public class StationCameraPlayController {
@Autowired
private CameraInfoService cameraInfoService;
@Autowired
private CameraPlayService cameraPlayService;
@Autowired
private StationService stationService;
@Autowired
private WarehouseUserService warehouseUserService;
@GetMapping(value = "/getStationCameraTree")
public ResponseObj<ArrayList<Map<String, Object>>> getStationCameraTree() throws Exception {
Page<KObject> kObjectPage = new Page<>();
kObjectPage.setPageNo(1);
kObjectPage.setPageSize(1000);
ServletRequestAttributes attr = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
Object attribute = attr.getRequest().getSession().getAttribute(AuthcConstants.USERID);
UUID attribute1 = (UUID) attribute;
WarehouseUser byId = warehouseUserService.getById(attribute1);
KObject station = stationService.getById(byId.getStationId());
HashMap<String, Object> stringObjectHashMap;
ArrayList<Map<String, Object>> maps = new ArrayList<>();
stringObjectHashMap = new HashMap<>();
stringObjectHashMap.put("name",station.getString("stationName"));
stringObjectHashMap.put("id",station.getUuid("id"));
List<KObject> datas = cameraInfoService.queryByPaging(kObjectPage, station.getUuid("id"), null, null).getDatas();
for (KObject kObject : datas) {
String picUrl = cameraPlayService.capturePic(kObject.getUuid("id"),kObject.getString("deviceSerial"),kObject.getString("channelNo"));
kObject.set("videoUrl",picUrl);
}
stringObjectHashMap.put("cameras", datas);
maps.add(stringObjectHashMap);
return ResponseObj.response(200, "查询成功", maps);
}
/**
* @return
* @Description 云台控制
* @author zhouzy-a
* @date 2017年5月22日 下午1:47:41
* @direction 操作命令：0-上，1-下，2-左，3-右，4-左上，5-左下，6-右上，7-右下，8-放大，9-缩小，10-近焦距，11-远焦距
* @speed 云台速度：0-慢，1-适中，2-快
* @speed 控制操作：1-开始转动，2-停止转动
*/
@GetMapping("/ptzControl")
public ResponseObj ptzControl(UUID cameraId, int direction, int speed, int op) {
Map<String, Object> retMap = new HashMap<>();
retMap.put("status", "00");
try {
//调用后台服务
return cameraPlayService.ptzControl(cameraId, direction, speed, op);
} catch (Exception e) {
return ResponseObj.error("控制失败");
}
}
/**
*得到萤石云token
* @return
*/
@GetMapping("/getEZVIZToken/{id}")
public ResponseObj getEZVIZToken(@PathVariable("id")UUID id) {
//调用后台服务
String token = cameraPlayService.getEZVIZToken(id);
return ResponseObj.success(token);
}
/**
*获取萤石云文件信息
* @return
*/
@GetMapping("/getCameraVideFileInfo")
public ResponseObj getCameraVideFileInfo(@RequestParam("id") UUID id,@RequestParam(value = "startDate",required = false) Long startDate,@RequestParam(value ="endDate",required = false)Long endDate,@RequestParam(value ="recType",required = false)Integer recType) {
return ResponseObj.success("",cameraPlayService.getCameraVideFileInfo(id,startDate,endDate,recType));
}
/**
*获取萤石云状态
* @return
*/
@GetMapping("/getCameraStatus/{id}")
public ResponseObj getCameraStatus(@PathVariable("id") UUID id) {
return cameraPlayService.getCameraStatus(id);
}
}
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.camera/src/main/resources/META-INF/spring.factories 0 → 100644
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.xyst.dinas.camera.config.StationCameraConfiguration,\
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,8 +113,8 @@
<comment>所属场站</comment>
</column>
</many-to-one>
<many-to-one name="cameraAccount" entity-name="com.xyst.dinas.biz.dict.datamodel.CameraAccount" fetch="select">
<column name="camera_account" not-null="true" >
<many-to-one name="cameraAccount" entity-name="com.xyst.dinas.camera.dict.datamodel.CameraAccount" fetch="select">
<column name="camera_account" >
<comment>摄像头账号</comment>
</column>
</many-to-one>
......
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/config/ContractConfiguration.java
......@@ -29,5 +29,4 @@ public class ContractConfiguration {
return new ContractDaoImpl();
}
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/warn/IWarningCalculate.java
......@@ -7,6 +7,10 @@ package com.xyst.dinas.contract.warn;
*/
@FunctionalInterface
public interface IWarningCalculate {
boolean isWarning(WarnSetting warnSetting);
//boolean isRepeat();重复执行
}
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/warn/WarnSetting.java
......@@ -13,6 +13,10 @@ import java.util.UUID;
*/
public interface WarnSetting {
//触发时机
/** 预警开关:是否预警*/
boolean isWarning();
......
backend/xyst.dinas.production/src/main/resources/META-INF/spring.factories
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.xyst.dinas.production.config.CameraPlayConfiguration
\ No newline at end of file
org.springframework.boot.autoconfigure.EnableAutoConfiguration=
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment