大屏查询 1.视频/文件路径设置 2.静电手环 3.时段产量 4.日排产数量 完工/计划

gavel/src/main/java/com/gavel/kwell/controller/KmesBoardController.java

 package com.gavel.kwell.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.gavel.common.base.controller.BaseController;
+import com.gavel.kwell.service.KmesBoardService;
+import com.gavel.kwell.vo.SdclVO;
+import com.gavel.wo.persistent.Pcjhmx;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+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 java.util.List;
 
 @Controller
 @RequestMapping("kmes/dashboard")
 public class KmesBoardController extends BaseController {
 
 
+    @Autowired
+    private KmesBoardService kmesBoardService;
+
+
     @RequestMapping("/index")
     public String index() {
         return "kmes/dashboard/index";
@@ -35,4 +49,24 @@ public class KmesBoardController extends BaseController {
     }
 
 
+    /**
+     * 时段产量
+     */
+    @RequestMapping(value = "querySdcl", method = RequestMethod.POST)
+    @ResponseBody
+    public Object querySdcl(@RequestBody JSONObject param) {
+        SdclVO sdclVO = kmesBoardService.querySdcl();
+        return buildReturnData(sdclVO);
+    }
+
+    /**
+     *日排产达成数据
+     */
+    @RequestMapping(value = "queryPcsl", method = RequestMethod.POST)
+    @ResponseBody
+    public Object queryPcsl(@RequestBody JSONObject param) {
+        List<Pcjhmx> sdclVO = kmesBoardService.queryPcsl();
+        return buildReturnData(sdclVO);
+    }
+
 }

gavel/src/main/java/com/gavel/kwell/dao/GpfkcxDao.java

@@ -2,10 +2,12 @@ package com.gavel.kwell.dao;
 
 import com.gavel.common.base.dao.BaseDao;
 import com.gavel.gygl.vo.BzgxVO;
+import com.gavel.kwell.persistent.Gpfk;
 import com.gavel.kwell.vo.GpfkCondition;
 import com.gavel.kwell.vo.GpfkcxVO;
 import com.gavel.persistence.sql.RecordSet;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -16,4 +18,6 @@ public interface GpfkcxDao extends BaseDao {
    public  RecordSet<GpfkcxVO> queryGpfkDetil(GpfkCondition condition);
 
    public List<BzgxVO> listBzgxName();
+
+   public List<Gpfk> queryByBetween(Date start, Date end);
 }

gavel/src/main/java/com/gavel/kwell/dao/KmesBoardDao.java

+package com.gavel.kwell.dao;
+
+import com.gavel.common.base.dao.BaseDao;
+import com.gavel.kwell.persistent.Wlsn;
+import com.gavel.kwell.vo.WlsnCondition;
+import com.gavel.kwell.vo.WlsnVO;
+import com.gavel.persistence.sql.RecordSet;
+import com.gavel.wo.persistent.Pcjhmx;
+
+import java.util.List;
+
+
+public interface KmesBoardDao extends BaseDao {
+
+   public List<Pcjhmx> queryPcsl();
+}

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkcxDaoImpl.java

 package com.gavel.kwell.dao.impl;
 
+import com.gavel.bom.utils.GxlxGxbzEnum;
 import com.gavel.common.base.dao.impl.BaseDaoImpl;
 import com.gavel.common.utils.StringUtils;
 import com.gavel.gygl.vo.BzgxVO;
 import com.gavel.kwell.dao.GpfkcxDao;
+import com.gavel.kwell.persistent.Gpfk;
 import com.gavel.kwell.vo.GpfkCondition;
 import com.gavel.kwell.vo.GpfkcxVO;
 import com.gavel.persistence.sql.RecordSet;
@@ -11,6 +13,7 @@ import com.gavel.persistence.sql.SqlMap;
 import com.gavel.persistence.sql.SqlUtil;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -108,5 +111,21 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
         sqlMap.append("order by BZGX_NAME ");
         return sqlMap.query(BzgxVO.class);
     }
