m

youxiw2000
1 parent 25712633
Showing 7 changed files with 31 additions and 11 deletions
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-ui/src/router/index.js
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/controller/RemoteServerController.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
trash-workFlow/src/main/java/com/trash/workflow/listener/ConstructionEndListener.java
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
@@ -724,7 +724,13 @@ public class RemoteServerUtils {
 			okHttpClient = getOkClient();
 		}
-		token = "Bearer " + token;
+		
+		if (token.contains("durable:")) {
+			token = "Bearer " + token.replaceAll("durable:", "");
+		} else {
+			token = "Bearer auth:token:" + token;
+		}
+		
 		String param = JSON.toJSON(obj).toString();
@@ -783,7 +789,12 @@ public class RemoteServerUtils {
 			okHttpClient = getOkClient();
 		}
-		token = "Bearer " + token;
+		if (token.contains("durable:")) {
+			token = "Bearer " + token.replaceAll("durable:", "");
+		} else {
+			token = "Bearer auth:token:" + token;
+		}
+		
 		String params = "";
 		if (obj != null) {
@@ -475,7 +475,19 @@ export const constantRoutes = [
       },
     ]
   },
-
+ {
+    path: '/unit',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'businessUnit/index',
+        component: (resolve) => require(['@/views/unit/businessUnit/index'], resolve),
+        name: '投放点信息',
+        meta: { title: '投放点信息' }
+      }
+    ]
+  },
   // {
   //   path: '/task/handle',
   //   component: Layout,
@@ -156,8 +156,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		}else{
 			ids.addAll(SecurityUtils.getLoginUser().getUser().getConList());
 		}
-			
-
 		if (SecurityUtils.getLoginUser().getUser().getConAreas().size() > 0) {
@@ -46,7 +46,7 @@ public class RemoteServerController {
     @PostMapping("/getAreaList")
     public AjaxResult getAreaList(){
-        JSONArray jsonArray = redisCache.getCacheObject("areaList");
+        JSONArray jsonArray = redisCache.getCacheObject("areas");
         if(jsonArray==null){
             return AjaxResult.error("获取区域列表失败!请稍后重试或联系管理员");
         }
@@ -94,9 +94,9 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 	 * @return 违规预警信息
 	 */
 	@Override
-	public List<ViolationWarningInformation> selectViolationWarningInformationList(
-			ViolationWarningInformation violationWarningInformation) {
-
+	public List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation) {
+			
+		
 		List<ViolationWarningInformation> list = new ArrayList<>();
 		JSONArray areas = redisCache.getCacheObject("areas");
@@ -32,7 +32,6 @@ public class ConstructionEndListener implements ExecutionListener {
 	@Autowired
 	trashConfig trashConfig;
-	
     @Override
     public void notify(DelegateExecution delegateExecution) {
@@ -131,7 +131,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="img12 != null  and img12 != ''"> and img12 = #{img12}</if>
 			<if test="person != null  and person != ''"> and person = #{person}</if>
 			<if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-			<if test="status != null  and status != ''"> and status = #{status}</if>
+			<if test="status != null"> and status = #{status}</if>
 			<if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
 			<if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and
 				#{workEndTime}</if>