Redeem před 1 rokem
rodič
revize
45b3f7e300

+ 6 - 1
src/main/java/com/steerinfo/dil/config/SessionInterceptor.java

@@ -35,7 +35,12 @@ public class SessionInterceptor extends HandlerInterceptorAdapter {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         HandlerMethod hm = (HandlerMethod) handler;
         String requestUrl = "" + request.getRequestURL();
-        if(!requestUrl.contains("/api/v1/bp/bpLogin") && !requestUrl.contains("/api/v1/ams/dispatch") && !requestUrl.contains("/api/v1/uc/") && !requestUrl.contains("/api/v1/systemfiles/") && !requestUrl.contains("/api/v1/rms/insertPersonnel")
+        if(!requestUrl.contains("/api/v1/bp/bpLogin")
+                && !requestUrl.contains("/api/v1/ams/dispatch")
+                && !requestUrl.contains("/api/v1/report/updateOperateDaily")
+                && !requestUrl.contains("/api/v1/uc/")
+                && !requestUrl.contains("/api/v1/systemfiles/")
+                && !requestUrl.contains("/api/v1/rms/insertPersonnel")
                 && (request.getAttribute("userId")==null || request.getAttribute("userName")==null)){
             //无权访问
             response.setCharacterEncoding("UTF-8");

+ 6 - 0
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -1063,4 +1063,10 @@ public class AMScontroller  extends BaseRESTfulController {
     public Map<String, Object> updateBindRequirement(@RequestBody Map<String, Object> params) throws Exception {
         return amsFeign.updateBindRequirement(params);
     }
+
+    @ApiOperation("汽运传火运清洁能源")
+    @PostMapping("/qjnyChange")
+    public Map<String, Object> qjnyChange(@RequestBody Map<String, Object> params) throws Exception {
+        return amsFeign.qjnyChange(params);
+    }
 }

+ 6 - 0
src/main/java/com/steerinfo/dil/controller/ReportController.java

@@ -152,4 +152,10 @@ public class ReportController {
                                             Integer pageSize) {
         return reportFeign.staffAttendanceList(mapValue, apiId, pageNum, pageSize);
     }
+
+    @ApiOperation(value="日报表修改")
+    @PostMapping(value = "/updateOperateDaily")
+    Map<String, Object> updateOperateDaily() {
+        return reportFeign.updateOperateDaily();
+    }
 }

+ 3 - 0
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -390,4 +390,7 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/updateBindRequirement")
     Map<String, Object> updateBindRequirement(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/qjnyChange")
+    Map<String, Object> qjnyChange(@RequestBody Map<String, Object> map);
 }

+ 5 - 0
src/main/java/com/steerinfo/dil/feign/ReportFeign.java

@@ -1,10 +1,12 @@
 package com.steerinfo.dil.feign;
 
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -78,4 +80,7 @@ public interface ReportFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam  Integer pageNum,
                                             @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/report/reportDaily/updateOperateDaily")
+    Map<String, Object> updateOperateDaily();
 }

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -368,7 +368,7 @@
         SELECT * FROM (
         select
         OPERATION_POINT_ID "id",
-        OPERATION_POINT_ID "value",
+        OPERATION_POINT_NAME "value",
         OPERATION_POINT_NAME "OPERATION_POINT_NAME",
         OPERATION_POINT_NAME "label",
         OPERATION_POINT_NAME "text",