+
+    @Override
+    public List<Gpfk> queryByBetween(Date start, Date end) {
+        SqlMap sqlMap = new SqlMap();
+        sqlMap.append("select GPFK_ID, GPFK_WOSNID, GPFK_FKLX, GPFK_FKGX, ");
+        sqlMap.append("  GPFK_FKSJ,GPFK_FKR,GPFK_FKRID, GPFK_FKBX, GPFK_FKJSSJ,");
+        sqlMap.append("  GPFK_HGBZ,GPFK_FKSL,GPFK_HGSL,GPFK_BHGSL,GPFK_GFSL, ");
+        sqlMap.append("  GPFK_LFSL,WOGYLX_GXBZ ");
+        sqlMap.append("from GPFK  ");
+        sqlMap.append("  left join wogylx on wogylx_id = gpfk_fkgx ");
+        sqlMap.append("where (GPFK_FKSJ >= :pStart and GPFK_FKSJ < :pEnd) and  WOGYLX_GXBZ = :pGxbz ");//[a,b)
+        sqlMap.setParamValue("pStart", start);
+        sqlMap.setParamValue("pEnd", end);
+        sqlMap.setParamValue("pGxbz", GxlxGxbzEnum.LAST.getId());
+        return sqlMap.query(Gpfk.class);
+    }
 }
 

gavel/src/main/java/com/gavel/kwell/dao/impl/KmesBoardDaoImpl.java

+package com.gavel.kwell.dao.impl;
+
+import com.gavel.common.base.dao.impl.BaseDaoImpl;
+import com.gavel.common.utils.DateUtils;
+import com.gavel.kwell.dao.KmesBoardDao;
+import com.gavel.persistence.sql.SqlMap;
+import com.gavel.wo.persistent.Pcjhmx;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository("kmesBoardDao")
+public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao {
+
+
+    @Override
+    public List<Pcjhmx> queryPcsl() {
+        SqlMap sqlMap = new SqlMap();
+        sqlMap.append("select PCJHMX_JHRQ,sum(PCJHMX_JHSL) as PCJHMX_JHSL,sum(PCJHMX_WGSL) as PCJHMX_WGSL ");
+        sqlMap.append("from PCJHMX ");
+        sqlMap.append("where 1=1 and ( :ksrq <= PCJHMX_JHRQ and PCJHMX_JHRQ <= :jsrq ) ");
+        sqlMap.setParamValue("ksrq", DateUtils.beginOfDay(DateUtils.calcDate(DateUtils.getDateTime(), 0, 0, -7, 0, 0, 0)));
+        sqlMap.setParamValue("jsrq", DateUtils.endOfDay(DateUtils.calcDate(DateUtils.getDateTime(), 0, 0, -1, 0, 0, 0)));
+        sqlMap.append("group by PCJHMX_JHRQ ");
+        return sqlMap.query(Pcjhmx.class);
+    }
+
+}

gavel/src/main/java/com/gavel/kwell/service/KmesBoardService.java

+package com.gavel.kwell.service;
+
+import com.gavel.common.base.service.BaseEditService;
+import com.gavel.kwell.vo.SdclVO;
+import com.gavel.wo.persistent.Pcjhmx;
+
+import java.util.List;
+
+
+public interface KmesBoardService extends BaseEditService {
+
+  public  SdclVO querySdcl();
+
+  public List<Pcjhmx> queryPcsl();
+}

gavel/src/main/java/com/gavel/kwell/service/impl/KmesBoardServiceImpl.java

