|
|
@@ -21,6 +21,9 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import net.sf.json.JSONArray;
|
|
|
import net.sf.json.JSONObject;
|
|
|
|
|
|
+import oracle.net.aso.f;
|
|
|
+
|
|
|
+import org.apache.commons.lang.ObjectUtils.Null;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
@@ -42,6 +45,8 @@ import com.xt.jygl.ggfwxxgl.jdtx.entity.TxEntity;
|
|
|
import com.xt.jygl.ggfwxxgl.jdtx.service.TxService;
|
|
|
import com.xt.jygl.ggfwxxgl.tzgg.ggxx.entity.GgxxtxEntity;
|
|
|
import com.xt.jygl.ggfwxxgl.tzgg.ggxx.service.GgxxtxService;
|
|
|
+import com.xt.jygl.gkjcxx.ax.entity.AxEntity;
|
|
|
+import com.xt.jygl.gkjcxx.ax.service.AxService;
|
|
|
import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
|
|
|
import com.xt.jygl.gkjcxx.gk.service.GkService;
|
|
|
import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
|
|
|
@@ -50,7 +55,6 @@ import com.xt.jygl.gkjcxx.mt.ctl.MtCtl;
|
|
|
import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
|
|
|
import com.xt.jygl.gkjcxx.mt.service.MtService;
|
|
|
import com.xt.jygl.gkjcxx.mt.vo.MtVo;
|
|
|
-import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrbw.ctl.BwCtl;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
|
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrcg.ctl.CgCtl;
|
|
|
@@ -150,6 +154,8 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
private SssbService sssbService;
|
|
|
@Autowired
|
|
|
private XkzfzService xkzfzService;
|
|
|
+ @Autowired
|
|
|
+ private AxService axService;
|
|
|
|
|
|
/**
|
|
|
* 经营人基础信息
|
|
|
@@ -864,6 +870,100 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
GkjyrEntity gkjyr = gkjyrService.findOne(id);
|
|
|
GkjyrVo gkjyrVo = new GkjyrVo();
|
|
|
BeanUtils.copyProperties(gkjyr, gkjyrVo);
|
|
|
+
|
|
|
+ //岸线
|
|
|
+ List<AxEntity> axEntities = axService.findByJyrid(gkjyr.getId());
|
|
|
+ if (axEntities == null) {
|
|
|
+ axEntities = new ArrayList<AxEntity>();
|
|
|
+ }
|
|
|
+ double axcd = 0;
|
|
|
+ for (AxEntity axEntity : axEntities) {
|
|
|
+ axcd += axEntity == null ? 0 : axEntity.getAxcd();
|
|
|
+ }
|
|
|
+ //岸线长度
|
|
|
+ gkjyrVo.setAxcd(axcd+"");
|
|
|
+
|
|
|
+ //码头泊位
|
|
|
+ List<BwEntity> bwList = bwService.findByJyrid(gkjyr.getId());
|
|
|
+ if(bwList==null){
|
|
|
+ bwList= new ArrayList<BwEntity>();
|
|
|
+ }
|
|
|
+ //码头泊位总数
|
|
|
+ gkjyrVo.setMtbwzs(bwList.size()+"");
|
|
|
+ int scxbw = 0;
|
|
|
+ int fscxbw = 0;
|
|
|
+ double zdkbnl = 0;
|
|
|
+ int wdjysbw = 0;
|
|
|
+ double bwzcd = 0;
|
|
|
+ double sjntgnl = 0;
|
|
|
+ double sjtgnl = 0;
|
|
|
+ for (BwEntity bwEntity : bwList) {
|
|
|
+ if (bwEntity.getSclx() != null) {
|
|
|
+ if (bwEntity.getSclx().getId().equals("2601") && bwEntity.getSclx().getId().equals("2602")) {
|
|
|
+ scxbw++;
|
|
|
+ }else if (bwEntity.getSclx().getId().equals("2603") && bwEntity.getSclx().getId().equals("2604")) {
|
|
|
+ fscxbw++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ sjtgnl = bwEntity.getSjtgnl() == null ? 0 : bwEntity.getSjtgnl();
|
|
|
+ zdkbnl += sjtgnl;
|
|
|
+ if (sjtgnl >= 10000) {
|
|
|
+ wdjysbw++;
|
|
|
+ }
|
|
|
+ bwzcd += bwEntity.getBwcd() == null ? 0 : bwEntity.getBwcd();
|
|
|
+ sjntgnl += bwEntity.getNhwtgnl() == null ? 0 : Double.parseDouble(bwEntity.getNhwtgnl());
|
|
|
+ }
|
|
|
+ //泊位生产类型
|
|
|
+ gkjyrVo.setScxbw(scxbw+"");
|
|
|
+ gkjyrVo.setFscxbw(fscxbw+"");
|
|
|
+ //最大靠泊能力
|
|
|
+ gkjyrVo.setZdkbnl(zdkbnl+"");
|
|
|
+ //万吨级以上泊位
|
|
|
+ gkjyrVo.setWdjysbwsl(wdjysbw+"");
|
|
|
+ //泊位总长度
|
|
|
+ gkjyrVo.setBwzcd(bwzcd+"");
|
|
|
+ //设计年通过能力
|
|
|
+ gkjyrVo.setSjntgnl(sjntgnl+"");
|
|
|
+
|
|
|
+ //仓库
|
|
|
+ List<CkEntity> ckEntities = ckService.findByJyrid(gkjyr.getId());
|
|
|
+ if (ckEntities == null) {
|
|
|
+ ckEntities = new ArrayList<CkEntity>();
|
|
|
+ }
|
|
|
+ double ckzmj = 0;
|
|
|
+ for (CkEntity ckEntity : ckEntities) {
|
|
|
+ ckzmj += ckEntity.getCkzmj() == null ? 0 : ckEntity.getCkzmj();
|
|
|
+ }
|
|
|
+ //仓库总面积
|
|
|
+ gkjyrVo.setCkzmj(ckzmj+"");
|
|
|
+
|
|
|
+ //堆场
|
|
|
+ List<DcEntity> dcEntities = dcService.findByJyrid(gkjyr.getId());
|
|
|
+ if (dcEntities == null) {
|
|
|
+ dcEntities = new ArrayList<DcEntity>();
|
|
|
+ }
|
|
|
+ double dczmj = 0;
|
|
|
+ for (DcEntity dcEntity : dcEntities) {
|
|
|
+ dczmj += dcEntity.getDczmj() == null ? 0 : dcEntity.getDczmj();
|
|
|
+ }
|
|
|
+ //堆场总面积
|
|
|
+ gkjyrVo.setTczmj(dczmj+"");
|
|
|
+
|
|
|
+ //储罐
|
|
|
+ List<CgEntity> cgEntities = cgService.findByJyrid(gkjyr.getId());
|
|
|
+ if (cgEntities == null) {
|
|
|
+ cgEntities = new ArrayList<CgEntity>();
|
|
|
+ }
|
|
|
+ double cgzrl = 0;
|
|
|
+ for (CgEntity cgEntity : cgEntities) {
|
|
|
+ cgzrl += cgEntity.getCgrj() == null ? 0 : cgEntity.getCgrj();
|
|
|
+ }
|
|
|
+ //储罐数量
|
|
|
+ gkjyrVo.setCgsl(cgEntities.size()+"");
|
|
|
+ //储罐总容量
|
|
|
+ gkjyrVo.setCgzrl(cgzrl+"");
|
|
|
+
|
|
|
gkjyrVo.setSzdzw(null != gkjyr.getSzd() ? gkjyr.getSzd().getText() : "");
|
|
|
gkjyrVo.setSzgkzw(null != gkjyr.getSzgk() ? gkjyr.getSzgk().getGkmc() : "");
|
|
|
gkjyrVo.setSzgqzw(null != gkjyr.getSzgq() ? gkjyr.getSzgq().getGqmc() : "");
|
|
|
@@ -987,6 +1087,102 @@ public class GkjyrCtl extends BaseWebCtl {
|
|
|
GkjyrEntity gkjyr = gkjyrService.findOne(id);
|
|
|
GkjyrVo gkjyrVo = new GkjyrVo();
|
|
|
BeanUtils.copyProperties(gkjyr, gkjyrVo);
|
|
|
+
|
|
|
+
|
|
|
+ //岸线
|
|
|
+ List<AxEntity> axEntities = axService.findByJyrid(gkjyr.getId());
|
|
|
+ if (axEntities == null) {
|
|
|
+ axEntities = new ArrayList<AxEntity>();
|
|
|
+ }
|
|
|
+ double axcd = 0;
|
|
|
+ for (AxEntity axEntity : axEntities) {
|
|
|
+ axcd += axEntity == null ? 0 : axEntity.getAxcd();
|
|
|
+ }
|
|
|
+ //岸线长度
|
|
|
+ gkjyrVo.setAxcd(axcd+"");
|
|
|
+
|
|
|
+ //码头泊位
|
|
|
+ List<BwEntity> bwList = bwService.findByJyrid(gkjyr.getId());
|
|
|
+ if(bwList==null){
|
|
|
+ bwList= new ArrayList<BwEntity>();
|
|
|
+ }
|
|
|
+ //码头泊位总数
|
|
|
+ gkjyrVo.setMtbwzs(bwList.size()+"");
|
|
|
+ int scxbw = 0;
|
|
|
+ int fscxbw = 0;
|
|
|
+ double zdkbnl = 0;
|
|
|
+ int wdjysbw = 0;
|
|
|
+ double bwzcd = 0;
|
|
|
+ double sjntgnl = 0;
|
|
|
+ double sjtgnl = 0;
|
|
|
+ for (BwEntity bwEntity : bwList) {
|
|
|
+ if (bwEntity.getSclx() != null) {
|
|
|
+ if (bwEntity.getSclx().getId().equals("2601") && bwEntity.getSclx().getId().equals("2602")) {
|
|
|
+ scxbw++;
|
|
|
+ }else if (bwEntity.getSclx().getId().equals("2603") && bwEntity.getSclx().getId().equals("2604")) {
|
|
|
+ fscxbw++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ sjtgnl = bwEntity.getSjtgnl() == null ? 0 : bwEntity.getSjtgnl();
|
|
|
+ zdkbnl += sjtgnl;
|
|
|
+ if (sjtgnl >= 10000) {
|
|
|
+ wdjysbw++;
|
|
|
+ }
|
|
|
+ bwzcd += bwEntity.getBwcd() == null ? 0 : bwEntity.getBwcd();
|
|
|
+ sjntgnl += bwEntity.getNhwtgnl() == null ? 0 : Double.parseDouble(bwEntity.getNhwtgnl());
|
|
|
+ }
|
|
|
+ //泊位生产类型
|
|
|
+ gkjyrVo.setScxbw(scxbw+"");
|
|
|
+ gkjyrVo.setFscxbw(fscxbw+"");
|
|
|
+ //最大靠泊能力
|
|
|
+ gkjyrVo.setZdkbnl(zdkbnl+"");
|
|
|
+ //万吨级以上泊位
|
|
|
+ gkjyrVo.setWdjysbwsl(wdjysbw+"");
|
|
|
+ //泊位总长度
|
|
|
+ gkjyrVo.setBwzcd(bwzcd+"");
|
|
|
+ //设计年通过能力
|
|
|
+ gkjyrVo.setSjntgnl(sjntgnl+"");
|
|
|
+
|
|
|
+ //仓库
|
|
|
+ List<CkEntity> ckEntities = ckService.findByJyrid(gkjyr.getId());
|
|
|
+ if (ckEntities == null) {
|
|
|
+ ckEntities = new ArrayList<CkEntity>();
|
|
|
+ }
|
|
|
+ double ckzmj = 0;
|
|
|
+ for (CkEntity ckEntity : ckEntities) {
|
|
|
+ ckzmj += ckEntity.getCkzmj() == null ? 0 : ckEntity.getCkzmj();
|
|
|
+ }
|
|
|
+ //仓库总面积
|
|
|
+ gkjyrVo.setCkzmj(ckzmj+"");
|
|
|
+
|
|
|
+ //堆场
|
|
|
+ List<DcEntity> dcEntities = dcService.findByJyrid(gkjyr.getId());
|
|
|
+ if (dcEntities == null) {
|
|
|
+ dcEntities = new ArrayList<DcEntity>();
|
|
|
+ }
|
|
|
+ double dczmj = 0;
|
|
|
+ for (DcEntity dcEntity : dcEntities) {
|
|
|
+ dczmj += dcEntity.getDczmj() == null ? 0 : dcEntity.getDczmj();
|
|
|
+ }
|
|
|
+ //堆场总面积
|
|
|
+ gkjyrVo.setTczmj(dczmj+"");
|
|
|
+
|
|
|
+ //储罐
|
|
|
+ List<CgEntity> cgEntities = cgService.findByJyrid(gkjyr.getId());
|
|
|
+ if (cgEntities == null) {
|
|
|
+ cgEntities = new ArrayList<CgEntity>();
|
|
|
+ }
|
|
|
+ double cgzrl = 0;
|
|
|
+ for (CgEntity cgEntity : cgEntities) {
|
|
|
+ cgzrl += cgEntity.getCgrj() == null ? 0 : cgEntity.getCgrj();
|
|
|
+ }
|
|
|
+ //储罐数量
|
|
|
+ gkjyrVo.setCgsl(cgEntities.size()+"");
|
|
|
+ //储罐总容量
|
|
|
+ gkjyrVo.setCgzrl(cgzrl+"");
|
|
|
+
|
|
|
+
|
|
|
gkjyrVo.setSzdzw(null != gkjyr.getSzd() ? gkjyr.getSzd().getText() : "");
|
|
|
gkjyrVo.setSzgkzw(null != gkjyr.getSzgk() ? gkjyr.getSzgk().getGkmc() : "");
|
|
|
gkjyrVo.setSzgqzw(null != gkjyr.getSzgq() ? gkjyr.getSzgq().getGqmc() : "");
|
ld_guxl