From 951777654234cf9c03aa33e195eda05c1ec32c34 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.24>
Date: 星期三, 14 十一月 2018 13:42:30 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
index 7deb6b7..6dd943d 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
@@ -1,12 +1,17 @@
package com.fgkj.actions.ram;
+import java.util.List;
+
import com.fgkj.actions.ActionUtil;
+import com.fgkj.dto.BattInf;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.ram.Fbs9100_state;
import com.fgkj.dto.ram.Fbs9100s_dfu_state;
import com.fgkj.services.ram.Fbs9100s_dfu_stateService;
+import com.google.gson.reflect.TypeToken;
public class Fbs9100s_dfu_stateAction extends ActionUtil{
- private Fbs9100s_dfu_stateService service;
+ private Fbs9100s_dfu_stateService service = new Fbs9100s_dfu_stateService();
private String json;
private String result;
@@ -17,6 +22,29 @@
result=tojson(model);
return SUCCESS;
}
+ //鍗囩骇鎻掑叆
+ public String addPro(){
+ BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ ServiceModel model=service.addPro(binf);
+ result=tojson(model);
+ return SUCCESS;
+ }
+ //琛ㄦ牸鏄剧ず鎵归噺鎻掑叆鐨勬満鎴夸俊鎭�
+ public String serchInserStation(){
+ BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,BattInf.class);
+ ServiceModel model=service.serchInserStation(binf);
+ result=tojson(model);
+ return SUCCESS;
+ }
+
+ //鎵归噺鍗囩骇鍓嶉獙璇佸崌绾х殑璁惧蹇呴』澶勪簬鍦ㄧ嚎鐩戞祴鐘舵��(9100state鐨剋orkstate涓�0)
+ public String judgeStation(){
+ List<Integer> list=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Integer>>(){}.getType());
+ ServiceModel model=service.judgeStation(list);
+ result=tojson(model);
+ return SUCCESS;
+ }
+
//鍗囩骇纭
public String update(){
Fbs9100s_dfu_state dfu=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Fbs9100s_dfu_state.class);
@@ -24,6 +52,20 @@
result=tojson(model);
return SUCCESS;
}
+ //鎵归噺鍗囩骇纭
+ public String updatePro(){
+ List<Fbs9100s_dfu_state> list=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Fbs9100s_dfu_state>>(){}.getType());
+ ServiceModel model=service.updatePro(list);
+ result=tojson(model);
+ return SUCCESS;
+ }
+ //鍗囩骇鐣岄潰瀹炴椂鍒锋柊
+ public String serchByCondition(){
+ List<Integer> list=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Integer>>(){}.getType());
+ ServiceModel model=service.serchByCondition(list);
+ result=tojson(model);
+ return SUCCESS;
+ }
public String getResult() {
return result;
--
Gitblit v1.9.1