smartlab_promote.git

gdg

2021-01-06 75f046eb6481d60ff7dabf48d5e6baf2a2994b46

add

已添加4个文件

	src/main/java/com/nanometer/smartlab/entity/dto/HazardousWasteUser.java	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/nanometer/smartlab/service/HazardousWasteService.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/nanometer/smartlab/service/HazardousWasteServiceImpl.java	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/sys_hazardous_waste.xhtml	160 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/nanometer/smartlab/entity/dto/HazardousWasteUser.java

对比新文件
@@ -0,0 +1,44 @@
package com.nanometer.smartlab.entity.dto;

import java.io.Serializable;

public class HazardousWasteUser implements Serializable {

    private String id;
    private String account;
    private String password;
    private String roleName;


    public String getAccount() {
        return account;
    }

    public void setAccount(String account) {
        this.account = account;
    }

    public String getPassword() {
        return password;
    }

    public void setPassword(String password) {
        this.password = password;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public String getRoleName() {
        return roleName;
    }

    public void setRoleName(String roleName) {
        this.roleName = roleName;
    }
}

 src/main/java/com/nanometer/smartlab/service/HazardousWasteService.java

对比新文件
@@ -0,0 +1,15 @@
package com.nanometer.smartlab.service;

import com.nanometer.smartlab.entity.HazardousWaste;

import java.util.Date;
import java.util.List;
import java.util.Map;

public interface HazardousWasteService {

    List<HazardousWaste> selectAll(Date startTime, Date endTime, Integer offset, Integer pageSize);

    int countAll(Date startTime, Date endTime);

}

 src/main/java/com/nanometer/smartlab/service/HazardousWasteServiceImpl.java

对比新文件
@@ -0,0 +1,36 @@
package com.nanometer.smartlab.service;

import com.nanometer.smartlab.dao.HazardousWasteMapper;
import com.nanometer.smartlab.entity.HazardousWaste;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Service
public class HazardousWasteServiceImpl implements HazardousWasteService{

    @Resource
    private HazardousWasteMapper hazardousWasteMapper;

    @Override
    public List<HazardousWaste> selectAll(Date startTime, Date endTime, Integer offset, Integer pageSize) {
        Map<String, Object> params = new HashMap<>();
        params.put("startTime", startTime);
        params.put("endTime", endTime);
        params.put("first", offset);
        params.put("pageSize", pageSize);
        return hazardousWasteMapper.selectAll(params);
    }

    @Override
    public int countAll(Date startTime, Date endTime) {
        Map<String, Object> params = new HashMap<>();
        params.put("startTime", startTime);
        params.put("endTime", endTime);
        return hazardousWasteMapper.countAll(params);
    }
}

 src/main/webapp/sys_hazardous_waste.xhtml

对比新文件
@@ -0,0 +1,160 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html
        PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

<html xmlns="http://www.w3.org/1999/xhtml"
      xmlns:ui="http://java.sun.com/jsf/facelets"
      xmlns:p="http://primefaces.org/ui"
      xmlns:h="http://java.sun.com/jsf/html"
      xmlns:f="http://java.sun.com/jsf/core"
      xmlns:c="http://java.sun.com/jsp/jstl/core">
<ui:composition>

    <p:tabView dynamic="true">
        <p:tab title="危废处理信息">
            <h:form id="hazardousWasteForm">
                <p:panel styleClass="center-header">
                    <p:outputLabel styleClass="title" value="危废处理信息"/>

                    <p:panelGrid styleClass="filter" columns="9">
                        <p:outputLabel value="开始时间："/>
                        <p:calendar value="#{hazardousWasteController.startTime}"
                                    converter="timestampConvert"
                                    pattern="yyyy-MM-dd" locale="zh_CN"/>

                        <p:outputLabel value="结束时间："/>
                        <p:calendar value="#{hazardousWasteController.endTime}"
                                    converter="timestampConvert"
                                    pattern="yyyy-MM-dd" locale="zh_CN"/>