+package com.gavel.kwell.service.impl;
+
+import com.gavel.common.base.entity.BaseEntity;
+import com.gavel.common.base.service.impl.BaseEditServiceImpl;
+import com.gavel.common.utils.DateUtils;
+import com.gavel.common.utils.NumberUtils;
+import com.gavel.kwell.dao.GpfkcxDao;
+import com.gavel.kwell.dao.KmesBoardDao;
+import com.gavel.kwell.dao.WlsnDao;
+import com.gavel.kwell.persistent.Gpfk;
+import com.gavel.kwell.persistent.Wlsn;
+import com.gavel.kwell.service.KmesBoardService;
+import com.gavel.kwell.service.WlsnService;
+import com.gavel.kwell.utils.DateCalculateUtil;
+import com.gavel.kwell.utils.WlsnLxEnum;
+import com.gavel.kwell.vo.SdclVO;
+import com.gavel.kwell.vo.WlsnCondition;
+import com.gavel.kwell.vo.WlsnVO;
+import com.gavel.persistence.sql.RecordSet;
+import com.gavel.wo.persistent.Pcjhmx;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+
+@Service("kmesBoardService")
+@Transactional
+public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoardService {
+
+    @Autowired
+    private KmesBoardDao kmesBoardDao;
+
+    @Autowired
+    private GpfkcxDao gpfkcxDao;
+
+    @Override
+    public void initService(){
+    }
+
+
+    @Override
+    public SdclVO querySdcl() {
+        //查询合格总量
+        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+        Date beginDate = DateUtils.calcDate(DateUtils.getDate(),0,0,0,8,30,0);
+        Date endDate = DateUtils.calcDate(DateUtils.getDate(),0,0,0,21,0,0);
+        List<Date> dateList = DateCalculateUtil.findDates("H", beginDate, endDate);
+
+        SdclVO sdclVO = new SdclVO();
+        Double total = 0.0;
+        for(int i=0;i<dateList.size()-1;i++){
+            List<Double> doubleList = sdclVO.getTimeperiodMount();
+            List<String> xseriesList = sdclVO.getXseriesList();
+            Date dateStart = dateList.get(i);
+            Date dateEnd = dateList.get(i+1);
+            List<Gpfk> gpfks = queryByBetween(dateStart,dateEnd);
+            double sl = 0.0;
+            if(gpfks != null && gpfks.size()>0){
+                sl = gpfks.stream().mapToDouble(Gpfk::getFksl).sum();
+            }
+            total= NumberUtils.plus(total,sl);
+            doubleList.add(sl);
+            xseriesList.add(sdf.format(dateStart)+"-"+sdf.format(dateEnd));
+        }
+        sdclVO.setTotal(total);
+        return sdclVO;
+    }
+
+    private List<Gpfk> queryByBetween(Date start,Date end){
+        return gpfkcxDao.queryByBetween(start,end);
+    }
+
+    @Override
+    public List<Pcjhmx> queryPcsl() {
+        return  kmesBoardDao.queryPcsl();
+    }
+}

gavel/src/main/java/com/gavel/kwell/utils/KwellParamEnum.java

