南汇油电修改权限开关

娄高锋
1 parent bafcd201
Showing 6 changed files with 101 additions and 7 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/service/forms/impl/RevenueLoader.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/pages/oil/modifyRights.html
@@ -234,8 +234,24 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	@RequestMapping(value = "/checkDate",method = RequestMethod.GET)
 	public String checkDate(@RequestParam Map<String, Object> map){
-		String list=ylbService.checkDate(map);
-		return list;
+		String result=ylbService.checkDate(map);
+		return result;
+	}
+	
+	@RequestMapping(value = "/getModifyRights",method = RequestMethod.GET)
+	public Map<String, Object> getModifyRights(@RequestParam Map<String, Object> map){
+		String result=ylbService.getModifyRights();
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("text", result);
+		return resMap;
+	}
+	
+	@RequestMapping(value = "/modifyRightsChange",method = RequestMethod.GET)
+	public Map<String, Object> modifyRightsChange(@RequestParam Map<String, Object> map){
+		String result=ylbService.modifyRightsChange();
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("text", result);
+		return resMap;
 	}
 	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
@@ -40,13 +40,13 @@ public class RevenueLoader {
      */
     public static List<Map<String, Object>> load(String date, String gsBm){
         try {
-        	url = ConfigUtil.get("http.ticketing.interface") + "?txnType=getLineRevenue&busiDate="+date+"&companyCode="+gsBm;
+        	url = ConfigUtil.get("http.ticketing.interface") + "?revenueFlag=1&txnType=getLineRevenue&busiDate="+date+"&companyCode="+gsBm;
             list = new ArrayList<>();
             httpClient = HttpClients.createDefault();
             get = new HttpGet(url);
             requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(2500).setConnectionRequestTimeout(2000)
-                    .setSocketTimeout(2500).build();
+                    .setConnectTimeout(10000).setConnectionRequestTimeout(10000)
+                    .setSocketTimeout(60000).build();
             get.setConfig(requestConfig);
             if(list.size() > 0)
                 list.clear();
@@ -20,6 +20,9 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	String checkJsy(Map<String, Object> map);
 	String checkDate(Map<String, Object> map);
+	
+	String getModifyRights();
+	String modifyRightsChange();
 	List<Map<String, Object>> oilListMonth(Map<String, Object> map);
 	List<Ylb> listYlb(Map<String, Object> map);
@@ -92,7 +92,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	Logger logger = LoggerFactory.getLogger(this.getClass());
-	
+	private static boolean modify_rights_close = true;
 	/**
 	 * 获取进存油信息
@@ -1602,7 +1602,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		String rq=map.get("rq").toString();
 		String gsbm=map.get("ssgsdm_like").toString();
 		String type="1";
-		if(gsbm.equals("26")){
+		if(gsbm.equals("26") && modify_rights_close){
 			Date date=new Date();
 			try {
 				long day2=date.getTime();
@@ -1619,6 +1619,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return type;
 	}
+	@Override
+	public String getModifyRights(){
+		return modify_rights_close?"关闭":"打开";
+	}
+	
+	@Override
+	public String modifyRightsChange(){
+		if(modify_rights_close){
+			modify_rights_close = false;
+		} else {
+			modify_rights_close = true;
+		}
+		return modify_rights_close?"权限关闭":"权限打开";
+	}
+	
 	@Override
@@ -652,6 +652,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	               		 layer.msg('只能操作一天内数据.');
 	               	}else{
 		                var i = layer.load(2);
+		                params["fgsdm_like"] = '';
 		                $get('/ylb/obtain', params, function () {
 		                	layer.close(i);
 		                    jsDoQuery(params, true);
+<div class="page-head">
+	<div class="page-title">
+		<h1>进出站油电信息编辑</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><span class="active">编辑权限</span></li>
+</ul>
+
+<div class="portlet light bordered">
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> <span
+				class="caption-subject font-red-sunglo bold uppercase"></span>
+		</div>
+	</div>
+	<div class="portlet-body form">
+		<form action="/addYlb" class="form-horizontal" id="ylb_add_form" >
+		
+		<div class="alert alert-danger display-hide">
+			<button class="close" data-close="alert"></button>
+			您的输入有误，请检查下面的输入项
+		</div>
+			<input type="hidden" value="0" name="yhlx" />
+			<div class="form-body">
+				<div class="form-group">
+					<label class="col-md-3 control-label">修改历史油/电权限：</label>
+					<div class="col-md-2">
+						<input type="text" class="form-control" name="modify_rights" id="modify_rights" readonly="readonly">
+					</div>
+					<button type="button" class="btn green" id="change" >修改</button>
+				</div>
+			</div>
+		</form>
+		<!-- END FORM-->
+	</div>
+</div>
+<script>
+(function(){
+	
+	function getModifyRights(){
+		$get('/ylb/getModifyRights',"",function(result){
+			$("#modify_rights").val(result.text);
+		});
+	}
+	getModifyRights();
+	
+	$("#change").on('click', function () {
+		var par={};
+		par["modify_rights"] = $("#modify_rights").val();
+		$get('/ylb/modifyRightsChange',par,function(result){
+			layer.msg(result.text);
+			getModifyRights();
+		});
+	});
+	
+})();
+</script>
 \ No newline at end of file