                        <p:commandLink styleClass="search" process="@form" update="@form" actionListener="#{hazardousWasteController.modelChange}"/>

                    </p:panelGrid>
                </p:panel>
                <p:panel styleClass="center-body">
                    <p:panelGrid columns="5" styleClass="btn">
                        <p:commandButton value="导出" styleClass="new-btn"   ajax="false" actionListener="#{dangerousEncodeController.export2Excel}" />
                    </p:panelGrid>
                    <p:dataTable id="hazardousWasteInfoMngDataTable"
                                 styleClass="data-table"
                                 paginator="true"
                                 paginatorAlwaysVisible="false"
                                 paginatorPosition="bottom"
                                 lazy="true" value="#{hazardousWasteController.dataModel}"
                                 var="row"
                                 rowKey="#{row.id}"
                                 emptyMessage="无数据"
                                 rows="20"
                                 selectionMode="single"
                                 pageLinks="5">
                        <p:column headerText="酸">
                            <h:outputText value="#{row.acid}"/>
                        </p:column>

                        <p:column headerText="碱">
                            <h:outputText value="#{row.alkali}"/>
                        </p:column>

                        <p:column headerText="有机">
                            <h:outputText value="#{row.organic}"/>
                        </p:column>

                        <p:column headerText="固废">
                            <h:outputText value="#{row.solid}"/>
                        </p:column>

                        <p:column headerText="医疗">
                            <h:outputText value="#{row.medical}"/>
                        </p:column>

                        <p:column headerText="课题组">
                            <h:outputText value="#{row.project}"/>
                        </p:column>

                        <p:column headerText="部门">
                            <h:outputText value="#{row.department}"/>
                        </p:column>

                        <p:column headerText="单位">
                            <h:outputText value="#{row.unit}"/>
                        </p:column>

                    </p:dataTable>
                </p:panel>
            </h:form>
        </p:tab>
        <p:tab title="统计分析">
            <h:form id="hazardousWasteAnalysisForm">
                <p:panel styleClass="center-header">
                    <p:outputLabel styleClass="title" value="危废处理信息"/>

                    <p:panelGrid styleClass="filter" columns="9">
                        <p:outputLabel value="开始时间："/>
                        <p:calendar value="#{hazardousWasteController.startTime}"
                                    converter="timestampConvert"
                                    pattern="yyyy-MM-dd" locale="zh_CN"/>

                        <p:outputLabel value="结束时间："/>
                        <p:calendar value="#{hazardousWasteController.endTime}"
                                    converter="timestampConvert"
                                    pattern="yyyy-MM-dd" locale="zh_CN"/>

                        <p:commandLink styleClass="search" process="@form" update="@form" actionListener="#{hazardousWasteController.modelChange}"/>

                    </p:panelGrid>
                </p:panel>
                <p:panel styleClass="center-body">
                </p:panel>
            </h:form>

            <p:dataTable id="hazardousWasteInfoAnalysisDataTable"
                         styleClass="data-table"
                         paginator="true"
                         paginatorAlwaysVisible="false"
                         paginatorPosition="bottom"
                         lazy="true" value="#{hazardousWasteController.dataModel}"
                         var="row"
                         rowKey="#{row.id}"
                         emptyMessage="无数据"
                         rows="20"
                         selectionMode="single"
                         pageLinks="5">
                <p:column headerText="酸">
                    <h:outputText value="#{row.acid}"/>
                </p:column>

                <p:column headerText="碱">
                    <h:outputText value="#{row.alkali}"/>
                </p:column>

                <p:column headerText="有机">
                    <h:outputText value="#{row.organic}"/>
                </p:column>

                <p:column headerText="固废">
                    <h:outputText value="#{row.solid}"/>
                </p:column>

                <p:column headerText="医疗">
                    <h:outputText value="#{row.medical}"/>
                </p:column>

