Skip to content

C
cmszMonitorAnalysis
Commit 09ca8f48 authored by afe's avatar afe
Browse files
Options

2017年11月06提交内容

--实现内部协查单页面查询
parent 620e6ff0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 676 additions and 103 deletions
.idea/uiDesigner.xml 0 → 100644
View file @ 09ca8f48
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>
\ No newline at end of file
.idea/workspace.xml
View file @ 09ca8f48
This diff is collapsed.
src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java 0 → 100644
View file @ 09ca8f48
package com.hp.cmsz.entity;
import javax.persistence.*;
import java.sql.Timestamp;
/**
*INNER_XCD_WORKING_ORDER_INFO_T对应的实体类
*
* @author Afe
*
*/
@Entity
@Table(name = "inner_xcd_detail_info_v")
public class InsideXcdWorkingOrderInfo {
private Long innerWorkingOrderId;//内部协查单ID自增长
private String title;//标题
private Long dataSourceId;//数据来源
private String channelName;//渠道CHANNEL_NAME
private String warningSourceName;//WARNING_SOURCE_NAME
private int provinceCode;//省份code PROVINCE_ID
private String provinceName;//省份名称
private String askname;//请求人姓名
private String kind;//事件性质
private String origin;//事件来源
private String suborigin;//事件子来源
private String incidence;//事件影响程度
private Timestamp eventHappenTime;//事件发生时间
private String priority;//事件优先级
private String systype;//事件所属系统类型
private String syssubtype;//事件所属系统子类
private String workingOrderDescription;//协查单描述
private String attachFlag;//是否有附件
private String attachMent;//文件名
private String fileAddress;//文件地址
private String workingOrderStatus;//协查单状态
private String providerName;//PROVIDER_NAME
private Long ChannelId;
private Long warningSourceId;
private Long providerId;
private Long provinceId;
public Long getDataSourceId() {
return dataSourceId;
}
public void setDataSourceId(Long dataSourceId) {
this.dataSourceId = dataSourceId;
}
public Long getChannelId() {
return ChannelId;
}
public void setChannelId(Long channelId) {
ChannelId = channelId;
}
public Long getWarningSourceId() {
return warningSourceId;
}
public void setWarningSourceId(Long warningSourceId) {
this.warningSourceId = warningSourceId;
}
public Long getProviderId() {
return providerId;
}
public void setProviderId(Long providerId) {
this.providerId = providerId;
}
public Long getProvinceId() {
return provinceId;
}
public void setProvinceId(Long provinceId) {
this.provinceId = provinceId;
}
public String getProviderName() {
return providerName;
}
public void setProviderName(String providerName) {
this.providerName = providerName;
}
public String getWarningSourceName() {
return warningSourceName;
}
public void setWarningSourceName(String warningSourceName) {
this.warningSourceName = warningSourceName;
}
public String getChannelName() {
return channelName;
}
public void setChannelName(String channelName) {
this.channelName = channelName;
}
public Timestamp getEventHappenTime() {
return eventHappenTime;
}
public void setEventHappenTime(Timestamp eventHappenTime) {
this.eventHappenTime = eventHappenTime;
}
@Id
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="XcdWorkingOrderInfoSequence")
@SequenceGenerator(name = "XcdWorkingOrderInfoSequence", sequenceName = "seq_inner_Working_Order_id", allocationSize=1)
public Long getInnerWorkingOrderId() {
return innerWorkingOrderId;
}
public void setInnerWorkingOrderId(Long innerWorkingOrderId) {
this.innerWorkingOrderId = innerWorkingOrderId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public int getProvinceCode() {
return provinceCode;
}
public void setProvinceCode(int provinceCode) {
this.provinceCode = provinceCode;
}
public String getProvinceName() {
return provinceName;
}
public void setProvinceName(String provinceName) {
this.provinceName = provinceName;
}
public String getAskname() {
return askname;
}
public void setAskname(String askName) {
this.askname = askName;
}
public String getKind() {
return kind;
}
public void setKind(String kind) {
this.kind = kind;
}
public String getOrigin() {
return origin;
}
public void setOrigin(String origin) {
this.origin = origin;
}
public String getSuborigin() {
return suborigin;
}
public void setSuborigin(String subOrigin) {
this.suborigin = subOrigin;
}
public String getIncidence() {
return incidence;
}
public void setIncidence(String incidence) {
this.incidence = incidence;
}
public String getPriority() {
return priority;
}
public void setPriority(String priority) {
this.priority = priority;
}
public String getSystype() {
return systype;
}
public void setSystype(String systype) {
this.systype = systype;
}
public String getSyssubtype() {
return syssubtype;
}
public void setSyssubtype(String syssubtype) {
this.syssubtype = syssubtype;
}
public String getWorkingOrderDescription() {
return workingOrderDescription;
}
public void setWorkingOrderDescription(String workingOrderDescription) {
this.workingOrderDescription = workingOrderDescription;
}
public String getAttachFlag() {
return attachFlag;
}
public void setAttachFlag(String attachFlag) {
this.attachFlag = attachFlag;
}
public String getAttachMent() {
return attachMent;
}
public void setAttachMent(String attachMent) {
this.attachMent = attachMent;
}
public String getFileAddress() {
return fileAddress;
}
public void setFileAddress(String fileAddress) {
this.fileAddress = fileAddress;
}
public String getWorkingOrderStatus() {
return workingOrderStatus;
}
public void setWorkingOrderStatus(String workingOrderStatus) {
this.workingOrderStatus = workingOrderStatus;
}
}
src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.java 0 → 100644
View file @ 09ca8f48
package com.hp.cmsz.repository;
import com.hp.cmsz.entity.InsideXcdWorkingOrderInfo;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.sql.Timestamp;
import java.util.List;
public interface InsideXcdWorkingOrderInfoDao extends JpaSpecificationExecutor<InsideXcdWorkingOrderInfo>,
PagingAndSortingRepository<InsideXcdWorkingOrderInfo, Long> {
//通过协查单ID获取 Add by afe
List<InsideXcdWorkingOrderInfo> findByInnerWorkingOrderId(Long workingOrderCode);
//通过参数和warningStatus查找 Add by Afe
List<InsideXcdWorkingOrderInfo> findByDataSourceIdInAndChannelIdInAndWarningSourceIdInAndProviderIdInAndProvinceIdInAndEventHappenTimeBetweenOrderByEventHappenTimeDesc(
List<String> datasourceId,
List<String> channelId,
List<String> warningSourceId,
List<String> providerId,
List<String> provinceId,
Timestamp startTime,
Timestamp endTime
);
}
src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoService.java 0 → 100644
View file @ 09ca8f48
package com.hp.cmsz.service.monitoroperation;
import com.hp.cmsz.entity.InsideXcdWorkingOrderInfo;
import com.hp.cmsz.repository.InsideXcdWorkingOrderInfoDao;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.sql.Timestamp;
import java.util.List;
@Service
public class InsideXcdWorkingOrderInfoService {
@Resource
private InsideXcdWorkingOrderInfoDao insideXcdWorkingOrderInfoDao;
//获取所有的告警(预警/隐患)
public List<InsideXcdWorkingOrderInfo> getAllInsideXcdWarning(){
return (List<InsideXcdWorkingOrderInfo>) insideXcdWorkingOrderInfoDao.findAll();
}
//通过参数筛选出InsideXcdWorkingOrderInfo对象
public List<InsideXcdWorkingOrderInfo> getByParameters(
List<String> DataSource,
List<String> ChannelName,
List<String> warningSource,
List<String> providerName,
List<String> provinceName,
Timestamp startDate,
Timestamp endDate){
return (List<InsideXcdWorkingOrderInfo>)insideXcdWorkingOrderInfoDao.findByDataSourceIdInAndChannelIdInAndWarningSourceIdInAndProviderIdInAndProvinceIdInAndEventHappenTimeBetweenOrderByEventHappenTimeDesc(DataSource, ChannelName, warningSource, providerName,provinceName, startDate, endDate);
}
//通过协查单筛选处InsideXcdWorkingOrderInfo对象
public List<InsideXcdWorkingOrderInfo> findByInnerWorkingOrderId(String workingOrderCode){
return insideXcdWorkingOrderInfoDao.findByInnerWorkingOrderId(Long.parseLong(workingOrderCode));
}
}
src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcd.java deleted 100644 → 0
View file @ 620e6ff0
/**
* Created by IntelliJ IDEA.
*User: afe
*Date: 2017/11/1
*Time: 17:06
*/
package com.hp.cmsz.web.monitoroperation;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import com.hp.cmsz.web.PageURLController;
import java.util.Map;
/**
* WorkingOrderCreateControll类负责对协查单生成页面进行控制
*
* @author afe
*
*/
@Controller
@RequestMapping(value = "/MonitorOperation/InsideXcd")
public class InsideXcd {
private static Logger logger = LoggerFactory.getLogger(WorkingOrderCreateController.class);
//内部协查单列表页面
@RequestMapping(method = RequestMethod.GET)
public String WorkingOrderCreate( Map model,
ServletRequest request, HttpSession session) {
return PageURLController.InsideXcd;
}
}
src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java 0 → 100644
View file @ 09ca8f48
/**
* Created by IntelliJ IDEA.
*User: afe
*Date: 2017/11/1
*Time: 17:06
*/
package com.hp.cmsz.web.monitoroperation;
import javax.annotation.Resource;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import com.google.gson.Gson;
import com.hp.cmsz.entity.*;
import com.hp.cmsz.repository.ChannelDao;
import com.hp.cmsz.repository.DataSourceDao;
import com.hp.cmsz.repository.ProviderDao;
import com.hp.cmsz.repository.ProvinceDao;
import com.hp.cmsz.service.CmszOperationLogService;
import com.hp.cmsz.service.SystemParameterService;
import com.hp.cmsz.service.WarningSourceService;
import com.hp.cmsz.service.monitoroperation.InsideXcdWorkingOrderInfoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import com.hp.cmsz.web.PageURLController;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* WorkingOrderCreateControll类负责对协查单生成页面进行控制
*
* @author afe
*
*/
@Controller
@RequestMapping(value = "/MonitorOperation/InsideXcd")
public class InsideXcdController {
private static Logger logger = LoggerFactory.getLogger(WorkingOrderCreateController.class);
@Resource
private InsideXcdWorkingOrderInfoService insideXcdWorkingOrderInfoService;
@Resource
private ProvinceDao provinceDao;
@Autowired
private ChannelDao channelDao;
@Autowired
private DataSourceDao dataSourceDao;
@Autowired
private WarningSourceService warningSourceService;
@Autowired
private ProviderDao providerDao;
@Autowired
private CmszOperationLogService cmszOperationLogService;
@Autowired
private SystemParameterService systemParameterService;
//内部协查单列表页面
@RequestMapping(method = RequestMethod.GET)
public String InsideXcdWorkingOrderInfo( Map model,
ServletRequest request, HttpSession session) {
//查出所以的内部协查单数据
List<InsideXcdWorkingOrderInfo> insideXcdWorkingOrderInfos = insideXcdWorkingOrderInfoService.getAllInsideXcdWarning();
//查询出所有的省份
List<Province> provinceList=(List<Province>)provinceDao.findProvince();
//查询出所有的渠道信息
List<Channel> channelList=(List<Channel>)channelDao.findChannel();
//查询出所有的告警来源
List<WarningSource> warningSourceList=warningSourceService.getAllWarningSource();
//查询出所有的数据来源信息
List<DataSource> datasourceList=(List<DataSource>)dataSourceDao.findDataSource();
//查询出所有的集成商
List<Provider> providerList=(List<Provider>)providerDao.findProvidersByProvinceVersionConfig();
Gson gson = new Gson();
model.put("insideXcdWorkingOrderInfos", gson.toJson(insideXcdWorkingOrderInfos));
model.put("warningSourceList", warningSourceList);
model.put("channelList", channelList);
model.put("datasourceList", datasourceList);
model.put("providerList", providerList);
model.put("provinceList", provinceList);
return PageURLController.InsideXcd;
}
//根据查询条件，改变分页中的内容
@RequestMapping(value = "/changeTable*", method = RequestMethod.GET)
@ResponseBody
public void changeTable(@RequestParam(value = "PeriodTag", defaultValue ="" ) String PeriodTag,
@RequestParam(value = "DataSourceTag", defaultValue ="") String DataSourceTag,
@RequestParam(value = "ChannelTag", defaultValue ="") String ChannelTag,
@RequestParam(value = "BusinessTag", defaultValue ="") String BusinessTag,
@RequestParam(value = "ProviderTag", defaultValue ="") String ProviderTag,
@RequestParam(value = "ProvinceTag", defaultValue ="") String ProvinceTag,
@RequestParam(value = "WorkingOrderCode", defaultValue ="") String WorkingOrderCode,
HttpServletResponse response) throws ParseException, UnsupportedEncodingException {
cmszOperationLogService.createLog("查询","告警明细","提交筛选项");
List<InsideXcdWorkingOrderInfo> insideXcdWorkingOrderInfos= new ArrayList<InsideXcdWorkingOrderInfo>();
List<InsideXcdWorkingOrderInfo> details =new ArrayList<InsideXcdWorkingOrderInfo>();
int max=systemParameterService.getMaxDetailsRowNumber();
//System.out.println("RiskEarlyWarningTag:"+RiskEarlyWarningTag);
if(!PeriodTag.trim().equals("")&&!DataSourceTag.trim().equals("")&&!ChannelTag.trim().equals("")
&&!BusinessTag.trim().equals("")&&!ProviderTag.trim().equals("")&&!ProvinceTag.trim().equals("")){
String[] dates=PeriodTag.split("\\~");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
Timestamp startDate=new Timestamp(format.parse(dates[0]).getTime());
Timestamp endDate=new Timestamp(format.parse(dates[1]).getTime());
String[] DSids=DataSourceTag.split("\\,");
List<String> dsList=new ArrayList<String>();
for(int i=0;i<DSids.length;i++){
dsList.add(DSids[i].trim());
}
String[] CHids=ChannelTag.split("\\,");
List<String> chList=new ArrayList<String>();
for(int i=0;i<CHids.length;i++){
chList.add(CHids[i].trim());
}
String[] Bids=BusinessTag.split("\\,");
List<String> bList=new ArrayList<String>();
for(int i=0;i<Bids.length;i++){
bList.add(Bids[i].trim());
}
String[] Pids=ProviderTag.split("\\,");
List<String> pList=new ArrayList<String>();
for(int i=0;i<Pids.length;i++){
pList.add(Pids[i].trim());
}
String[] Proids=ProvinceTag.split("\\,");
List<String> proList=new ArrayList<String>();
for(int i=0;i<Proids.length;i++){
proList.add(Proids[i].trim());
}
details =insideXcdWorkingOrderInfoService.getByParameters(dsList, chList, bList, pList, proList, startDate, endDate);
}else if(!WorkingOrderCode.trim().equals("")){//当协查单id不为空时，根据协查单查询
details=insideXcdWorkingOrderInfoService.findByInnerWorkingOrderId(WorkingOrderCode.trim());
}
else{
System.out.println("@@@@@@@@@@@@@@@@@@");
// details =insideXcdWorkingOrderInfoService.getLastMonth();
}
for(int i=0;i<max&&i<details.size();i++){
insideXcdWorkingOrderInfos.add(details.get(i));
}
// gjfxDetailList=insideXcdWorkingOrderInfos;
Gson gson = new Gson();
response.setContentType("text/Xml;charset=gbk");
PrintWriter out = null;
try {
out = response.getWriter();
out.println(gson.toJson(insideXcdWorkingOrderInfos));
}
catch (IOException ex1) {
ex1.printStackTrace();
}finally{ out.close(); }
}
}
src/main/webapp/WEB-INF/tags/ModelDataType.tag
View file @ 09ca8f48
...@@ -12,5 +12,3 @@ ...@@ -12,5 +12,3 @@
</div> </div>
</div> </div>
</script>
\ No newline at end of file
src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag
View file @ 09ca8f48
...@@ -8,10 +8,8 @@ ...@@ -8,10 +8,8 @@
<label>告警来源</label> <!-- <div class="slide-select"> --> <label>告警来源</label> <!-- <div class="slide-select"> -->
<select class="slide-menu-select" id="warningSource3" name="warningSource3"> <select class="slide-menu-select" id="warningSource3" name="warningSource3">
<option value="1,2,3,4" title="全部"selected><a href="#">全部</a></option> <option value="1,2,3,4" title="全部"selected><a href="#">全部</a></option>
<option value="1" title="外部告警"><a href="#">外部告警</a></option>
<option value="2" title="预警"><a href="#">预警</a></option> <option value="2" title="预警"><a href="#">预警</a></option>
<option value="3" title="隐患"><a href="#">隐患</a></option> <option value="3" title="隐患"><a href="#">隐患</a></option>
<option value="4" title="其他"><a href="#">其他</a></option>
</select> </select>
<!-- </div> --> <!-- </div> -->
</div> </div>
......
src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysisDetail.jsp
View file @ 09ca8f48
...@@ -364,17 +364,8 @@ th{ ...@@ -364,17 +364,8 @@ th{
//省份标签 //省份标签
$('#ProvinceTag').text("省份").append($("<span class='badge'></span>").text(ProvinceTag[0])).attr('data-original-title',ProvinceTag[2]).tooltip(); $('#ProvinceTag').text("省份").append($("<span class='badge'></span>").text(ProvinceTag[0])).attr('data-original-title',ProvinceTag[2]).tooltip();
/* upLoadExcel="${ctx}/MonitorOperation/WarnAnalysisDetail/upLoadExcel?PeriodTag=" + PeriodTag }else if('<%=request.getParameter("ModelTag")%>'!='null'&&'<%=request.getParameter("ModelTag")%>'!=''&&'<%=request.getParameter("PeriodTag")%>'!='null'&&'<%=request.getParameter("PeriodTag")%>'!=''&&'<%=request.getParameter("DataSourceTag")%>'!='null'&&'<%=request.getParameter("DataSourceTag")%>'!=''&&'<%=request.getParameter("ChannelTag")%>'!='null'&&'<%=request.getParameter("ChannelTag")%>'!=''&&'<%=request.getParameter("BusinessTag")%>'!='null'&&'<%=request.getParameter("BusinessTag")%>'!=''&&'<%=request.getParameter("ProviderTag")%>'!='null'&&'<%=request.getParameter("ProviderTag")%>'!=''&&'<%=request.getParameter("ProvinceTag")%>'!='null'&&'<%=request.getParameter("ProvinceTag")%>'!='')
+ "&WarningSourceTag=" + WarningSourceTag[0] {
+ "&RiskEarlyWarningTag="+ RiskEarlyWarningTag[0]
+ "&DataSourceTag="+ DataSourceTag[1]
+ "&ChannelTag=" + ChannelTag[1]
+ "&BusinessTag="+ BusinessTag[1]
+ "&ProviderTag=" + ProviderTag[1]
+ "&ImportanceLevelTag="+ ImportanceLevelTag[1]
+ "&ProvinceTag="+ ProvinceTag[1];
*/
}else if('<%=request.getParameter("ModelTag")%>'!='null'&&'<%=request.getParameter("ModelTag")%>'!=''&&'<%=request.getParameter("PeriodTag")%>'!='null'&&'<%=request.getParameter("PeriodTag")%>'!=''&&'<%=request.getParameter("DataSourceTag")%>'!='null'&&'<%=request.getParameter("DataSourceTag")%>'!=''&&'<%=request.getParameter("ChannelTag")%>'!='null'&&'<%=request.getParameter("ChannelTag")%>'!=''&&'<%=request.getParameter("BusinessTag")%>'!='null'&&'<%=request.getParameter("BusinessTag")%>'!=''&&'<%=request.getParameter("ProviderTag")%>'!='null'&&'<%=request.getParameter("ProviderTag")%>'!=''&&'<%=request.getParameter("ProvinceTag")%>'!='null'&&'<%=request.getParameter("ProvinceTag")%>'!=''){
$('#PeriodTag').text("时间范围").attr('data-original-title','<%=request.getParameter("PeriodTag")%>').tooltip(); $('#PeriodTag').text("时间范围").attr('data-original-title','<%=request.getParameter("PeriodTag")%>').tooltip();
$('#RiskEarlyWarningTag').text("数据模型").attr('data-original-title','<%=request.getParameter("ModelTag")%>').tooltip(); $('#RiskEarlyWarningTag').text("数据模型").attr('data-original-title','<%=request.getParameter("ModelTag")%>').tooltip();
$('#DataSourceTag').text("数据来源").attr('data-original-title','<%=request.getParameter("DataSourceTag")%>'.split("/")[2]).tooltip(); $('#DataSourceTag').text("数据来源").attr('data-original-title','<%=request.getParameter("DataSourceTag")%>'.split("/")[2]).tooltip();
...@@ -382,7 +373,8 @@ th{ ...@@ -382,7 +373,8 @@ th{
$('#BusinessTag').text("业务").attr('data-original-title','<%=request.getParameter("BusinessTag")%>'.split("/")[2]).tooltip(); $('#BusinessTag').text("业务").attr('data-original-title','<%=request.getParameter("BusinessTag")%>'.split("/")[2]).tooltip();
$('#ProviderTag').text("集成商").attr('data-original-title','<%=request.getParameter("ProviderTag")%>'.split("/")[2]).tooltip(); $('#ProviderTag').text("集成商").attr('data-original-title','<%=request.getParameter("ProviderTag")%>'.split("/")[2]).tooltip();
$('#ProvinceTag').text("省份").attr('data-original-title','<%=request.getParameter("ProvinceTag")%>'.split("/")[2]).tooltip(); $('#ProvinceTag').text("省份").attr('data-original-title','<%=request.getParameter("ProvinceTag")%>'.split("/")[2]).tooltip();
}else if('<%=request.getParameter("ModelTag")%>'!='null'&&'<%=request.getParameter("ModelTag")%>'!=''&&'<%=request.getParameter("ProviderTag")%>'!='null'&&'<%=request.getParameter("ProviderTag")%>'!=''&&'<%=request.getParameter("ProvinceTag")%>'!='null'&&'<%=request.getParameter("ProvinceTag")%>'!=''){ }
else if('<%=request.getParameter("ModelTag")%>'!='null'&&'<%=request.getParameter("ModelTag")%>'!=''&&'<%=request.getParameter("ProviderTag")%>'!='null'&&'<%=request.getParameter("ProviderTag")%>'!=''&&'<%=request.getParameter("ProvinceTag")%>'!='null'&&'<%=request.getParameter("ProvinceTag")%>'!=''){
$('#RiskEarlyWarningTag').text("数据模型").attr('data-original-title','<%=request.getParameter("ModelTag")%>').tooltip(); $('#RiskEarlyWarningTag').text("数据模型").attr('data-original-title','<%=request.getParameter("ModelTag")%>').tooltip();
$('#ProviderTag').text("集成商").attr('data-original-title','<%=request.getParameter("ProviderTag")%>'.split("/")[2]).tooltip(); $('#ProviderTag').text("集成商").attr('data-original-title','<%=request.getParameter("ProviderTag")%>'.split("/")[2]).tooltip();
$('#ProvinceTag').text("省份").attr('data-original-title','<%=request.getParameter("ProvinceTag")%>'.split("/")[2]).tooltip(); $('#ProvinceTag').text("省份").attr('data-original-title','<%=request.getParameter("ProvinceTag")%>'.split("/")[2]).tooltip();
...@@ -391,20 +383,15 @@ th{ ...@@ -391,20 +383,15 @@ th{
$('#ProvinceTag').text('<%=request.getParameter("ProvinceTag")%>'); $('#ProvinceTag').text('<%=request.getParameter("ProvinceTag")%>');
$('#PeriodTag').text("最近一个月");//默认显示最近一个月的数据 $('#PeriodTag').text("最近一个月");//默认显示最近一个月的数据
$('#WarningStatusTag').text(""); $('#WarningStatusTag').text("");
// upLoadExcel='${ctx}/MonitorOperation/WarnAnalysisDetail/upLoadExcel?ProvinceTag=<%=request.getParameter("ProvinceTag")%>';
}else if('<%=request.getParameter("WarningSourceTag")%>'!='null'&&'<%=request.getParameter("WarningSourceTag")%>'!=''){//默认页面点击告警来源 }else if('<%=request.getParameter("WarningSourceTag")%>'!='null'&&'<%=request.getParameter("WarningSourceTag")%>'!=''){//默认页面点击告警来源
//告警来源标签 //告警来源标签
$('#WarningSourceTag').text('<%=request.getParameter("WarningSourceTag")%>'); $('#WarningSourceTag').text('<%=request.getParameter("WarningSourceTag")%>');
$('#PeriodTag').text("最近一个月"); $('#PeriodTag').text("最近一个月");
$('#WarningStatusTag').text(""); $('#WarningStatusTag').text("");
// upLoadExcel='${ctx}/MonitorOperation/WarnAnalysisDetail/upLoadExcel?ProvinceTag=<%=request.getParameter("WarningSourceTag")%>';
}else if('<%=request.getParameter("PeriodTag")%>'!='null'&&'<%=request.getParameter("PeriodTag")%>'!=''){//默认页面点击时间 }else if('<%=request.getParameter("PeriodTag")%>'!='null'&&'<%=request.getParameter("PeriodTag")%>'!=''){//默认页面点击时间
//时间标签 //时间标签
//var time=(gjfxList.length>0)?formatDate(gjfxList[0].occurTime,"yyyy-MM-dd"):"";
//$('#PeriodTag').text("时间范围").tooltip({title:time});
$('#PeriodTag').text("时间范围").tooltip({title:'<%=request.getParameter("PeriodTag")%>'}); $('#PeriodTag').text("时间范围").tooltip({title:'<%=request.getParameter("PeriodTag")%>'});
$('#WarningStatusTag').text(""); $('#WarningStatusTag').text("");
// upLoadExcel='${ctx}/MonitorOperation/WarnAnalysisDetail/upLoadExcel?ProvinceTag=<%=request.getParameter("PeriodTag")%>';
} }
}); });
......
src/main/webapp/static/js/insideXcdWarningTable.js
View file @ 09ca8f48
...@@ -123,23 +123,21 @@ df.applyPattern("yyyy-MM-dd HH:mm:ss"); ...@@ -123,23 +123,21 @@ df.applyPattern("yyyy-MM-dd HH:mm:ss");
var xcdId; var xcdId;
var xcdlen; var xcdlen;
function xcdFindTable(){ function xcdFindTable(){
console.log("@@@@@@@@@@@@") jsonData=document.getElementById('wadt').value;
jsonData=document.getElementById('checkRelXcdJson').value;
var header = new Array(); var header = new Array();
header[0] = ["","<input type='radio' name='update'id='update' onclick='javascript:radioChoose(this);'/>","1%",""]; header[0] = ["","<input type='radio' name='update'id='update' onclick='javascript:radioChoose(this);'/>","1%",""];
header[1] = ["编号","workingOrderCode","4%",""]; header[1] = ["编号","innerWorkingOrderId","4%",""];
header[2] = ["协查单标题","workingOrderTitle","8%","15"]; header[2] = ["内部协查单标题","title","8%","15"];
header[3] = ["协查单描述","workingOrderDescription","10%","18"]; header[3] = ["省份","provinceName","4%",""];
header[4] = ["省份","provinceName","4%",""]; header[4] = ["发生时间","eventHappenTime","4%",""];
// header[5] = ["渠道","channelName","4%",""]; header[5] = ["事件子来源","suborigin","4%",""];
// header[6] = ["重要级别","importanceLevelName","5%",""]; header[6] = ["工单状态","workingOrderStatus","7%",""];
// header[7] = ["告警来源","warningSourceName","5%",""]; header[7] = ["关联告警","alarmListRelation","7%",""];
header[5] = ["事件发生时间","eventHappenTime","7%",""]; header[8] = ["告警附件下载","fileAddress","7%",""];
// header[12]=["详细","","4%",""];
window.pagging = new table_pagging({limit:12,tableId:'xcdResultTable',header:header}); window.pagging = new table_pagging({limit:12,tableId:'xcdResultTable',header:header});
// console.log(jsonData)
pagging.pagging(jsonData); pagging.pagging(jsonData);
} }
...@@ -279,7 +277,8 @@ table_pagging.prototype = { ...@@ -279,7 +277,8 @@ table_pagging.prototype = {
var tdTitle = ""; var tdTitle = "";
if (this.header[k][1]) { if (this.header[k][1]) {
var reg = /\%\{([\d\w.]+)\}\%/g; var reg = /\%\{([\d\w.]+)\}\%/g;
if (k != 0) { if (k !== 0) {
if (result = reg.exec(this.header[k][1])) { if (result = reg.exec(this.header[k][1])) {
// var result = reg.exec(this.header[k][1]); // var result = reg.exec(this.header[k][1]);
var context = this.header[k][1]; var context = this.header[k][1];
...@@ -292,36 +291,38 @@ table_pagging.prototype = { ...@@ -292,36 +291,38 @@ table_pagging.prototype = {
} }
tdContext = context; tdContext = context;
} else { }
else {
tdContext = this.getData(this.objectlist[i], tdContext = this.getData(this.objectlist[i],
this.header[k][1]); this.header[k][1]);
if(tdContext==null){ if(tdContext==null){
tdContext = "&nbsp;"; tdContext = "&nbsp;";
} }
// if(k==12){ //显示协查单的详细列表 if(k===4){
// tdContext= "<a target='_blank' href='/CmszMonitorAnalysis/MonitorOperation/WorkingOrderReasult?xcdId="+this.getData(this.objectlist[i],this.header[k][1])+"'>"+ tdContext+"</a>" tdContext = this.formateDate(tdContext);
if(k==1){
tdContext= "<a target='_blank' href='/CmszMonitorAnalysis/MonitorOperation/WorkingOrderDetail?xcdCode="+this.getData(this.objectlist[i],this.header[k][1])+"'>"+ tdContext+"</a>";
} }
if(k==5){ if(k==6){
if(tdContext!="&nbsp;"){ if(tdContext!=="&nbsp;"){
tdContext = df.format(new Date(tdContext)); switch (tdContext){
case '1':
tdContext ='未确认';
break;
case '2':
tdContext ='关闭';
break;
case '3':
tdContext ='已下发协查单';
break;
} }
} }
if(k==6){
if(tdContext!="&nbsp;"){
tdContext = df.format(new Date(tdContext));
} }
} }
} }
} else { else {
tdContext=this.header[k][1]+"<span style='display:none'>"+i+"</span>"; tdContext=this.header[k][1]+"<span style='display:none'>"+i+"</span>";
// tdContext=this.header[k][1]; // tdContext=this.header[k][1];
} }
} else { } else {
tdContext = "&nbsp;"; tdContext = "&nbsp;";
......
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