+package com.gavel.kwell.utils;
+
+import com.gavel.common.annotation.GavelParams;
+import com.gavel.common.module.ModuleParams;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@GavelParams("901000000")
+public enum KwellParamEnum {
+
+    DASHBORAD_PDF("DASHBORAD_PDF", "大屏看板PDF文件", "S", "大屏看板PDF文件", "S", "", "", ""),
+	DASHBORAD_VIDEO("DASHBORAD_VIDEO","大屏看板视频文件" ,"S","大屏看板PDF文件","S","","","");
+
+    private String id;      // 参数ID
+    private String name;    //参数名称
+    private String zjid;    // 组件ID
+    private String type;    // 参数类型
+    private String desc;    // 参数描述
+    private String zlx;     // 值类型
+    private String zy;      // 值域
+    private String qsz;     // 缺省值
+    private String qszsm;    //缺省值说明
+
+    KwellParamEnum(String id, String name, String type, String desc) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.desc = desc;
+    }
+
+    KwellParamEnum(String id, String name, String type, String desc, String zlx) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.desc = desc;
+        this.zlx = zlx;
+    }
+    KwellParamEnum(String id, String name, String type, String desc, String zlx, String qsz) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.desc = desc;
+        this.zlx = zlx;
+        this.qsz = qsz;
+        this.qszsm = qsz;
+    }
+
+    KwellParamEnum(String id, String name, String type, String desc, String zlx, String qsz, String qszsm) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.desc = desc;
+        this.zlx = zlx;
+        this.qsz = qsz;
+        this.qszsm = qszsm;
+    }
+
+    KwellParamEnum(String id, String name, String type, String desc, String zlx, String zy, String qsz, String qszsm) {
+        this.id = id;
+        this.name = name;
+        this.type = type;
+        this.desc = desc;
+        this.zlx = zlx;
+        this.zy = zy;
+        this.qsz = qsz;
+        this.qszsm = qszsm;
+    }
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getZjid() {
+		return zjid;
+	}
+
+	public void setZjid(String zjid) {
+		this.zjid = zjid;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+	public String getZlx() {
+		return zlx;
+	}
+
+	public void setZlx(String zlx) {
+		this.zlx = zlx;
+	}
+
+	public String getZy() {
+		return zy;
+	}
+
+	public void setZy(String zy) {
+		this.zy = zy;
+	}
+
+	public String getQsz() {
+		return qsz;
+	}
+
+	public void setQsz(String qsz) {
+		this.qsz = qsz;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getQszsm() {
+		return qszsm;
+	}
+
+	public void setQszsm(String qszsm) {
+		this.qszsm = qszsm;
+	}
+	
+	public static List<ModuleParams> toList(){
+		List<ModuleParams> list = new ArrayList<>();
+		for (KwellParamEnum e : values()) {
+			ModuleParams moduleParams = new ModuleParams();
+			moduleParams.setCsid(e.getId());
+			moduleParams.setCsmc(e.getName());
+			moduleParams.setCssm(e.getDesc());
+			moduleParams.setCslx(e.getType());
+			moduleParams.setZlx(e.getZlx());
+			moduleParams.setZy(e.getZy());
+			moduleParams.setQsz(e.getQsz());
+			moduleParams.setQszsm(e.getQszsm());
+            list.add(moduleParams);
+        }
+		return list;
+	}
+
+}
+

gavel/src/main/java/com/gavel/kwell/vo/DataPointItem.java

 package com.gavel.kwell.vo;
 
 import com.alibaba.fastjson.JSONArray;
-import com.gavel.common.utils.NumberUtils;
 import com.google.common.base.MoreObjects;
 
 import java.io.Serializable;
@@ -37,17 +36,6 @@ public class DataPointItem implements Serializable {
         this.value = value;
     }
 
-    public DataPointItem(String itemId, long timestamp, Integer quality, Object value) {
-        this.itemId = itemId;
-        this.timestamp = timestamp;
-        this.quality = quality;
-        if(NumberUtils.isZero(quality)){
-            this.value= -1;
-        }else {
-            this.value = value;
-        }
-
-    }
 
     public String getItemId() {
         return itemId;

gavel/src/main/java/com/gavel/kwell/vo/SdclVO.java

+package com.gavel.kwell.vo;
+
+import com.gavel.common.base.entity.BaseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class SdclVO extends BaseEntity {
+
+	private Double total;//总量
+
+	private List<Double> timeperiodMount = new ArrayList<>();//每个时间段的数量
+
+	private List<String> xseriesList = new ArrayList<>();//X轴坐标值
+
+	public Double getTotal() {
+		return total;
+	}
+
+	public void setTotal(Double total) {
+		this.total = total;
+	}
+
+	public List<Double> getTimeperiodMount() {
+		return timeperiodMount;
+	}
+
+	public void setTimeperiodMount(List<Double> timeperiodMount) {
+		this.timeperiodMount = timeperiodMount;
+	}
+
+	public List<String> getXseriesList() {
+		return xseriesList;
+	}
+
+	public void setXseriesList(List<String> xseriesList) {
+		this.xseriesList = xseriesList;
+	}
+
+}