                <p:column headerText="课题组">
                    <h:outputText value="#{row.project}"/>
                </p:column>

                <p:column headerText="部门">
                    <h:outputText value="#{row.department}"/>
                </p:column>

                <p:column headerText="单位">
                    <h:outputText value="#{row.unit}"/>
                </p:column>

            </p:dataTable>
        </p:tab>

    </p:tabView>
</ui:composition>
</html>

对比新文件
			@@ -0,0 +1,44 @@
			package com.nanometer.smartlab.entity.dto;

			import java.io.Serializable;

			public class HazardousWasteUser implements Serializable {

			private String id;
			private String account;
			private String password;
			private String roleName;


			public String getAccount() {
			return account;
			}

			public void setAccount(String account) {
			this.account = account;
			}

			public String getPassword() {
			return password;
			}

			public void setPassword(String password) {
			this.password = password;
			}

			public String getId() {
			return id;
			}

			public void setId(String id) {
			this.id = id;
			}

			public String getRoleName() {
			return roleName;
			}

			public void setRoleName(String roleName) {
			this.roleName = roleName;
			}
			}

对比新文件
			@@ -0,0 +1,15 @@
			package com.nanometer.smartlab.service;

			import com.nanometer.smartlab.entity.HazardousWaste;

			import java.util.Date;
			import java.util.List;
			import java.util.Map;

			public interface HazardousWasteService {

			List<HazardousWaste> selectAll(Date startTime, Date endTime, Integer offset, Integer pageSize);

			int countAll(Date startTime, Date endTime);

			}

对比新文件
			@@ -0,0 +1,36 @@
			package com.nanometer.smartlab.service;

			import com.nanometer.smartlab.dao.HazardousWasteMapper;
			import com.nanometer.smartlab.entity.HazardousWaste;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.Date;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			@Service
			public class HazardousWasteServiceImpl implements HazardousWasteService{

			@Resource
			private HazardousWasteMapper hazardousWasteMapper;

			@Override
			public List<HazardousWaste> selectAll(Date startTime, Date endTime, Integer offset, Integer pageSize) {
			Map<String, Object> params = new HashMap<>();
			params.put("startTime", startTime);
			params.put("endTime", endTime);
			params.put("first", offset);
			params.put("pageSize", pageSize);
			return hazardousWasteMapper.selectAll(params);
			}

			@Override
			public int countAll(Date startTime, Date endTime) {
			Map<String, Object> params = new HashMap<>();
			params.put("startTime", startTime);
			params.put("endTime", endTime);
			return hazardousWasteMapper.countAll(params);
			}
			}

对比新文件
			@@ -0,0 +1,160 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<!DOCTYPE html
			PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
			"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

			<html xmlns="http://www.w3.org/1999/xhtml"
			xmlns:ui="http://java.sun.com/jsf/facelets"
			xmlns:p="http://primefaces.org/ui"
			xmlns:h="http://java.sun.com/jsf/html"
			xmlns:f="http://java.sun.com/jsf/core"
			xmlns:c="http://java.sun.com/jsp/jstl/core">
			<ui:composition>

			<p:tabView dynamic="true">
			<p:tab title="危废处理信息">
			<h:form id="hazardousWasteForm">
			<p:panel styleClass="center-header">
			<p:outputLabel styleClass="title" value="危废处理信息"/>

			<p:panelGrid styleClass="filter" columns="9">
			<p:outputLabel value="开始时间："/>
			<p:calendar value="#{hazardousWasteController.startTime}"
			converter="timestampConvert"
			pattern="yyyy-MM-dd" locale="zh_CN"/>

			<p:outputLabel value="结束时间："/>
			<p:calendar value="#{hazardousWasteController.endTime}"
			converter="timestampConvert"
			pattern="yyyy-MM-dd" locale="zh_CN"/>

