Skip to content

C
cloud-fb
Commit eacc3981 by shiwenbo
Options

修改功能树，增加购砂单位与场站附件查询接口

parent 8780c738
Showing with 46 additions and 42 deletions
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/CompanyFunctionTree.jmx
......@@ -141,19 +141,6 @@
</m:function-definition>
<m:icon>iconfont icon-qiyeshezhi</m:icon>
</m:function-node>
<m:function-node>
<m:id>b078b97e-4e8f-40f9-b015-f3de02b29f6e</m:id>
<m:name>refund_detail_company</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-refund-detail-company</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>
......@@ -168,36 +155,10 @@
<m:view-config></m:view-config>
</m:function-definition>
<m:children>
<m:function-node>
<m:id>c555b699-841c-4b73-b67e-efbe95603678</m:id>
<m:name>advance_detail_company</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-advance-detail-company</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>0d1f2b6e-804d-4a86-ac72-50d98e2452fd</m:id>
<m:name>guarantee_detail_company</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-guarantee-detail-company</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>a03d8f90-25f8-46ed-acc1-afba97a62017</m:id>
<m:name>payment_detail</m:name>
<m:title>扣款明细</m:title>
<m:title>销售明细</m:title>
<m:index>3000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
......
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
......@@ -446,7 +446,7 @@
<m:function-node>
<m:id>72809fb1-acab-496d-874d-a75580468a29</m:id>
<m:name>finance</m:name>
<m:title>财务</m:title>
<m:title>资金</m:title>
<m:index>7000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
......@@ -471,7 +471,7 @@
<m:function-node>
<m:id>971f8462-4554-4ce0-bbf6-29c7b9a53d7e</m:id>
<m:name>charge_detail</m:name>
<m:title>充值明细</m:title>
<m:title>银行入账</m:title>
<m:index>1000</m:index>
<m:license></m:license>
<m:privilege></m:privilege>
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/DinasCommonConfiguration.java
......@@ -7,8 +7,10 @@ import com.xyst.dinas.biz.internal.dao.PlanningCycleDao;
import com.xyst.dinas.biz.internal.service.PlanningCycleServiceImpl;
import com.xyst.dinas.biz.service.PlanningCycleService;
import com.xyst.dinas.biz.web.DinasCommonController;
import com.xyst.dinas.biz.web.SandAttachmentController;
import com.xyst.dinas.biz.web.SandDictController;
import com.xyst.dinas.biz.web.SandQueryController;
import com.xyst.dinas.biz.web.WarehouseAttachmentController;
import com.xyst.dinas.biz.web.WarehouseDictController;
import com.xyst.dinas.biz.web.WarehouseQueryController;
......@@ -20,6 +22,7 @@ public class DinasCommonConfiguration {
return new DinasCommonController();
}
/**********购砂单位与场站单据通用查询接口************/
@Bean
public WarehouseQueryController warehouseQueryController() {
return new WarehouseQueryController();
......@@ -30,6 +33,7 @@ public class DinasCommonConfiguration {
return new SandQueryController();
}
/**********购砂单位与场站数据字典查询接口************/
@Bean
public WarehouseDictController warehouseDictController() {
return new WarehouseDictController();
......@@ -40,6 +44,17 @@ public class DinasCommonConfiguration {
return new SandDictController();
}
/**********购砂单位与场站附件查询接口************/
@Bean
public WarehouseAttachmentController warehouseAttachmentController() {
return new WarehouseAttachmentController();
}
@Bean
public SandAttachmentController sandAttachmentController() {
return new SandAttachmentController();
}
/***************计划周期 ************/
@Bean
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/SandQueryController.java
......@@ -6,9 +6,11 @@ import java.util.List;
import java.util.UUID;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.web.servlet.MultipartProperties;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.PathVariable;
......@@ -58,11 +60,23 @@ public class SandQueryController {
@Autowired
private PrivilegeService privilegeService;
@Autowired
MultipartProperties multipartProperties;
private static final Logger logger = LoggerFactory.getLogger(SandQueryController.class);
private static final ObjectMapper OBJECTMAPPER = new ObjectMapper();
@ResponseBody
@RequestMapping(value="/sand/user/common/config/getMaxFileSize", method = RequestMethod.GET, consumes = "application/json")
public String getMaxFileSize() {
JSONObject o = new JSONObject();
o.put("result", true);
o.put("data", multipartProperties.getMaxFileSize());
return o.toString();
}
/**
* 查询分页
*
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/WarehouseQueryController.java
......@@ -6,9 +6,11 @@ import java.util.List;
import java.util.UUID;
import org.json.JSONArray;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.web.servlet.MultipartProperties;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.PathVariable;
......@@ -58,11 +60,23 @@ public class WarehouseQueryController {
@Autowired
private PrivilegeService privilegeService;
@Autowired
MultipartProperties multipartProperties;
private static final Logger logger = LoggerFactory.getLogger(WarehouseQueryController.class);
private static final ObjectMapper OBJECTMAPPER = new ObjectMapper();
@ResponseBody
@RequestMapping(value="/warehouse/api/common/config/getMaxFileSize", method = RequestMethod.GET, consumes = "application/json")
public String getMaxFileSize() {
JSONObject o = new JSONObject();
o.put("result", true);
o.put("data", multipartProperties.getMaxFileSize());
return o.toString();
}
/**
* 查询分页
*
......
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