			<p:commandLink styleClass="search" process="@form" update="@form" actionListener="#{hazardousWasteController.modelChange}"/>

			</p:panelGrid>
			</p:panel>
			<p:panel styleClass="center-body">
			<p:panelGrid columns="5" styleClass="btn">
			<p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="#{dangerousEncodeController.export2Excel}" />
			</p:panelGrid>
			<p:dataTable id="hazardousWasteInfoMngDataTable"
			styleClass="data-table"
			paginator="true"
			paginatorAlwaysVisible="false"
			paginatorPosition="bottom"
			lazy="true" value="#{hazardousWasteController.dataModel}"
			var="row"
			rowKey="#{row.id}"
			emptyMessage="无数据"
			rows="20"
			selectionMode="single"
			pageLinks="5">
			<p:column headerText="酸">
			<h:outputText value="#{row.acid}"/>
			</p:column>

			<p:column headerText="碱">
			<h:outputText value="#{row.alkali}"/>
			</p:column>

			<p:column headerText="有机">
			<h:outputText value="#{row.organic}"/>
			</p:column>

			<p:column headerText="固废">
			<h:outputText value="#{row.solid}"/>
			</p:column>

			<p:column headerText="医疗">
			<h:outputText value="#{row.medical}"/>
			</p:column>

			<p:column headerText="课题组">
			<h:outputText value="#{row.project}"/>
			</p:column>

			<p:column headerText="部门">
			<h:outputText value="#{row.department}"/>
			</p:column>

			<p:column headerText="单位">
			<h:outputText value="#{row.unit}"/>
			</p:column>

			</p:dataTable>
			</p:panel>
			</h:form>
			</p:tab>
			<p:tab title="统计分析">
			<h:form id="hazardousWasteAnalysisForm">
			<p:panel styleClass="center-header">
			<p:outputLabel styleClass="title" value="危废处理信息"/>

			<p:panelGrid styleClass="filter" columns="9">
			<p:outputLabel value="开始时间："/>
			<p:calendar value="#{hazardousWasteController.startTime}"
			converter="timestampConvert"
			pattern="yyyy-MM-dd" locale="zh_CN"/>

			<p:outputLabel value="结束时间："/>
			<p:calendar value="#{hazardousWasteController.endTime}"
			converter="timestampConvert"
			pattern="yyyy-MM-dd" locale="zh_CN"/>

			<p:commandLink styleClass="search" process="@form" update="@form" actionListener="#{hazardousWasteController.modelChange}"/>

			</p:panelGrid>
			</p:panel>
			<p:panel styleClass="center-body">
			</p:panel>
			</h:form>

			<p:dataTable id="hazardousWasteInfoAnalysisDataTable"
			styleClass="data-table"
			paginator="true"
			paginatorAlwaysVisible="false"
			paginatorPosition="bottom"
			lazy="true" value="#{hazardousWasteController.dataModel}"
			var="row"
			rowKey="#{row.id}"
			emptyMessage="无数据"
			rows="20"
			selectionMode="single"
			pageLinks="5">
			<p:column headerText="酸">
			<h:outputText value="#{row.acid}"/>
			</p:column>

			<p:column headerText="碱">
			<h:outputText value="#{row.alkali}"/>
			</p:column>

			<p:column headerText="有机">
			<h:outputText value="#{row.organic}"/>
			</p:column>

			<p:column headerText="固废">
			<h:outputText value="#{row.solid}"/>
			</p:column>

			<p:column headerText="医疗">
			<h:outputText value="#{row.medical}"/>
			</p:column>

			<p:column headerText="课题组">
			<h:outputText value="#{row.project}"/>
			</p:column>

			<p:column headerText="部门">
			<h:outputText value="#{row.department}"/>
			</p:column>

			<p:column headerText="单位">
			<h:outputText value="#{row.unit}"/>
			</p:column>

			</p:dataTable>
			</p:tab>

			</p:tabView>
			</ui:composition>
			</html>