Merge branch 'dev' of http://192.168.168.245:8888/youxiw20000/trash into dev

liujun001
2 parents 9e9d1c23 6eb28816
Showing 40 changed files with 2184 additions and 1398 deletions
trash-common/src/main/java/com/trash/common/core/domain/entity/SysUser.java
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/dist.7z
trash-ui/src/api/dayWorkReport.js
trash-ui/src/api/dict.js
trash-ui/src/api/taskmethod.js
trash-ui/src/api/three_step.js
trash-ui/src/api/truck_active.js
trash-ui/src/api/vio_warning_info.js
trash-ui/src/api/warningInfo.js
trash-ui/src/utils/trash.js
trash-ui/src/views/activiti/task/dropPointinfo.vue
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/business/threestep/index.vue
trash-ui/src/views/h5/task/dropPointinfo.vue
trash-ui/src/views/h5/task/violationCaseFileInfo.vue
trash-ui/src/views/h5/task/violationWarningInformationInfo.vue
trash-ui/src/views/h5/threestep/index.vue
@@ -105,10 +105,28 @@ public class SysUser extends BaseEntity
     List<String> companyAreas = new ArrayList<String>();
     List<String> earthAreas = new ArrayList<String>();
     List<String> truckList = new ArrayList<String>();
-    
+
+    List<String> streetsAreas = new ArrayList<String>();
+    List<String> streetsList = new ArrayList<String>();
+	public List<String> getStreetsAreas() {
+		return streetsAreas;
+	}
+
+	public void setStreetsAreas(List<String> streetsAreas) {
+		this.streetsAreas = streetsAreas;
+	}
+
+	public List<String> getStreetsList() {
+		return streetsList;
+	}
+
+	public void setStreetsList(List<String> streetsList) {
+		this.streetsList = streetsList;
+	}
+
 	public List<String> getCompanyAreas() {
 		return companyAreas;
 	}
@@ -488,6 +488,32 @@ public class RemoteServerUtils {
 		return object;
 	}
+	public static JSONArray getStreets(String token){
+		JSONArray array = null;
+		
+		if (okHttpClient == null) {
+			okHttpClient = getOkClient();
+		}
+
+		Request request = new Request.Builder().url(remote + "/api/siteservice/v1/sites/tree/auth?type=4").addHeader("Authorization", token).get().build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONArray json = JSON.parseArray(result);
+				return json;
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+	
 	public static JSONArray getAreas(String token) {
 		JSONArray array = null;
 		Object object = get("/api/gpsservice/cs/area", null, token);
@@ -634,7 +660,7 @@ public class RemoteServerUtils {
 		String token = SecurityUtils.getLoginUser().getToken();
 		if (token.contains("durable:")) {
-			token = token.replace("durable:", "Bearer durable:auth:token:");
+			token = "Bearer " + token;
 		} else {
 			token = "Bearer auth:token:" + token;
 		}
@@ -674,8 +700,9 @@ public class RemoteServerUtils {
 		String token = SecurityUtils.getLoginUser().getToken();
+
 		if (token.contains("durable:")) {
-			token = token.replace("durable:", "Bearer durable:auth:token:");
+			token = "Bearer " + token;
 		} else {
 			token = "Bearer auth:token:" + token;
 		}
@@ -724,13 +751,8 @@ public class RemoteServerUtils {
 			okHttpClient = getOkClient();
 		}
-		
-		if (token.contains("durable:")) {
-			token = "Bearer " + token.replaceAll("durable:", "");
-		} else {
-			token = "Bearer auth:token:" + token;
-		}
-		
+		token = "Bearer " + token;
+	
 		String param = JSON.toJSON(obj).toString();
@@ -784,15 +806,11 @@ public class RemoteServerUtils {
 	public static Object get(String url, Map<String, String> obj, String token) {
 		if (okHttpClient == null) {
-
-
 			okHttpClient = getOkClient();
 		}
-		if (token.contains("durable:")) {
-			token = "Bearer " + token.replaceAll("durable:", "");
-		} else {
-			token = "Bearer auth:token:" + token;
-		}
+
+		token = "Bearer " + token;
+		
 		String params = "";
 		if (obj != null) {
@@ -844,35 +862,27 @@ public class RemoteServerUtils {
 	}
-	public static JSONArray getDriverList() {
+	public static JSONArray getDriverList(Map map) {
-		try {
-			Map map = new HashMap<>();
-			Object result = get(DriverListPath, null);
-			if (result != null) {
-				JSONObject json = JSON.parseObject(result.toString());
-				return json.getJSONArray("list");
-
-			} else {
-				return null;
-			}
+		String token = SecurityUtils.getLoginUser().getToken();
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
+		return getDriverList(token,map);
 	}
-	public static JSONArray getDriverList(String token) {
+	public static JSONArray getDriverList(String token,Map map) {
 		if (okHttpClient == null) {
 			okHttpClient = getOkClient();
 		}
+		
+		if (token.contains("durable:")) {
+			token = "Bearer " + token;
+		} else {
+			token = "Bearer auth:token:" + token;
+		}
-		token = "Bearer " + token;
-
-		String param = JSON.toJSON(new HashMap<>()).toString();
+		String param = JSON.toJSON(map).toString();
 		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
@@ -31,8 +31,10 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 /**
@@ -41,264 +43,288 @@ import java.util.Set;
  * @author trash
  */
 @Component
-public class SysLoginService
-{
-    @Autowired
-    private TokenService tokenService;
+public class SysLoginService {
+	@Autowired
+	private TokenService tokenService;
-    @Resource
-    private AuthenticationManager authenticationManager;
+	@Resource
+	private AuthenticationManager authenticationManager;
-    @Autowired
-    private RedisCache redisCache;
-    
-    @Autowired
-    UserDetailsService UserDetailsService;
+	@Autowired
+	private RedisCache redisCache;
-    @Autowired
+	@Autowired
+	UserDetailsService UserDetailsService;
+
+	@Autowired
 	SysTempMapper tempMapper;
-    
-    /**
-     * 登录验证
-     * 
-     * @param username 用户名
-     * @param password 密码
-     * @param code 验证码
-     * @param uuid 唯一标识
-     * @return 结果
-     */
-    public String login(String username, String password, String code, String uuid)
-    {
-        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
-        redisCache.deleteObject(verifyKey);
-        if (captcha == null)
-        {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
-            throw new CaptchaExpireException();
-        }
-        if (!code.equalsIgnoreCase(captcha))
-        {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
-            throw new CaptchaException();
-        }
-        // 用户验证
-        Authentication authentication = null;
-        try
-        {
-            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
-            authentication = authenticationManager
-                    .authenticate(new UsernamePasswordAuthenticationToken(username, password));
-        }
-        catch (Exception e)
-        {
-            if (e instanceof BadCredentialsException)
-            {
-                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
-                throw new UserPasswordNotMatchException();
-            }
-            else
-            {
-                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
-                throw new CustomException(e.getMessage());
-            }
-        }
-
-        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
-        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
-        // 生成token
-        return tokenService.createToken(loginUser);
-    }
-    
-
-    
-    public final String LOGIN_URL = "/api/authservice/cs/thirdpart/user"; //登录地址 待配置
-    
-    public LoginUser loginByRemote(String token)
-    {	
-    	OkHttpClient okHttpClient = RemoteServerUtils.getOkClient();
-    	
-    	JSONObject userJson = null;
-    	
-    	if(!token.contains("Bearer ")){
-    		token = "Bearer "+ token;
-    	}
-    	
-        Request request = new Request.Builder().url(RemoteServerUtils.remote + LOGIN_URL).addHeader("Authorization",token).get().build();
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	if("success".equals(json.getString("message"))){
-            		userJson = json.getJSONObject("result");
-            	}
-            }else{
-            	return null;
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	return null;
+
+	/**
+	 * 登录验证
+	 * 
+	 * @param username
+	 *            用户名
+	 * @param password
+	 *            密码
+	 * @param code
+	 *            验证码
+	 * @param uuid
+	 *            唯一标识
+	 * @return 结果
+	 */
+	public String login(String username, String password, String code, String uuid) {
+		String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+		String captcha = redisCache.getCacheObject(verifyKey);
+		redisCache.deleteObject(verifyKey);
+		if (captcha == null) {
+			AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL,
+					MessageUtils.message("user.jcaptcha.expire")));
+			throw new CaptchaExpireException();
+		}
+		if (!code.equalsIgnoreCase(captcha)) {
+			AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL,
+					MessageUtils.message("user.jcaptcha.error")));
+			throw new CaptchaException();
+		}
+		// 用户验证
+		Authentication authentication = null;
+		try {
+			// 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
+			authentication = authenticationManager
+					.authenticate(new UsernamePasswordAuthenticationToken(username, password));
+		} catch (Exception e) {
+			if (e instanceof BadCredentialsException) {
+				AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL,
+						MessageUtils.message("user.password.not.match")));
+				throw new UserPasswordNotMatchException();
+			} else {
+				AsyncManager.me()
+						.execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
+				throw new CustomException(e.getMessage());
+			}
+		}
+
+		AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS,
+				MessageUtils.message("user.login.success")));
+		LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+		// 生成token
+		return tokenService.createToken(loginUser);
+	}
+
+	public final String LOGIN_URL = "/api/authservice/cs/thirdpart/user"; // 登录地址
+																			// 待配置
+
+	public LoginUser loginByRemote(String token) {
+		OkHttpClient okHttpClient = RemoteServerUtils.getOkClient();
+
+		JSONObject userJson = null;
+
+		if (!token.contains("Bearer ")) {
+			token = "Bearer " + token;
+		}
+
+		Request request = new Request.Builder().url(RemoteServerUtils.remote + LOGIN_URL)
+				.addHeader("Authorization", token).get().build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				if ("success".equals(json.getString("message"))) {
+					userJson = json.getJSONObject("result");
+				}
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+
+		if (userJson == null) {
+			return null;
 		}
-    	
-        if(userJson == null){
-        	return null;
-        }
-        
-        LoginUser loginUser = new LoginUser();
-        
-        ArrayList<SimpleGrantedAuthority> authorities = new ArrayList<SimpleGrantedAuthority>();
-        SimpleGrantedAuthority activitiUser = new SimpleGrantedAuthority("ROLE_ACTIVITI_USER");
-        SimpleGrantedAuthority admin = new SimpleGrantedAuthority("admin");
-        authorities.add(activitiUser);
-        authorities.add(admin);
-        loginUser.setAuthorities(authorities);
-        
-        Set<String> set = new HashSet<String>();
-        
-        SysUser user = new SysUser();
-        user.setUserId(userJson.getString("id"));
-        user.setUserName(userJson.getString("name"));
-        user.setNickName(userJson.getString("name")); 
-        user.setPassword(userJson.getString("id"));
-        SysDept dept = new SysDept();
-
-        if(userJson.getJSONArray("userIdentityList")!=null){
-        	
-        	  List<String> poStrings = new ArrayList<String>();
-              
-              List<String> rolStrings = new ArrayList<String>();
-              
-              try {
-            	  
-            	  for(Object obj:userJson.getJSONArray("userIdentityList")){
-              		
-            		  JSONObject uId = (JSONObject)obj;
-              		
-              		poStrings.add(uId.getString("postType"));
-              		
-              		rolStrings.add(uId.getString("departmentType"));
-              		
-              	
-              	}
-            	  
-                  user.setPostIds(poStrings);
-                  
-                  user.setRoleIds(rolStrings);
-            	  
-                 
-      		} catch (Exception e) {
-      			// TODO: handle exception
-      		}
-        	
-        	
-        	
-        }
-        
-            JSONArray compnayList = redisCache.getCacheObject("companyList");
-            
-            if(compnayList == null){
-            	
-            	compnayList = JSONArray.parseArray(tempMapper.getLocalData("companyList"));
-            }
-                for(Object obj:compnayList){
-                	JSONObject con = (JSONObject)(obj);
-                	
-           		 
-           		 if(con.getString("abbreviation").equals(user.getUserName().replace("公司", ""))){
-           			user.setCompanyName(con.getString("name"));
-           	        user.setUserName(con.getString("abbreviation"));
-           	        user.setNickName(con.getString("abbreviation")); 
-           			 break;
-           		 }
-           		 
-                }
-                
-            
-            
-
-        
-        JSONArray jsonArray = (JSONArray)RemoteServerUtils.getAuth(token);
-        if(jsonArray != null){
-            for(Object obj:jsonArray){
-            	JSONObject json = (JSONObject)obj;
-            	if(json.getInteger("sourceType") == 2){
-            		if(json.getJSONArray("sourceIds") != null){
-    	        		List<String> tIds = json.getJSONArray("sourceIds").toJavaList(String.class);
-    	        		user.setTruckList(tIds);
-            		}
-            		if(json.getJSONArray("companyIds") != null){
-            			List<String> companyIds = json.getJSONArray("companyIds").toJavaList(String.class);
-                		user.setCompanyIds(companyIds);
-            		}
-
-            		if(json.getJSONArray("adCodes") != null){
-    	        		List<String> areas = json.getJSONArray("adCodes").toJavaList(String.class);
-    	        		user.setCompanyAreas(areas);
-            		}
-            	}else if(json.getInteger("sourceType") == 3){
-            		if(json.getJSONArray("sourceIds") != null){
-    	        		List<String> companyIds = json.getJSONArray("sourceIds").toJavaList(String.class);
-    	        		user.setConList(companyIds);
-            		}
-            		if(json.getJSONArray("adCodes") != null){
-    	        		List<String> areas = json.getJSONArray("adCodes").toJavaList(String.class);
-    	        		user.setConAreas(areas);
-            		}
-            	}else if(json.getInteger("sourceType") == 4){
-            		if(json.getJSONArray("sourceIds") != null){
-    	        		List<String> companyIds = json.getJSONArray("sourceIds").toJavaList(String.class);
-    	        		user.setEarthList(companyIds);
-            		}
-            		if(json.getJSONArray("adCodes") != null){
-    	        		List<String> areas = json.getJSONArray("adCodes").toJavaList(String.class);
-    	        		user.setEarthAreas(areas);
-            		}
-            	}
-            }
-        }
-
-      
-
-        dept.setDeptName(userJson.getString("orgName"));
-        
-        user.setDept(dept);
-        
-        user.setAvatar(RemoteServerUtils.remote + userJson.getString("elecSignaturePath"));
-        
-        loginUser.setUser(user);
-        
-
-        set.add("*:*:*");//测试直接给admin
-        
-        for(Object object:userJson.getJSONArray("menus")){
-        	JSONObject menu = (JSONObject) object;
-        	
-        	set.add(menu.getString("code"));
-        }
-        
-        
-        SysRole role = new SysRole();
-        
-        role.setRoleKey("admin");
-        
-        ArrayList<SysRole> roles = new ArrayList<SysRole>();
-        
-        roles.add(role);
-        
-        user.setRoles(roles);
-        
-        token = token.replace("Bearer ", "").replace("auth:token:", "");
-
-        loginUser.setPermissions(set);
-        
-        loginUser.setToken(token);
-        tokenService.refreshToken(loginUser);
-     
-        // 生成token
-        return loginUser;
-    }
+
+		LoginUser loginUser = new LoginUser();
+
+		ArrayList<SimpleGrantedAuthority> authorities = new ArrayList<SimpleGrantedAuthority>();
+		SimpleGrantedAuthority activitiUser = new SimpleGrantedAuthority("ROLE_ACTIVITI_USER");
+		SimpleGrantedAuthority admin = new SimpleGrantedAuthority("admin");
+		authorities.add(activitiUser);
+		authorities.add(admin);
+		loginUser.setAuthorities(authorities);
+
+		Set<String> set = new HashSet<String>();
+
+		SysUser user = new SysUser();
+		user.setUserId(userJson.getString("id"));
+		user.setUserName(userJson.getString("name"));
+		user.setNickName(userJson.getString("name"));
+		user.setPassword(userJson.getString("id"));
+		SysDept dept = new SysDept();
+
+		if (userJson.getJSONArray("userIdentityList") != null) {
+
+			List<String> poStrings = new ArrayList<String>();
+
+			List<String> rolStrings = new ArrayList<String>();
+
+			try {
+
+				for (Object obj : userJson.getJSONArray("userIdentityList")) {
+
+					JSONObject uId = (JSONObject) obj;
+
+					poStrings.add(uId.getString("postType"));
+
+					rolStrings.add(uId.getString("departmentType"));
+
+				}
+
+				user.setPostIds(poStrings);
+
+				user.setRoleIds(rolStrings);
+
+			} catch (Exception e) {
+				// TODO: handle exception
+			}
+
+		}
+
+		JSONArray compnayList = redisCache.getCacheObject("companyList");
+
+		if (compnayList == null) {
+			compnayList = JSONArray.parseArray(tempMapper.getLocalData("companyList"));
+		}
+		for (Object obj : compnayList) {
+			JSONObject con = (JSONObject) (obj);
+
+			if (con.getString("abbreviation").equals(user.getUserName().replace("公司", ""))) {
+				user.setCompanyName(con.getString("name"));
+				user.setUserName(con.getString("abbreviation"));
+				user.setNickName(con.getString("abbreviation"));
+				break;
+			}
+
+		}
+
+		JSONArray jsonArray = (JSONArray) RemoteServerUtils.getAuth(token);
+		
+		JSONArray streets =  (JSONArray) RemoteServerUtils.getStreets(token);
+		
+		Map<String, List<String>> streetsMap = new HashMap<String, List<String>>();
+		
+		for(Object obj:streets){
+			JSONObject jsonObject = (JSONObject) obj;
+			if(jsonObject.getString("level").equals("3")){
+				streetsMap.put(jsonObject.getString("id"), new ArrayList<>());
+			}
+		}
+		
+		for(Object obj:streets){
+			JSONObject jsonObject = (JSONObject) obj;
+			if(jsonObject.getString("level").equals("4")){
+				streetsMap.get(jsonObject.getString("pid")).add(jsonObject.getString("id"));
+			}
+		}
+		
+		if (jsonArray != null) {
+			
+			
+			if(user.getStreetsList() == null){
+				user.setStreetsList(new ArrayList<>());
+			}
+			
+			for (Object obj : jsonArray) {
+				JSONObject json = (JSONObject) obj;
+				if (json.getInteger("sourceType") == 2) {
+					if (json.getJSONArray("sourceIds") != null) {
+						List<String> tIds = json.getJSONArray("sourceIds").toJavaList(String.class);
+						user.setTruckList(tIds);
+					}
+					if (json.getJSONArray("companyIds") != null) {
+						List<String> companyIds = json.getJSONArray("companyIds").toJavaList(String.class);
+						user.setCompanyIds(companyIds);
+					}
+
+					if (json.getJSONArray("adCodes") != null) {
+						List<String> areas = json.getJSONArray("adCodes").toJavaList(String.class);
+						user.setCompanyAreas(areas);
+					}
+				} else if (json.getInteger("sourceType") == 3) {
+					if (json.getJSONArray("sourceIds") != null) {
+						List<String> companyIds = json.getJSONArray("sourceIds").toJavaList(String.class);
+						user.setConList(companyIds);
+					}
+					if (json.getJSONArray("adCodes") != null) {
+						List<String> areas = json.getJSONArray("adCodes").toJavaList(String.class);
+						user.setConAreas(areas);
+					}
+				} else if (json.getInteger("sourceType") == 4) {
+					if (json.getJSONArray("sourceIds") != null) {
+						List<String> companyIds = json.getJSONArray("sourceIds").toJavaList(String.class);
+						user.setEarthList(companyIds);
+					}
+					if (json.getJSONArray("adCodes") != null) {
+						List<String> areas = json.getJSONArray("adCodes").toJavaList(String.class);
+						user.setEarthAreas(areas);
+					}
+				} else if (json.getInteger("sourceType") == 6) {
+					if (json.getJSONArray("sourceIds") != null) {
+						List<String> companyIds = json.getJSONArray("sourceIds").toJavaList(String.class);
+						
+						user.getStreetsList().addAll(companyIds);
+				
+					}
+					if (json.getJSONArray("adCodes") != null) {
+						List<String> areas = json.getJSONArray("adCodes").toJavaList(String.class);
+						for(String str:areas){
+							if(streetsMap.get(str) == null)
+								continue;
+							user.getStreetsList().addAll(streetsMap.get(str));
+						}
+					}
+				}
+			}
+		}
+
+		dept.setDeptName(userJson.getString("orgName"));
+
+		user.setDept(dept);
+
+		user.setAvatar(RemoteServerUtils.remote + userJson.getString("elecSignaturePath"));
+
+		loginUser.setUser(user);
+
+		set.add("*:*:*");// 测试直接给admin
+
+		for (Object object : userJson.getJSONArray("menus")) {
+			JSONObject menu = (JSONObject) object;
+
+			set.add(menu.getString("code"));
+		}
+
+		SysRole role = new SysRole();
+
+		role.setRoleKey("admin");
+
+		ArrayList<SysRole> roles = new ArrayList<SysRole>();
+
+		roles.add(role);
+
+		user.setRoles(roles);
+
+		token = token.replace("Bearer ", "").replace("auth:token:", "");
+
+		loginUser.setPermissions(set);
+
+		loginUser.setToken(token);
+		tokenService.refreshToken(loginUser);
+
+		// 生成token
+		return loginUser;
+	}
 }
@@ -603,8 +603,11 @@ public class DriverTask {
 		if (TOKEN == null) {
 			TOKEN = trashConfig.getToken();
 		}
-
-		JSONArray drivers = RemoteServerUtils.getDriverList(TOKEN);
+		
+		Map map = new HashMap<>();
+		map.put("size", "99999");
+		map.put("page", "1");
+		JSONArray drivers = RemoteServerUtils.getDriverList(TOKEN,map);
 		for (Object object : drivers) {
@@ -640,7 +643,7 @@ public class DriverTask {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		Map map = new HashMap<>();
-		map.put("size", 9999);
+		map.put("size", 99999);
 		map.put("valid", 0);
 		map.put("page", 1);
@@ -713,7 +716,7 @@ public class DriverTask {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		Map map = new HashMap<>();
-		map.put("size", 9999);
+		map.put("size", 99999);
 		map.put("page", 1);
 		JSONArray companys = RemoteServerUtils.getCompanyList(map, TOKEN);
@@ -218,7 +218,7 @@ export default {
       var size = this.queryParams.pageSize;
       this.queryParams.page = 1;
-      this.queryParams.pageSize = 9999;
+      this.queryParams.pageSize = 999999;
       if (this.queryParams.timeRange) {
         this.queryParams.workStartTime = this.queryParams.timeRange[0];
 import requestRemote from '@/utils/requestRemote'
-
+
 export function getTruckList(params) {
   return requestRemote({
     url: ' /api/gpsservice/cs/basevehicle/simplelist',
-    method: 'get',
+    method: 'get',
     params:params
   });
-}
-//license/ 先留一下免得又改
+}
+//license/ 先留一下免得又改
 export function constructionLicenseById(id) {
   return requestRemote({
     url: '/api/siteservice/cs/constructionsites/'+id,
     method: 'get',
   });
 }
-
+
 export function constructionById(id) {
   return requestRemote({
@@ -58,23 +58,23 @@ export function earthsitesList(data) {
     method: 'post',
     data: data
   });
-}
-
+}
+
 export function constructionsitesLedgerList(data) {
   return requestRemote({
     url: '/api/siteservice/cs/constructionsites/ledger/list',
     method: 'post',
     data: data
   });
-}
-
+}
+
 export function earthsitesLedgerList(data) {
   return requestRemote({
     url: '/api/siteservice/cs/earthsites/ledger/list',
     method: 'post',
     data: data
   });
-}
+}
 export function updateEarthsites(data) {
   return requestRemote({
@@ -83,7 +83,7 @@ export function updateEarthsites(data) {
     data: data
   });
 }
-
+
 export function companyList(data) {
   return requestRemote({
@@ -142,14 +142,14 @@ export function getConstructionTruck(id) {
     url: '/api/siteservice/cs/unitetransport/bysite/' + id,
     method: 'get',
   });
-}
+}
 export function getTruckInfo(id) {
   return requestRemote({
     url: '/api/gpsservice/cs/basevehicle/' + id,
     method: 'get',
   });
-}
+}
 export function getCompanyInfo(id) {
   return requestRemote({
@@ -179,15 +179,15 @@ export function getUsers(data){
     method: 'post',
     data:data
   })
-}
+}
 export function getAuth() {
   return requestRemote({
     url: '/api/gpsservice/cs/authority',
     method: 'get',
   });
-}
-
+}
+
 export function getDict(params) {
@@ -205,3 +205,20 @@ export function getSupervision(params) {
     params: params
   });
 }
+
+/**
+ * 投放点获取区域数据
+ */
+export function getAreaList() {
+  return requestRemote({
+    url: '/api/siteservice/v1/sites/tree/auth?type=4',
+    method: 'get'
+  });
+}
+
+export function getAreasList() {
+  return requestRemote({
+    url: '/api/gisservice/v2/jurisdictions/areas?dict=1',
+    method: 'get'
+  });
+}
-import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";
-
-import {historyFromData} from '@/api/activiti/historyFormdata'
-import {addSign, getSignByObjId} from "@/api/sign/sign";
-import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
-import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
-import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
-import {getDict, getSupervision, getUsers} from "@/api/dict";
-import {activeThreestep} from "@/api/business/threestep";
-import {getToken} from "@/utils/auth";
-import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";
+
+import {historyFromData} from '@/api/activiti/historyFormdata'
+import {addSign, getSignByObjId} from "@/api/sign/sign";
+import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
+import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
+import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
+import {getDict, getSupervision, getUsers} from "@/api/dict";
+import {activeThreestep} from "@/api/business/threestep";
+import {getToken} from "@/utils/auth";
+import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
 import {updateHandleAffairs} from "@/api/office/handle";
 import { listTrack, getTrack} from "@/api/business/track";
@@ -155,6 +155,7 @@ export default {
         this.leaveApplicationOpen = false;
         this.company = false;
         this.driver = false;
+        this.dropPoint = false;
         this.vehicle = false;
         this.videoSrc1 = [];
         this.slides1 = [];
@@ -317,6 +318,10 @@ export default {
             this.driver = true;
             return;
           }
+          if(this.definitionKey == "workflow_drop_point"){
+            this.dropPoint = true;
+            return;
+          }
           this.open = true;
           this.title = "审批";
         });
@@ -561,6 +566,7 @@ export default {
         if (
         this.definitionKey.indexOf("supervision") > -1 ||
+          this.definitionKey == "workflow_drop_point" ||
         this.definitionKey == "workflow_company" ||
           this.definitionKey == "workflow_driver" ||
           this.definitionKey == "workflow_vehicle" ||
@@ -109,7 +109,8 @@ export default {
           companyTrucks: null,
           status:null,
           workStartTime:null,
-          workEndTime:null,
+          workEndTime:null,
+          checkStatus:null
         },
         // 表单参数
         form: {
@@ -605,6 +606,7 @@ export default {
         this.queryParams.pageStatus = tabIdx;
         this.queryParams.status = null;
         this.queryParams.his = null;
+        this.queryParams.checkStatus = null;
         getNames(this.queryParams).then(res => {
@@ -298,16 +298,16 @@ export default {
           let list = tres.result.list;
           let qr = {
-            status:0,
-            constructionId:item.objectId
+            status:0
           }
           listTruckActivate(qr).then(response => {
             let taList = response.rows;
             for(let i = 0;i< list.length;i++){
-              if(vids.indexOf(list[i].id) == -1){
-                continue;
-              }
+              //过滤勾选车辆
+              // if(vids.indexOf(list[i].id) == -1){
+              //   continue;
+              // }
               let count = 0;
                 for(let j in taList){
                   if(taList[j].objectId == list[i].id){
@@ -80,10 +80,10 @@ export default {
                     replyPeople:obj.createBy,
                     replyTime:obj.createTime
                   };
-                  
+
                   newRep.push(data);
                 }
-              
+
                 for(let j in array){
                     newRep.push(array[j]);
@@ -97,7 +97,7 @@ export default {
                   };
                     newRep.push(data);
                 }
-                
+
                 this.replyApprovalProcessList = newRep;
                 this.$forceUpdate();
             });
@@ -207,7 +207,16 @@ export default {
       }
-    this.getList();
+    this.getList();
+
+
+
+    setInterval(() => {
+      console.log("getList");
+      this.getList();
+    }, 60000);
+
+
   },
   methods: {
     getCaseStatus(item){
@@ -245,8 +254,7 @@ export default {
         return type;
       },
     /** 查询违规预警信息列表 */
-    getList() {
-      this.loading = true;
+    getList() {
       if(this.queryParams.createTime){
         this.queryParams.startTime = this.queryParams.createTime[0];
         this.queryParams.endTime = this.queryParams.createTime[1];
@@ -431,7 +439,7 @@ export default {
       }
       if(query.owningRegion)
         query.owningRegion = query.owningRegion + ""
-        
+
       query.createTime = null;
       this.$confirm('是否确认导出所有违规预警信息数据项?', "警告", {
@@ -153,9 +153,9 @@ export function handleTree(data, id, parentId, children, rootId) {
  * @returns {string}
  */
 export function parseStatus(status) {
-  if(status==1){
+  if(status==='1'){
     return "审批通过";
-  }else if(status==2){
+  }else if(status==='2'){
     return "审批驳回";
   }else{
     return "审批中";
+<template>
+  <div>
+    <el-form ref="form" :model="infoData" label-width="148px">
+
+      <el-form-item label="投放点编号" prop="dropPointNo">
+        <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="投放点名称" prop="dropPointName">
+        <el-input v-model="infoData.dropPointName" placeholder="请输入投放点名称" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="所属区域" prop="district">
+        <el-input v-model="infoData.district" placeholder="请输入区域" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="所属街道" prop="street">
+        <el-input v-model="infoData.street" placeholder="请输入街道" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="社区" prop="community">
+        <el-input v-model="infoData.community" placeholder="请输入社区" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="所属小区" prop="street">
+        <el-input v-model="infoData.plot" placeholder="请输入小区" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="详细地址" prop="address">
+        <el-input v-model="infoData.address" placeholder="请输入详细地址" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
+        <el-select v-model="infoData.type" placeholder="请选择是否为实行物业管理的区域（小区）" :disabled="true" style="width: 100%">
+          <el-option label="是" value="是"/>
+          <el-option label="否" value="否"/>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="投放点面积(m²)" prop="area" :disabled="true">
+        <el-input v-model="infoData.area" placeholder="请输入投放点面积" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="投放点容量(m³)" prop="capacity">
+        <el-input v-model="infoData.capacity" placeholder="请输入投放点容量" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="管理单位" prop="managementUnit">
+        <el-input v-model="infoData.managementUnit" placeholder="请输入管理单位" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="管理员" prop="custodian">
+        <el-input v-model="infoData.custodian" placeholder="请输入管理员" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="管理员电话" prop="custodianPhone">
+        <el-input v-model="infoData.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="投放时间" prop="dropTime">
+        <el-time-select
+          v-model="infoData.dropTime[0]"
+          style="width: 50%"
+          :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '23:30'
+                  }"
+          :disabled="true"
+          placeholder="选择时间">
+        </el-time-select>
+        <el-time-select
+          v-model="infoData.dropTime[1]"
+          style="width: 50%"
+          :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '23:30'
+                  }"
+          :disabled="true"
+          placeholder="选择时间">
+        </el-time-select>
+      </el-form-item>
+
+      <el-form-item label="运营单位" prop="operatingUnit">
+        <el-input v-model="infoData.operatingUnit" placeholder="请输入运营单位" :disabled="true" />
+      </el-form-item>
+
+      <el-form-item label="运输单位" prop="transportUnit">
+        <el-input v-model="infoData.transportUnit" placeholder="请输入运输单位" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="坐标点" prop="coordinatePoint">
+        <el-input v-model="infoData.coordinatePoint" placeholder="请输入坐标点经纬度"  :disabled="true"/>
+      </el-form-item>
+      <!--            <el-button type="primary" @click="handleOpenMap">坐标点</el-button>-->
+
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+
+import store from "@/store";
+import {
+  getToken
+} from "@/utils/auth";
+import {
+  listDropPointInfo,
+  getDropPointInfo,
+  delDropPointInfo,
+  addDropPointInfo,
+  updateDropPointInfo,
+  exportDropPointInfo
+} from "@/api/unit/dropPointInfo";
+import {getAreaList} from "@/api/dict"
+
+
+
+
+export default {
+  name: "dropPointinfo",
+  props: {
+    businessKey: {
+      type: String
+    },
+  },
+  data() {
+    return {
+      sign: store.getters.avatar, //裁剪图片的地址
+      areas: [],
+      loading: null,
+      infoData: {},
+      dicts:null,
+      showPic:false,
+      picImage:null,
+    }
+  },
+  created() {
+    getAreaList().then(response => {
+      if(response==null || response.length===0){
+        this.$message.error("获取区域列表失败");
+        return;
+      }
+      const data = response;
+      for (let dataKey in data) {
+        if(data[dataKey].level === '3'){
+          this.areas.push({name:data[dataKey].name,code:data[dataKey].id, streets:[]})
+        }
+      }
+      for(let dataKey in data){
+        for(let areas1Key in this.areas){
+          if(data[dataKey].pid === this.areas[areas1Key].code){
+            this.areas[areas1Key].streets.push({code:data[dataKey].id, name:data[dataKey].name})
+          }
+        }
+      }
+    });
+    this.loading = true;
+    this.getInfo();
+
+  },
+  methods: {
+    dict(code) {
+      for (let key in this.areas) {
+        if (this.areas[key].code === code) {
+          return this.areas[key].name;
+        }
+      }
+    },
+    dictInfo(code) {
+      for (let key in this.areas) {
+        for (let keyInfo in this.areas[key].streets) {
+          if (this.areas[key].streets[keyInfo].code === code) {
+            return this.areas[key].streets[keyInfo].name;
+          }
+        }
+      }
+    },
+    getInfo() {
+      let id;
+      if (this.businessKey.split(":").length == 2) {
+        id = this.businessKey.split(":")[1];
+      } else {
+        id = this.businessKey;
+      }
+
+      getDropPointInfo(id).then(response => {
+
+        this.infoData = response.data;
+        this.infoData.dropTime = response.data.dropTime.split("~");
+        // getArea().then(res => {
+        //   this.areas = res.result;
+        //   this.loading = false;
+        //   for (let i = 0; i < this.areas.length; i++) {
+        //     if (Number(this.infoData.place) == this.areas[i].code) {
+        //       this.infoData.place = this.areas[i].name;
+        //     }
+        //   }
+        // });
+
+        // for(let i in obj){
+        //   if(this.objectDict[i]){
+        //       this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
+        //   }
+        // }
+        this.loading = false;
+      });
+    },
+  }
+
+}
+</script>
+<style>
+.bd{
+  padding:5px;
+}
+
+
+
+</style>
@@ -406,7 +406,27 @@
         <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
       </div>
     </el-dialog>
-
+    
+    
+    <!--  投放点  -->
+    <el-dialog :title="title" :visible.sync="dropInfoOpen" width="500px" append-to-body
+               :close-on-click-modal="false">
+      <dropInfo :idInfo="idInfo" v-if="dropInfoOpen"/>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <div v-for="item in this.form.formData">
+          <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                    placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+        </div>
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+    
     <!--  后勤管理  -->
     <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
                :close-on-click-modal="false">
@@ -658,6 +678,25 @@
       </div>
     </el-dialog>
+    <el-dialog :title="title" :visible.sync="dropPoint" width="1500px" append-to-body :close-on-click-modal="false">
+      <dropPointinfo :businessKey="businessKey" :businessType="5" v-if="dropPoint"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
@@ -696,6 +735,7 @@
   import companyInfo from "@/views/activiti/task/companyInfo";
   import driverInfo from "@/views/activiti/task/driverInfo";
   import vehicleInfo from "@/views/activiti/task/vehicleInfo";
+  import dropPointinfo from "@/views/activiti/task/dropPointinfo";
   import taskmethod from '@/api/taskmethod'
@@ -720,7 +760,8 @@
       supervisionInfo,
       companyInfo,
       driverInfo,
-      vehicleInfo
+      vehicleInfo,
+      dropPointinfo
     },
     data() {
       return {
@@ -816,6 +857,7 @@
         company: false,
         driver: false,
         vehicle: false,
+        dropPoint: false,
         names: null,
         hisfromData: [],
         slides: [],
@@ -48,6 +48,12 @@
           value-format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="抽查状态" prop="checkStatus" v-if="this.queryParams.his==1">
+         <el-select v-model="queryParams.checkStatus" placeholder="请选择抽查状态"  size="small">
+          <el-option label="未抽查" value="0" />
+          <el-option label="已抽查" value="1" />
+         </el-select>
+      </el-form-item>
       <el-form-item>
+<template>
+  <div>
+    <el-form ref="form" :model="infoData" label-width="148px">
+
+      <el-form-item label="投放点编号" prop="dropPointNo">
+        <el-input v-model="infoData.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="投放点名称" prop="dropPointName">
+        <el-input v-model="infoData.dropPointName" placeholder="请输入投放点名称" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="所属区域" prop="district">
+        <el-input v-model="infoData.district" placeholder="请输入区域" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="所属街道" prop="street">
+        <el-input v-model="infoData.street" placeholder="请输入街道" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="社区" prop="community">
+        <el-input v-model="infoData.community" placeholder="请输入社区" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="所属小区" prop="street">
+        <el-input v-model="infoData.plot" placeholder="请输入小区" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="详细地址" prop="address">
+        <el-input v-model="infoData.address" placeholder="请输入详细地址" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
+        <el-select v-model="infoData.type" placeholder="请选择是否为实行物业管理的区域（小区）" :disabled="true" style="width: 100%">
+          <el-option label="是" value="是"/>
+          <el-option label="否" value="否"/>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="投放点面积(m²)" prop="area" :disabled="true">
+        <el-input v-model="infoData.area" placeholder="请输入投放点面积" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="投放点容量(m³)" prop="capacity">
+        <el-input v-model="infoData.capacity" placeholder="请输入投放点容量" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="管理单位" prop="managementUnit">
+        <el-input v-model="infoData.managementUnit" placeholder="请输入管理单位" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="管理员" prop="custodian">
+        <el-input v-model="infoData.custodian" placeholder="请输入管理员" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="管理员电话" prop="custodianPhone">
+        <el-input v-model="infoData.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="投放时间" prop="dropTime">
+        <el-time-select
+          v-model="infoData.dropTime[0]"
+          style="width: 50%"
+          :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '23:30'
+                  }"
+          :disabled="true"
+          placeholder="选择时间">
+        </el-time-select>
+        <el-time-select
+          v-model="infoData.dropTime[1]"
+          style="width: 50%"
+          :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '23:30'
+                  }"
+          :disabled="true"
+          placeholder="选择时间">
+        </el-time-select>
+      </el-form-item>
+
+      <el-form-item label="运营单位" prop="operatingUnit">
+        <el-input v-model="infoData.operatingUnit" placeholder="请输入运营单位" :disabled="true" />
+      </el-form-item>
+
+      <el-form-item label="运输单位" prop="transportUnit">
+        <el-input v-model="infoData.transportUnit" placeholder="请输入运输单位" :disabled="true"/>
+      </el-form-item>
+
+      <el-form-item label="坐标点" prop="coordinatePoint">
+        <el-input v-model="infoData.coordinatePoint" placeholder="请输入坐标点经纬度"  :disabled="true"/>
+      </el-form-item>
+      <!--            <el-button type="primary" @click="handleOpenMap">坐标点</el-button>-->
+
+    </el-form>
+  </div>
+</template>
+
+<script>
+
+
+import store from "@/store";
+import {
+  getToken
+} from "@/utils/auth";
+import {
+  listDropPointInfo,
+  getDropPointInfo,
+  delDropPointInfo,
+  addDropPointInfo,
+  updateDropPointInfo,
+  exportDropPointInfo
+} from "@/api/unit/dropPointInfo";
+import {getAreaList} from "@/api/dict"
+
+
+
+
+export default {
+  name: "dropPointinfo",
+  props: {
+    businessKey: {
+      type: String
+    },
+  },
+  data() {
+    return {
+      sign: store.getters.avatar, //裁剪图片的地址
+      areas: [],
+      loading: null,
+      infoData: {},
+      dicts:null,
+      showPic:false,
+      picImage:null,
+    }
+  },
+  created() {
+    getAreaList().then(response => {
+      if(response==null || response.length===0){
+        this.$message.error("获取区域列表失败");
+        return;
+      }
+      const data = response;
+      for (let dataKey in data) {
+        if(data[dataKey].level === '3'){
+          this.areas.push({name:data[dataKey].name,code:data[dataKey].id, streets:[]})
+        }
+      }
+      for(let dataKey in data){
+        for(let areas1Key in this.areas){
+          if(data[dataKey].pid === this.areas[areas1Key].code){
+            this.areas[areas1Key].streets.push({code:data[dataKey].id, name:data[dataKey].name})
+          }
+        }
+      }
+    });
+    this.loading = true;
+    this.getInfo();
+
+  },
+  methods: {
+    dict(code) {
+      for (let key in this.areas) {
+        if (this.areas[key].code === code) {
+          return this.areas[key].name;
+        }
+      }
+    },
+    dictInfo(code) {
+      for (let key in this.areas) {
+        for (let keyInfo in this.areas[key].streets) {
+          if (this.areas[key].streets[keyInfo].code === code) {
+            return this.areas[key].streets[keyInfo].name;
+          }
+        }
+      }
+    },
+    getInfo() {
+      let id;
+      if (this.businessKey.split(":").length == 2) {
+        id = this.businessKey.split(":")[1];
+      } else {
+        id = this.businessKey;
+      }
+
+      getDropPointInfo(id).then(response => {
+
+        this.infoData = response.data;
+        this.infoData.dropTime = response.data.dropTime.split("~");
+        // getArea().then(res => {
+        //   this.areas = res.result;
+        //   this.loading = false;
+        //   for (let i = 0; i < this.areas.length; i++) {
+        //     if (Number(this.infoData.place) == this.areas[i].code) {
+        //       this.infoData.place = this.areas[i].name;
+        //     }
+        //   }
+        // });
+
+        // for(let i in obj){
+        //   if(this.objectDict[i]){
+        //       this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
+        //   }
+        // }
+        this.loading = false;
+      });
+    },
+  }
+
+}
+</script>
+<style>
+.bd{
+  padding:5px;
+}
+
+
+
+</style>
 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+  <el-form ref="form" :model="form" label-width="80px">
         <el-form-item label="预警编号" prop="number">
           <el-input v-model="form.number" placeholder="请输入预警编号" :disabled="true"/>
 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="85px">
+  <el-form ref="form" :model="form" label-width="85px">
         <el-form-item label="案卷编号" prop="number">
           <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
@@ -30,6 +30,13 @@
           format="yyyy-MM-dd HH:mm:ss"
           value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间">
         </el-date-picker>
+      </el-form-item>
+      
+      <el-form-item label="抽查状态" prop="checkStatus" v-if="this.queryParams.his==1">
+         <el-select v-model="queryParams.checkStatus" placeholder="请选择抽查状态"  size="small">
+          <el-option label="未抽查" value="0" />
+          <el-option label="已抽查" value="1" />
+         </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
@@ -67,13 +74,23 @@
         <el-col :span="24">
           <div>巡查时间:{{item.checkTime}}</div>
         </el-col>
-      </el-row>
+      </el-row>
+
+      <el-row class="card_row" style="margin-top: 20px;" v-if="queryParams.pageStatus==1">
+        <el-col :span="24">
+          <div>抽查时间:{{item.checkEndTime}}</div>
+        </el-col>
+      </el-row>
+
+
           <span v-if="item.status==3">已停工"</span>
-     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item,0)"  v-hasPermi="['business:threestep:edit']" v-if="queryParams.pageStatus==1 && item.status==1 && item.checkEndTime == null">抽查</el-button>
-       <el-button size="mini" type="text" icon="el-icon-edit" @click="reSub(item)"  v-hasPermi="['business:threestep:add']" v-if="item.status==2">被驳回</el-button>
+     <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item,0)"
+     v-if="queryParams.pageStatus==1 && item.status==1 && item.checkEndTime == null
+     && checkPer(['business.supervision.threestep.spot'])">抽查</el-button>
+     <el-button size="mini" type="text" icon="el-icon-edit" @click="reSub(item)"  v-hasPermi="['business:threestep:add']" v-if="item.status==2">被驳回</el-button>
      <el-button size="mini" type="text" @click="handleUpdate(item,1)"  v-hasPermi="['business:threestep:edit']">查看详情</el-button>
@@ -49,8 +49,8 @@
 	         placeholder="结束日期">
 	       </el-date-picker>
 	 </el-form-item>
-	 
-	 
+
+
      <el-form-item>
        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -120,7 +120,7 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="所属工地" prop="construction">
           <el-select v-model="form.construction" placeholder="请选择所属工地" filterable reserve-keyword  @change="getCompany">
-            <el-option v-for="item in constList" :label="item.name" :value="item.name" ></el-option>
+            <el-option class="custom-option" v-for="item in constList" :label="item.name" :value="item.name" ></el-option>
           </el-select>
         </el-form-item>
        <el-form-item label="所属企业" prop="company">
@@ -157,4 +157,11 @@
   .el-select-dropdown__item{
     width:300px;
   }
+  .el-select-dropdown__item.hover, .el-select-dropdown__item:hover{
+    height:auto;
+  }
+  .custom-option {
+    white-space: normal; /* 允许文本换行 */
+    word-wrap: break-word; /* 在长单词或URL地址内部进行换行 */
+  }
 </style>
@@ -19,11 +19,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="投放点形式" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择投放点形式" clearable size="small">
+      <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择是否为实行物业管理的区域（小区）" clearable size="small">
           <el-option label="全部" value=""/>
-          <el-option label="固定" value="固定"/>
-          <el-option label="临时" value="临时"/>
+          <el-option label="是" value="是"/>
+          <el-option label="否" value="否"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -81,23 +81,39 @@
     <el-table v-loading="loading" :data="dropPointInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="投放点名称" align="center" prop="dropPointName"/>
-      <el-table-column label="所属区域" align="center" prop="district"/>
-      <el-table-column label="所属街道" align="center" prop="street"/>
+      <el-table-column label="所属区域" align="center" prop="district">
+        <template slot-scope="scope">
+          <span>{{ dict(scope.row.district) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="所属街道" align="center" prop="street">
+        <template slot-scope="scope">
+          <span>{{
+            dictInfo(scope.row.street)
+            }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="社区" align="center" prop="community"/>
+      <el-table-column label="小区" align="center" prop="plot"/>
       <el-table-column label="详细地址" align="center" prop="address"/>
       <el-table-column label="投放点形式" align="center" prop="type"/>
       <el-table-column label="投放点面积(m²)" align="center" prop="area"/>
       <el-table-column label="投放点容量(m³)" align="center" prop="capacity"/>
       <el-table-column label="管理单位" align="center" prop="managementUnit"/>
-      <el-table-column label="管理人" align="center" prop="custodian"/>
+      <el-table-column label="管理员" align="center" prop="custodian"/>
       <el-table-column label="管理员电话" align="center" prop="custodianPhone"/>
       <el-table-column label="投放时间" align="center" prop="dropTime" width="180"/>
       <el-table-column label="投放点编号" align="center" prop="dropPointNo"/>
       <el-table-column label="运营单位" align="center" prop="operatingUnit"/>
       <el-table-column label="运输单位" align="center" prop="transportUnit"/>
+      <el-table-column label="审批状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span>{{ parseStatus(scope.row.status) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}-{i}-{s}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -132,123 +148,106 @@
     <!-- 添加或修改投放点信息管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="128px">
-        <el-row>
-          <el-col :span="12">
+      <el-form ref="form" :model="form" :rules="rules" label-width="148px">
+
             <el-form-item label="投放点编号" prop="dropPointNo">
               <el-input v-model="form.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
+
             <el-form-item label="投放点名称" prop="dropPointName">
               <el-input v-model="form.dropPointName" placeholder="请输入投放点名称"/>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+
             <el-form-item label="所属区域" prop="street">
               <el-select v-model="form.district" placeholder="请输入所属区域" style="width: 100%" clearable @change="getStreets">
-                <el-option v-for="(area,index) in areas" :label="area.name" :value="area.name" :key="index"/>
+                <el-option v-for="(area,index) in areas" :label="area.name" :value="area.code" :key="index"/>
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
+
             <el-form-item label="所属街道" prop="street">
-              <el-select v-model="form.street" placeholder="请输入所属街道" style="width: 100%" clearable>
-                <el-option v-for="(area,index) in streets" :label="area.name" :value="area.name" :key="area.code" @click.native="createDropPointNo(area)"/>
+              <el-select v-model="form.street" placeholder="请输入所属街道" style="width: 100%" clearable @change="getCommunitys">
+                <el-option v-for="(area,index) in streets" :label="area.name" :value="area.code" :key="area.code"/>
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="社区" prop="community">
-              <el-input v-model="form.community" placeholder="请输入社区"/>
-            </el-form-item>
+        <el-form-item label="社区" prop="community">
+          <el-select v-model="form.community" placeholder="请输入所属社区" style="width: 100%" clearable>
+            <el-option v-for="(area,index) in communitys" :label="area.name" :value="area.code" :key="area.code" @click.native="createDropPointNo(area,'community')"/>
+          </el-select>
+        </el-form-item>
+
+          <el-form-item label="小区" prop="plot">
+            <el-input v-model="form.plot" placeholder="请输入小区"/>
+          </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label="详细地址" prop="address">
               <el-input v-model="form.address" placeholder="请输入详细地址"/>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="投放点形式" prop="type">
-              <el-select v-model="form.type" placeholder="请选择投放点形式" style="width: 100%">
-                <el-option label="固定" value="固定"/>
-                <el-option label="临时" value="临时"/>
+
+            <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
+              <el-select v-model="form.type" placeholder="请选择是否为实行物业管理的区域（小区）" style="width: 100%">
+                <el-option label="是" value="是"/>
+                <el-option label="否" value="否"/>
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label="投放点面积(m²)" prop="area">
               <el-input v-model="form.area" placeholder="请输入投放点面积"/>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+
             <el-form-item label="投放点容量(m³)" prop="capacity">
               <el-input v-model="form.capacity" placeholder="请输入投放点容量"/>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
+
             <el-form-item label="管理单位" prop="managementUnit">
               <el-input v-model="form.managementUnit" placeholder="请输入管理单位"/>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="管理人" prop="custodian">
-              <el-input v-model="form.custodian" placeholder="请输入管理人"/>
+
+            <el-form-item label="管理员" prop="custodian">
+              <el-input v-model="form.custodian" placeholder="请输入管理员"/>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
+
             <el-form-item label="管理员电话" prop="custodianPhone">
               <el-input v-model="form.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit/>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="投放时间" prop="dropTime">
+
+            <el-form-item label="投放时间" prop="dropTime" v-if="dropTime">
               <el-time-select
+                placeholder="起始时间"
                 v-model="form.dropTime"
-                style="width: 100%"
+                style="width: 50%"
                 :picker-options="{
-                    start: '00:00',
-                    step: '00:30',
-                    end: '23:30'
-                  }"
-                placeholder="选择时间">
+                  start: '00:00',
+                  step: '00:15',
+                  end: '23:45'
+                }">
+              </el-time-select>
+              <el-time-select
+                placeholder="结束时间"
+                v-model="endTime"
+                style="width: 50%"
+                :picker-options="{
+                start: '00:15',
+                step: '00:15',
+                end: '24:00',
+                minTime: form.dropTime
+              }">
               </el-time-select>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
+
             <el-form-item label="运营单位" prop="operatingUnit">
               <el-input v-model="form.operatingUnit" placeholder="请输入运营单位"/>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+
             <el-form-item label="运输单位" prop="transportUnit">
               <el-input v-model="form.transportUnit" placeholder="请输入运输单位"/>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
+
             <el-form-item label="坐标点" prop="coordinatePoint">
               <el-input v-model="form.coordinatePoint" placeholder="请输入坐标点经纬度" readonly @click.native="handleOpenMap"/>
             </el-form-item>
 <!--            <el-button type="primary" @click="handleOpenMap">坐标点</el-button>-->
-          </el-col>
-        </el-row>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -302,7 +301,7 @@ import {
   updateDropPointInfo,
   exportDropPointInfo
 } from "@/api/unit/dropPointInfo";
-import {getAreaList} from "@/api/casefile/remoteServer";
+import {getAreaList,getAreasList} from "@/api/dict"
 import AMapLoader from "@amap/amap-jsapi-loader";
 import Treeselect from "@riophae/vue-treeselect";
@@ -356,7 +355,10 @@ export default {
           {required: true, message: "请输入所属街道", trigger: "blur"}
         ],
         community: [
-          {required: true, message: "请输入社区", trigger: "blur"}
+          {required: true, message: "请选择社区", trigger: "blur"}
+        ],
+        plot: [
+          {required: true, message: "请输入小区", trigger: "blur"}
         ],
         address: [
           {required: true, message: "请输入详细地址", trigger: "blur"}
@@ -378,7 +380,7 @@ export default {
           {required: true, message: "请输入管理单位", trigger: "blur"}
         ],
         custodian: [
-          {required: true, message: "请输入管理人", trigger: "blur"}
+          {required: true, message: "请输入管理员", trigger: "blur"}
         ],
         custodianPhone: [
           {required: true, message: "请输入管理员电话", trigger: "blur"},
@@ -391,9 +393,6 @@ export default {
         dropTime: [
           {required: true, message: "请选择投放时间", trigger: "change"}
         ],
-        operatingUnit: [
-          {required: true, message: "请输入运营单位", trigger: "blur"}
-        ],
         transportUnit: [
           {required: true, message: "请输入运输单位", trigger: "blur"}
         ],
@@ -401,160 +400,12 @@ export default {
           {required: true, message: "请点击坐标点按钮选择坐标点", trigger: "blur"}
         ]
       },
-      areas: [
-        {
-          name: "芙蓉区",
-          streets: [
-            {code: "FR01", name: "湘湖"},
-            {code: "FR02", name: "定王台街道"},
-            {code: "FR03", name: "韭菜园街道"},
-            {code: "FR04", name: "文艺路街道"},
-            {code: "FR05", name: "朝阳街道"},
-            {code: "FR06", name: "五里牌街道"},
-            {code: "FR07", name: "马王堆街道"},
-            {code: "FR08", name: "荷花园街道"},
-            {code: "FR09", name: "东屯渡街道"},
-            {code: "FR10", name: "火星街道"},
-            {code: "FR11", name: "东岸街道"},
-            {code: "FR12", name: "马坡岭街道"},
-            {code: "FR13", name: "东湖街道"}
-          ]
-        },
-        {
-          name: "天心区",
-          streets: [
-            {code: "TX01", name: "坡子街街道"},
-            {code: "TX02", name: "城南路街道"},
-            {code: "TX03", name: "裕南街街道"},
-            {code: "TX04", name: "赤岭路街道"},
-            {code: "TX05", name: "金盆岭街道"},
-            {code: "TX06", name: "新开铺街道"},
-            {code: "TX07", name: "文源街道"},
-            {code: "TX08", name: "桂花坪街道"},
-            {code: "TX09", name: "青园街道"},
-            {code: "TX10", name: "黑石铺街道"},
-            {code: "TX11", name: "大托铺街道"},
-            {code: "TX12", name: "先锋街道"},
-            {code: "TX13", name: "南托街道"},
-            {code: "TX14", name: "暮云街道"}
-          ]
-        },
-        {
-          name: "开福区",
-          streets: [
-            {code: "KF01", name: "望麓园街道"},
-            {code: "KF02", name: "清水塘街道"},
-            {code: "KF03", name: "湘雅路街道"},
-            {code: "KF04", name: "伍家岭街道"},
-            {code: "KF05", name: "新河街道"},
-            {code: "KF06", name: "东风路街道"},
-            {code: "KF07", name: "通泰街街道"},
-            {code: "KF08", name: "四方坪街道"},
-            {code: "KF09", name: "芙蓉北路街道"},
-            {code: "KF10", name: "洪山街道"},
-            {code: "KF11", name: "月湖街道"},
-            {code: "KF12", name: "浏阳河街道"},
-            {code: "KF13", name: "秀峰街道"},
-            {code: "KF14", name: "捞刀河街道"},
-            {code: "KF15", name: "沙坪街道"},
-            {code: "KF16", name: "青竹湖街道"}
-          ]
-        },
-        {
-          name: "雨花区",
-          streets: [
-            {code: "YH01", name: "雨花亭街道"},
-            {code: "YH02", name: "高桥街道"},
-            {code: "YH03", name: "左家塘街道"},
-            {code: "YH04", name: "侯家塘街道"},
-            {code: "YH05", name: "砂子塘街道"},
-            {code: "YH06", name: "东塘街道"},
-            {code: "YH07", name: "圭塘街道"},
-            {code: "YH08", name: "黎托街道"},
-            {code: "YH09", name: "洞井街道"},
-            {code: "YH10", name: "井湾子街道"},
-            {code: "YH11", name: "东山街道"},
-            {code: "YH12", name: "同升街道"},
-            {code: "YH13", name: "跳马镇"}
-          ]
-        },
-        {
-          name: "长沙县",
-          streets: [
-            {code: "CS01", name: "星沙街道"},
-            {code: "CS02", name: "湘龙街道"},
-            {code: "CS03", name: "泉塘街道"},
-            {code: "CS04", name: "榔梨街道"}
-          ]
-        },
-        {
-          name: "望城",
-          streets: [
-            {code: "WC01", name: "丁字湾街道"},
-            {code: "WC02", name: "书堂山街道"},
-            {code: "WC03", name: "高塘岭街道"},
-            {code: "WC04", name: "喻家坡街道"},
-            {code: "WC05", name: "白沙洲街道"},
-            {code: "WC06", name: "大泽湖街道"},
-            {code: "WC07", name: "月亮岛街道"},
-            {code: "WC08", name: "廖家坪街道"}
-          ]
-        },
-        {
-          name: "浏阳",
-          streets: [
-            {code: "LY01", name: "淮川街道"},
-            {code: "LY02", name: "集里街道"},
-            {code: "LY03", name: "荷花街道"},
-            {code: "LY04", name: "关口街道"}
-          ]
-        },
-        {
-          name: "宁乡",
-          streets: [
-            {code: "NX01", name: "玉潭街道"},
-            {code: "NX02", name: "城郊街道"},
-            {code: "NX03", name: "历经铺街道"},
-            {code: "NX04", name: "白马桥街道"},
-            {code: "NX05", name: "煤炭坝镇"},
-            {code: "NX06", name: "双凫铺镇"},
-            {code: "NX07", name: "双江口镇"},
-            {code: "NX08", name: "回龙铺镇"},
-            {code: "NX09", name: "夏铎铺镇"},
-            {code: "NX10", name: "历经铺镇"}
-          ]
-        },
-        {
-          name: "湘江新区",
-          streets: [
-            {code: "XJ01", name: "岳麓街道"},
-            {code: "XJ02", name: "桔子洲街道"},
-            {code: "XJ03", name: "望月湖街道"},
-            {code: "XJ04", name: "银盆岭街道"},
-            {code: "XJ05", name: "观沙岭街道"},
-            {code: "XJ06", name: "西湖街道"},
-            {code: "XJ07", name: "望城坡街道"},
-            {code: "XJ08", name: "望岳街道"},
-            {code: "XJ09", name: "咸嘉湖街道"},
-            {code: "XJ10", name: "梅溪湖街道"},
-            {code: "XJ11", name: "天顶街道"},
-            {code: "XJ12", name: "坪塘街道"},
-            {code: "XJ13", name: "洋湖街道"},
-            {code: "XJ14", name: "含浦街道"},
-            {code: "XJ15", name: "学士街道"},
-            {code: "XJ16", name: "莲花镇"},
-            {code: "XJ17", name: "雨敞坪镇"},
-            {code: "XJ18", name: "麓谷街道"},
-            {code: "XJ19", name: "东方红街道"},
-            {code: "XJ20", name: "白马街道"},
-            {code: "XJ21", name: "雷锋街道"},
-            {code: "XJ22", name: "黄金园街道"},
-            {code: "XJ23", name: "金山桥街道"},
-            {code: "XJ24", name: "白箬铺镇"}
-          ]
-        }
-      ],
+      //区域
+      areas: [],
+      //街道
       streets:[],
+      //社区
+      communitys:[],
       // 地图
       map: null,
       keywords: "",
@@ -562,13 +413,54 @@ export default {
       openMap:false,
       center: null,
       circleMarker: null,
+      endTime: null,
+      dropTime: true
     };
   },
   created() {
+    getAreasList().then(response => {
+      if(response==null || response.length===0){
+        this.$message.error("获取区域列表失败");
+        return;
+      }
+      let data = response.filter(data => data.code === "430100" && data.code !== "430182" && data.code !== "430183" && data.code !== "430681"&& data.code !== "430624");
+      // console.log(data)
+      this.areas = data[0].items.filter(data => data.code !== "430182" && data.code !== "430183" && data.code !== "430681"&& data.code !== "430624");
+      console.log(this.areas)
+      // for (let dataKey in data) {
+      //   if(data[dataKey].parentCode === '430100'){
+      //     this.areas.push({name:data[dataKey].name,code:data[dataKey].code, streets:[]})
+      //   }
+      // }
+      // for(let dataKey in data){
+      //   for(let areas1Key in this.areas){
+      //     if(data[dataKey].parentCode === this.areas[areas1Key].code){
+      //       this.areas[areas1Key].streets.push({code:data[dataKey].code, name:data[dataKey].name,item:data[dataKey].items})
+      //     }
+      //   }
+      // }
+    });
+
     this.getList();
     // this.initAMap();
   },
   methods: {
+    dict(code){
+      for(let key in this.areas){
+        if(this.areas[key].code === code){
+          return this.areas[key].name;
+        }
+      }
+    },
+    dictInfo(code){
+      for(let key in this.areas){
+        for(let keyInfo in this.areas[key].streets){
+          if(this.areas[key].streets[keyInfo].code === code){
+            return this.areas[key].streets[keyInfo].name;
+          }
+        }
+      }
+    },
     clearCoordinatePoint(){
       this.center = null;
       this.form.coordinatePoint = null;
@@ -707,17 +599,25 @@ export default {
       }
     },
     createDropPointNo(area){
-      listDropPointInfo({dropPointNo: area.code}).then(response => {
-        const total = response.total+1;
-        this.form.dropPointNo = area.code+total.toString().padStart(3, '0');
-      });
+        listDropPointInfo({dropPointNo: area.code}).then(response => {
+          const total = response.total+1;
+          this.form.dropPointNo = area.code+total.toString().padStart(3, '0');
+        });
+
     },
     getStreets(regionName) {
       this.streets = [];
       this.form.dropPointNo = null;
       this.form.street = null;
-      const region = this.areas.find(region => region.name === regionName);
-      this.streets = region.streets;
+      const region = this.areas.find(region => region.code === regionName);
+      this.streets = region.items;
+    },
+    getCommunitys(regionName){
+      this.communitys = [];
+      this.form.dropPointNo = null;
+      this.form.community = null;
+      const region = this.streets.find(region => region.code === regionName);
+      this.communitys = region.items;
     },
     /** 下载文件 */
     /** 查询投放点信息管理列表 */
@@ -758,6 +658,9 @@ export default {
         updateTime: null,
         updateBy: null
       };
+      this.endTime = null;
+      this.streets = [];
+      this.communitys = [];
       this.map = null;
       this.center = null;
       this.resetForm("form");
@@ -788,26 +691,42 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
+      this.dropTime = false;
       getDropPointInfo(id).then(response => {
+        let dropTime = response.data.dropTime.split("~");
+        console.log(dropTime)
         this.form = response.data;
+        this.form.dropTime = dropTime[0];
+        this.endTime = dropTime[1];
         this.open = true;
         this.title = "修改投放点信息管理";
+        this.dropTime = true;
       });
     },
     /** 提交按钮 */
     submitForm() {
+
       this.$refs["form"].validate(valid => {
         if (valid) {
+          let dropTime = this.form.dropTime;
+          if(this.endTime!=null){
+            this.form.dropTime = this.form.dropTime + "~" + this.endTime;
+          }else{
+            this.$message.error("请选择投放结束时间");
+            return;
+          }
           if (this.form.id != null) {
             updateDropPointInfo(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
+              this.form.dropTime = dropTime;
               this.getList();
             });
           } else {
             addDropPointInfo(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
+              this.form.dropTime = dropTime;
               this.getList();
             });
           }
@@ -20,5 +20,10 @@
       <groupId>com.trash</groupId>
       <artifactId>trash-common</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>com.trash</groupId>
+      <artifactId>trash-workflow</artifactId>
+    </dependency>
   </dependencies>
 </project>
 \ No newline at end of file
@@ -2,6 +2,8 @@ package com.trash.dropPointInfo.domain;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -37,6 +39,10 @@ public class DropPointInfo extends BaseEntity
     @Excel(name = "社区")
     private String community;
+    /** 小区 */
+    @Excel(name = "小区")
+    private String plot;
+
     /** 详细地址 */
     @Excel(name = "详细地址")
     private String address;
@@ -57,8 +63,8 @@ public class DropPointInfo extends BaseEntity
     @Excel(name = "管理单位")
     private String managementUnit;
-    /** 管理人 */
-    @Excel(name = "管理人")
+    /** 管理员 */
+    @Excel(name = "管理员")
     private String custodian;
     /** 管理员电话 */
@@ -84,11 +90,28 @@ public class DropPointInfo extends BaseEntity
     /** 坐标点 */
     @Excel(name = "坐标点")
     private String coordinatePoint;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    
+    private List<String> sList;
+    
+    public List<String> getSList() {
+		return sList;
+	}
+
+	public void setSList(List<String> sList) {
+		this.sList = sList;
+	}
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+    public String getPlot() {
+        return plot;
+    }
+
+    public void setPlot(String plot) {
+        this.plot = plot;
+    }
     public String getCoordinatePoint() {
         return coordinatePoint;
 package com.trash.dropPointInfo.service.impl;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.spring.SpringUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Service;
 import com.trash.dropPointInfo.mapper.DropPointInfoMapper;
 import com.trash.dropPointInfo.domain.DropPointInfo;
 import com.trash.dropPointInfo.service.IDropPointInfoService;
+import com.trash.office.mapper.UploadFileMapper;
+import com.trash.workflow.service.IWorkflowService;
 /**
  * 投放点信息管理Service业务层处理
@@ -41,8 +50,16 @@ public class DropPointInfoServiceImpl implements IDropPointInfoService
      */
     @Override
     public List<DropPointInfo> selectDropPointInfoList(DropPointInfo dropPointInfo)
-    {
-        return dropPointInfoMapper.selectDropPointInfoList(dropPointInfo);
+    {	
+		List<String> ids = SecurityUtils.getLoginUser().getUser().getStreetsList();
+		
+		if(ids.size() > 0){
+			dropPointInfo.setSList(ids);
+			return dropPointInfoMapper.selectDropPointInfoList(dropPointInfo);
+		}
+    	
+		return new ArrayList<DropPointInfo>();
+        
     }
     /**
@@ -51,12 +68,31 @@ public class DropPointInfoServiceImpl implements IDropPointInfoService
      * @param dropPointInfo 投放点信息管理
      * @return 结果
      */
+    @Autowired
+    IWorkflowService workflow;
+    
     @Override
     public int insertDropPointInfo(DropPointInfo dropPointInfo)
     {
         dropPointInfo.setCreateTime(DateUtils.getNowDate());
         dropPointInfo.setCreateBy(SecurityUtils.getUsername());
-        return dropPointInfoMapper.insertDropPointInfo(dropPointInfo);
+        
+        int i = dropPointInfoMapper.insertDropPointInfo(dropPointInfo);
+        
+        if(i == 0){
+        	return i;
+        }
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("name", dropPointInfo.getDropPointName());
+        map.put("area", dropPointInfo.getDistrict());
+        map.put("id", dropPointInfo.getId()+"");
+        
+        i = workflow.createDropPointWorkFlow(map);
+        if (i == 0) {
+        	dropPointInfoMapper.deleteDropPointInfoById(dropPointInfo.getId());
+		}
+        
+        return i;
     }
     /**
@@ -3,134 +3,154 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.trash.dropPointInfo.mapper.DropPointInfoMapper">
-    
-    <resultMap type="DropPointInfo" id="DropPointInfoResult">
-        <result property="id"    column="id"    />
-        <result property="dropPointName"    column="drop_point_name"    />
-        <result property="district"    column="district"    />
-        <result property="street"    column="street"    />
-        <result property="community"    column="community"    />
-        <result property="address"    column="address"    />
-        <result property="type"    column="type"    />
-        <result property="area"    column="area"    />
-        <result property="capacity"    column="capacity"    />
-        <result property="managementUnit"    column="management_unit"    />
-        <result property="custodian"    column="custodian"    />
-        <result property="custodianPhone"    column="custodian_phone"    />
-        <result property="dropTime"    column="drop_time"    />
-        <result property="dropPointNo"    column="drop_point_no"    />
-        <result property="operatingUnit"    column="operating_unit"    />
-        <result property="transportUnit"    column="transport_unit"    />
-        <result property="coordinatePoint"    column="coordinate_point"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-    </resultMap>
-    <sql id="selectDropPointInfoVo">
-        select id, drop_point_name, district, street, community, address, type, area, capacity, management_unit, custodian, custodian_phone, drop_time, drop_point_no, operating_unit, transport_unit,coordinate_point, create_time, create_by, update_time, update_by from drop_point_info
-    </sql>
+	<resultMap type="DropPointInfo" id="DropPointInfoResult">
+		<result property="id" column="id" />
+		<result property="dropPointName" column="drop_point_name" />
+		<result property="district" column="district" />
+		<result property="street" column="street" />
+		<result property="community" column="community" />
+		<result property="address" column="address" />
+		<result property="type" column="type" />
+		<result property="area" column="area" />
+		<result property="capacity" column="capacity" />
+		<result property="managementUnit" column="management_unit" />
+		<result property="custodian" column="custodian" />
+		<result property="custodianPhone" column="custodian_phone" />
+		<result property="dropTime" column="drop_time" />
+		<result property="dropPointNo" column="drop_point_no" />
+		<result property="operatingUnit" column="operating_unit" />
+		<result property="transportUnit" column="transport_unit" />
+		<result property="coordinatePoint" column="coordinate_point" />
+		<result property="createTime" column="create_time" />
+		<result property="createBy" column="create_by" />
+		<result property="updateTime" column="update_time" />
+		<result property="updateBy" column="update_by" />
+		<result property="plot" column="plot" />
+	</resultMap>
-    <select id="selectDropPointInfoList" parameterType="DropPointInfo" resultMap="DropPointInfoResult">
-        <include refid="selectDropPointInfoVo"/>
-        <where>  
-            <if test="dropPointName != null  and dropPointName != ''"> and drop_point_name like concat('%', #{dropPointName}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="dropPointNo != null  and dropPointNo != ''"> and drop_point_no like concat(#{dropPointNo}, '%')</if>
-        </where>
-    </select>
-    
-    <select id="selectDropPointInfoById" parameterType="Long" resultMap="DropPointInfoResult">
-        <include refid="selectDropPointInfoVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertDropPointInfo" parameterType="DropPointInfo" useGeneratedKeys="true" keyProperty="id">
-        insert into drop_point_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="dropPointName != null">drop_point_name,</if>
-            <if test="district != null">district,</if>
-            <if test="street != null">street,</if>
-            <if test="community != null">community,</if>
-            <if test="address != null">address,</if>
-            <if test="type != null">type,</if>
-            <if test="area != null">area,</if>
-            <if test="capacity != null">capacity,</if>
-            <if test="managementUnit != null">management_unit,</if>
-            <if test="custodian != null">custodian,</if>
-            <if test="custodianPhone != null">custodian_phone,</if>
-            <if test="dropTime != null">drop_time,</if>
-            <if test="dropPointNo != null">drop_point_no,</if>
-            <if test="operatingUnit != null">operating_unit,</if>
-            <if test="transportUnit != null">transport_unit,</if>
-            <if test="coordinatePoint != null">coordinate_point,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="updateBy != null">update_by,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="dropPointName != null">#{dropPointName},</if>
-            <if test="district != null">#{district},</if>
-            <if test="street != null">#{street},</if>
-            <if test="community != null">#{community},</if>
-            <if test="address != null">#{address},</if>
-            <if test="type != null">#{type},</if>
-            <if test="area != null">#{area},</if>
-            <if test="capacity != null">#{capacity},</if>
-            <if test="managementUnit != null">#{managementUnit},</if>
-            <if test="custodian != null">#{custodian},</if>
-            <if test="custodianPhone != null">#{custodianPhone},</if>
-            <if test="dropTime != null">#{dropTime},</if>
-            <if test="dropPointNo != null">#{dropPointNo},</if>
-            <if test="operatingUnit != null">#{operatingUnit},</if>
-            <if test="transportUnit != null">#{transportUnit},</if>
-            <if test="coordinatePoint != null">#{coordinatePoint},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-         </trim>
-    </insert>
+	<sql id="selectDropPointInfoVo">
+		select id, drop_point_name, district, street, community, address, type,
+		area, capacity, management_unit, custodian, custodian_phone,
+		drop_time, drop_point_no, operating_unit,
+		transport_unit,coordinate_point, create_time, create_by, update_time,
+		update_by,plot from drop_point_info
+	</sql>
-    <update id="updateDropPointInfo" parameterType="DropPointInfo">
-        update drop_point_info
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="dropPointName != null">drop_point_name = #{dropPointName},</if>
-            <if test="district != null">district = #{district},</if>
-            <if test="street != null">street = #{street},</if>
-            <if test="community != null">community = #{community},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="type != null">type = #{type},</if>
-            <if test="area != null">area = #{area},</if>
-            <if test="capacity != null">capacity = #{capacity},</if>
-            <if test="managementUnit != null">management_unit = #{managementUnit},</if>
-            <if test="custodian != null">custodian = #{custodian},</if>
-            <if test="custodianPhone != null">custodian_phone = #{custodianPhone},</if>
-            <if test="dropTime != null">drop_time = #{dropTime},</if>
-            <if test="dropPointNo != null">drop_point_no = #{dropPointNo},</if>
-            <if test="operatingUnit != null">operating_unit = #{operatingUnit},</if>
-            <if test="transportUnit != null">transport_unit = #{transportUnit},</if>
-            <if test="coordinatePoint != null">coordinate_point = #{coordinatePoint},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-        </trim>
-        where id = #{id}
-    </update>
+	<select id="selectDropPointInfoList" parameterType="DropPointInfo"
+		resultMap="DropPointInfoResult">
+		<include refid="selectDropPointInfoVo" />
+		<where>
+			<if test="dropPointName != null  and dropPointName != ''"> and drop_point_name like concat('%', #{dropPointName},
+				'%')</if>
+			<if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+			<if test="type != null  and type != ''"> and type = #{type}</if>
+			<if test="dropPointNo != null  and dropPointNo != ''"> and drop_point_no like concat(#{dropPointNo}, '%')</if>
+			<if test="sList != null  and sList.size() > 0 ">
+				and street in
+				<foreach item="id" collection="sList" open="(" separator=","
+					close=")">
+					#{id}
+				</foreach>
+			</if>
+		</where>
+	</select>
-    <delete id="deleteDropPointInfoById" parameterType="Long">
-        delete from drop_point_info where id = #{id}
-    </delete>
+	<select id="selectDropPointInfoById" parameterType="Long"
+		resultMap="DropPointInfoResult">
+		<include refid="selectDropPointInfoVo" />
+		where id = #{id}
+	</select>
+
+	<insert id="insertDropPointInfo" parameterType="DropPointInfo"
+		useGeneratedKeys="true" keyProperty="id">
+		insert into drop_point_info
+		<trim prefix="(" suffix=")" suffixOverrides=",">
+			<if test="dropPointName != null">drop_point_name,</if>
+			<if test="district != null">district,</if>
+			<if test="street != null">street,</if>
+			<if test="community != null">community,</if>
+			<if test="address != null">address,</if>
+			<if test="type != null">type,</if>
+			<if test="area != null">area,</if>
+			<if test="capacity != null">capacity,</if>
+			<if test="managementUnit != null">management_unit,</if>
+			<if test="custodian != null">custodian,</if>
+			<if test="custodianPhone != null">custodian_phone,</if>
+			<if test="dropTime != null">drop_time,</if>
+			<if test="dropPointNo != null">drop_point_no,</if>
+			<if test="operatingUnit != null">operating_unit,</if>
+			<if test="transportUnit != null">transport_unit,</if>
+			<if test="coordinatePoint != null">coordinate_point,</if>
+			<if test="createTime != null">create_time,</if>
+			<if test="createBy != null">create_by,</if>
+			<if test="updateTime != null">update_time,</if>
+			<if test="updateBy != null">update_by,</if>
+		    <if test="plot != null">plot,</if>
+		</trim>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
+			<if test="dropPointName != null">#{dropPointName},</if>
+			<if test="district != null">#{district},</if>
+			<if test="street != null">#{street},</if>
+			<if test="community != null">#{community},</if>
+			<if test="address != null">#{address},</if>
+			<if test="type != null">#{type},</if>
+			<if test="area != null">#{area},</if>
+			<if test="capacity != null">#{capacity},</if>
+			<if test="managementUnit != null">#{managementUnit},</if>
+			<if test="custodian != null">#{custodian},</if>
+			<if test="custodianPhone != null">#{custodianPhone},</if>
+			<if test="dropTime != null">#{dropTime},</if>
+			<if test="dropPointNo != null">#{dropPointNo},</if>
+			<if test="operatingUnit != null">#{operatingUnit},</if>
+			<if test="transportUnit != null">#{transportUnit},</if>
+			<if test="coordinatePoint != null">#{coordinatePoint},</if>
+			<if test="createTime != null">#{createTime},</if>
+			<if test="createBy != null">#{createBy},</if>
+			<if test="updateTime != null">#{updateTime},</if>
+			<if test="updateBy != null">#{updateBy},</if>
+			<if test="plot != null">#{plot},</if>
+		</trim>
+	</insert>
+
+	<update id="updateDropPointInfo" parameterType="DropPointInfo">
+		update drop_point_info
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="dropPointName != null">drop_point_name = #{dropPointName},</if>
+			<if test="district != null">district = #{district},</if>
+			<if test="street != null">street = #{street},</if>
+			<if test="community != null">community = #{community},</if>
+			<if test="address != null">address = #{address},</if>
+			<if test="type != null">type = #{type},</if>
+			<if test="area != null">area = #{area},</if>
+			<if test="capacity != null">capacity = #{capacity},</if>
+			<if test="managementUnit != null">management_unit = #{managementUnit},</if>
+			<if test="custodian != null">custodian = #{custodian},</if>
+			<if test="custodianPhone != null">custodian_phone = #{custodianPhone},</if>
+			<if test="dropTime != null">drop_time = #{dropTime},</if>
+			<if test="dropPointNo != null">drop_point_no = #{dropPointNo},</if>
+			<if test="operatingUnit != null">operating_unit = #{operatingUnit},</if>
+			<if test="transportUnit != null">transport_unit = #{transportUnit},</if>
+			<if test="coordinatePoint != null">coordinate_point = #{coordinatePoint},</if>
+			<if test="createTime != null">create_time = #{createTime},</if>
+			<if test="createBy != null">create_by = #{createBy},</if>
+			<if test="updateTime != null">update_time = #{updateTime},</if>
+			<if test="updateBy != null">update_by = #{updateBy},</if>
+			<if test="plot != null">plot = #{plot},</if>
+		</trim>
+		where id = #{id}
+	</update>
+
+	<delete id="deleteDropPointInfoById" parameterType="Long">
+		delete from drop_point_info where id = #{id}
+	</delete>
+
+	<delete id="deleteDropPointInfoByIds" parameterType="String">
+		delete from drop_point_info where id in
+		<foreach item="id" collection="array" open="(" separator=","
+			close=")">
+			#{id}
+		</foreach>
+	</delete>
-    <delete id="deleteDropPointInfoByIds" parameterType="String">
-        delete from drop_point_info where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-    
 </mapper>
 \ No newline at end of file
@@ -21,7 +21,6 @@
             <groupId>com.trash</groupId>
             <artifactId>trash-common</artifactId>
         </dependency>
-
         <!--    kafka    -->
         <dependency>
             <groupId>org.springframework.kafka</groupId>
@@ -185,7 +185,7 @@ public class TruckActivateController extends BaseController
         	info.setAddress(turck.getAddress());
         	info.setEarthName(turck.getEarthName());
         	info.setRouteName(turck.getRouteName());
-        	info.setTransportEndTime(turck.getTransportStartTime());
+        	info.setTransportEndTime(turck.getTransportEndTime());
         	info.setTransportStartTime(turck.getTransportStartTime());
         	info.setEffectiveFrom(turck.getEffectiveFrom());
         	info.setEffectiveEnd(turck.getEffectiveEnd());
@@ -138,10 +138,20 @@ public class SupervisionThreestep extends BaseEntity
     private String attchItem2;
     private String attchItem3;
+    private String checkStatus;
+    
     private String[] places;
-    public String[] getPlaces() {
+    public String getCheckStatus() {
+		return checkStatus;
+	}
+
+	public void setCheckStatus(String checkStatus) {
+		this.checkStatus = checkStatus;
+	}
+
+	public String[] getPlaces() {
 		return places;
 	}
+package com.trash.business.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface GarMapper {
+
+		public int updateDropPointById(@Param("id")String  id ,@Param("status") String status);
+
+}
@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import com.trash.business.domain.TruckCredit;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,8 @@ import com.trash.common.utils.util.PostSms;
 import com.trash.common.utils.vo.mt.JsonSmsSend;
 import com.trash.common.utils.vo.mt.Mobile;
+import ch.qos.logback.core.util.TimeUtil;
+
 import org.springframework.transaction.annotation.Transactional;
 /**
@@ -32,276 +35,300 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2023-04-26
  */
 @Service
-public class DriverCreditServiceImpl implements IDriverCreditService
-{
-    @Autowired
-    private DriverCreditMapper driverCreditMapper;
-    
-    @Autowired
-    RedisCache redisCache;
-
-    /**
-     * 查询驾驶员失信
-     *
-     * @param id 驾驶员失信ID
-     * @return 驾驶员失信
-     */
-    @Override
-    public DriverCredit selectDriverCreditById(Long id)
-    {
-        return driverCreditMapper.selectDriverCreditById(id);
-    }
-
-    /**
-     * 查询驾驶员失信列表
-     *
-     * @param driverCredit 驾驶员失信
-     * @return 驾驶员失信
-     */
-    @Autowired
-    private trashConfig trashConfig;
-
-    @Autowired
-    RedisCache redis;
-    
-    @Override
-    public List<DriverCredit> selectDriverCreditList(DriverCredit driverCredit)
-    {
-    	
-    	List<DriverCredit> list = new ArrayList<>();
-
-			List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
-			List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
-			
-			
-			if(areas.size() > 0) {
-				JSONArray array = redis.getCacheObject("companyList");
-				if(array != null) {
-					for(Object obj:array) {
-						JSONObject json = (JSONObject)obj;
-						if(areas.indexOf(json.getString("areaCode")) > -1) {
-							companys.add(json.getString("id"));
-						}
+public class DriverCreditServiceImpl implements IDriverCreditService {
+	@Autowired
+	private DriverCreditMapper driverCreditMapper;
+
+	@Autowired
+	RedisCache redisCache;
+
+	/**
+	 * 查询驾驶员失信
+	 *
+	 * @param id
+	 *            驾驶员失信ID
+	 * @return 驾驶员失信
+	 */
+	@Override
+	public DriverCredit selectDriverCreditById(Long id) {
+		return driverCreditMapper.selectDriverCreditById(id);
+	}
+
+	/**
+	 * 查询驾驶员失信列表
+	 *
+	 * @param driverCredit
+	 *            驾驶员失信
+	 * @return 驾驶员失信
+	 */
+	@Autowired
+	private trashConfig trashConfig;
+
+	@Override
+	public List<DriverCredit> selectDriverCreditList(DriverCredit driverCredit) {
+
+		List<DriverCredit> list = new ArrayList<>();
+
+		List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
+		List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+
+		if (areas.size() > 0) {
+			JSONArray array = redisCache.getCacheObject("companyList");
+			if (array != null) {
+				for (Object obj : array) {
+					JSONObject json = (JSONObject) obj;
+					if (areas.indexOf(json.getString("areaCode")) > -1) {
+						companys.add(json.getString("id"));
 					}
 				}
 			}
-			
-			if (companys.size() > 0) {
+		}
-				List<String> ids = new ArrayList<>();
-				
-			        JSONArray jsonArray = RemoteServerUtils.getDriverList(trashConfig.getToken());
-									
-					for(Object obj:jsonArray){
-						JSONObject json = (JSONObject) obj;
-						if(companys.indexOf(json.getString("companyId")) > -1){
-							ids.add(json.getString("id"));
-							System.out.print(json.getString("id") + " ");
-						}
-					}
-				
-				driverCredit.setIds(ids);
-				
+		if (companys.size() > 0) {
+
+			List<String> ids = new ArrayList<>();
+			JSONArray jsonArray = redisCache.getCacheObject("driverList");
+			if(jsonArray == null){
+				Map map = new HashMap<>();
+				map.put("size", "99999");
+				map.put("page", "1");
+				jsonArray = RemoteServerUtils.getDriverList(trashConfig.getToken(), map);
+				if(jsonArray != null){
+					redisCache.setCacheObject("driverList", jsonArray, 60, TimeUnit.DAYS);
+				}
-				list = driverCreditMapper.selectDriverCreditList(driverCredit);
 			}
-
-    	
-        return list;
-    	
-    }
-
-    /**
-     * 新增驾驶员失信
-     *
-     * @param driverCredit 驾驶员失信
-     * @return 结果
-     */
-    @Override
-    public int insertDriverCredit(DriverCredit driverCredit)
-    {
-
-        int i;
-        
-        DriverCredit cc = new DriverCredit();
-        
-        cc.setStatus(0L);
-        cc.setLostCredit(driverCredit.getLostCredit());
-        cc.setObjectId(driverCredit.getObjectId());
-        
-        List old = driverCreditMapper.selectDriverCreditList(cc);
-        
-        if(old.size() > 0){
-        	i = 1;
-        }else{
-            i = driverCreditMapper.insertDriverCredit(driverCredit);
-        
-        
-        JSONArray array = redisCache.getCacheObject("companyList");
-        
-
-		JSONArray drivers = RemoteServerUtils.getDriverList();
-		String companyId = null;
-
-		for(Object obj:drivers){
-
-			JSONObject json = (JSONObject)obj;
-			if(json.getString("id").equals(driverCredit.getObjectId())){
-				companyId = json.getString("companyId");
+			
+			
+
+			for (Object obj : jsonArray) {
+				JSONObject json = (JSONObject) obj;
+				if (companys.indexOf(json.getString("companyId")) > -1) {
+					ids.add(json.getString("id"));
+					System.out.print(json.getString("id") + " ");
+				}
 			}
+
+			driverCredit.setIds(ids);
+
+			list = driverCreditMapper.selectDriverCreditList(driverCredit);
 		}
-        
-		if(companyId != null){
-			String number = null;
-			for(Object obj:array){
-				JSONObject json = (JSONObject)obj;
-				if(companyId.equals(json.getString("id"))){
-					number = json.getString("principalPhoneNo"); //企业安全负责人
-					break;
+
+		return list;
+
+	}
+
+	/**
+	 * 新增驾驶员失信
+	 *
+	 * @param driverCredit
+	 *            驾驶员失信
+	 * @return 结果
+	 */
+	@Override
+	public int insertDriverCredit(DriverCredit driverCredit) {
+
+		int i;
+
+		DriverCredit cc = new DriverCredit();
+
+		cc.setStatus(0L);
+		cc.setLostCredit(driverCredit.getLostCredit());
+		cc.setObjectId(driverCredit.getObjectId());
+
+		List old = driverCreditMapper.selectDriverCreditList(cc);
+
+		if (old.size() > 0) {
+			i = 1;
+		} else {
+			i = driverCreditMapper.insertDriverCredit(driverCredit);
+
+			JSONArray array = redisCache.getCacheObject("companyList");
+
+			JSONArray jsonArray = redisCache.getCacheObject("driverList");
+			if(jsonArray == null){
+				Map map = new HashMap<>();
+				map.put("size", "99999");
+				map.put("page", "1");
+				jsonArray = RemoteServerUtils.getDriverList(trashConfig.getToken(), map);
+				
+				if(jsonArray != null){
+					redisCache.setCacheObject("driverList", jsonArray, 60, TimeUnit.DAYS);
 				}
 			}
+			String companyId = null;
+
+			for (Object obj : jsonArray) {
-					
-	        
-			if(number != null){
-				List<Mobile> mobileList=new ArrayList<Mobile>();
-				Mobile mobile=new Mobile();
-	            mobile.setMobile(number);
-	            mobileList.add(mobile);
-	            
-	            String smsString = "";
-	            if(driverCredit.getLostCredit() == 1){
-	                smsString = "失信提醒："+driverCredit.getName()+"因"+driverCredit.getReason()+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
-	            }else{
-	                smsString = "失信解除提醒："+driverCredit.getName()+"现已解除失信，可以进行渣土业务办理，请知悉。";
-	            }
-	    		
-	            
-	            
-	            JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
-	            if(jsonSmsSend!=null){
-	                if(jsonSmsSend.getState()==0){
-	                	System.out.println("发送成功");
-	                }else{
-	                	System.out.println(jsonSmsSend.getMessage());
-	                }
-	            }else{
-	            	System.out.println("发送返回空");
-	            }
+				JSONObject json = (JSONObject) obj;
+				if (json.getString("id").equals(driverCredit.getObjectId())) {
+					companyId = json.getString("companyId");
+					break;
+				}
 			}
-		}
-		
-        }
-        
-        
-        
-        
-//        sentDataToRemoteServer(driverCredit);
-        return i;
-    }
+			if (companyId != null) {
+				String number = null;
+				for (Object obj : array) {
+					JSONObject json = (JSONObject) obj;
+					if (companyId.equals(json.getString("id"))) {
+						number = json.getString("principalPhoneNo"); // 企业安全负责人
+						break;
+					}
+				}
-    private void sentDataToRemoteServer(DriverCredit driverCredit) {
+				if (number != null) {
+					List<Mobile> mobileList = new ArrayList<Mobile>();
+					Mobile mobile = new Mobile();
+					mobile.setMobile(number);
+					mobileList.add(mobile);
+
+					String smsString = "";
+					if (driverCredit.getLostCredit() == 1) {
+						smsString = "失信提醒：" + driverCredit.getName() + "因" + driverCredit.getReason()
+								+ "原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
+					} else {
+						smsString = "失信解除提醒：" + driverCredit.getName() + "现已解除失信，可以进行渣土业务办理，请知悉。";
+					}
-        System.out.println("sendData!" + driverCredit.getObjectId() + "status" + driverCredit.getStatus() );
+					JsonSmsSend jsonSmsSend = PostSms.sendSms(mobileList, smsString);
+					if (jsonSmsSend != null) {
+						if (jsonSmsSend.getState() == 0) {
+							System.out.println("发送成功");
+						} else {
+							System.out.println(jsonSmsSend.getMessage());
+						}
+					} else {
+						System.out.println("发送返回空");
+					}
+				}
+			}
-    }
+		}
-    /**
-     * 修改驾驶员失信
-     *
-     * @param driverCredit 驾驶员失信
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int updateDriverCredit(DriverCredit driverCredit)
-    {
-        DriverCredit cc = driverCreditMapper.selectDriverCreditById(driverCredit.getId());
+		// sentDataToRemoteServer(driverCredit);
-        cc.setStatus(1L);
+		return i;
+	}
-        try {
-            driverCreditMapper.updateDriverCredit(cc);
+	private void sentDataToRemoteServer(DriverCredit driverCredit) {
-            cc.setReason(driverCredit.getReason());
-            cc.setTime(new Date());
-            cc.setLostCredit(0L);
+		System.out.println("sendData!" + driverCredit.getObjectId() + "status" + driverCredit.getStatus());
-            return insertDriverCredit(cc);
+	}
-        } catch (Exception e) {
+	/**
+	 * 修改驾驶员失信
+	 *
+	 * @param driverCredit
+	 *            驾驶员失信
+	 * @return 结果
+	 */
+	@Override
+	@Transactional
+	public int updateDriverCredit(DriverCredit driverCredit) {
+		DriverCredit cc = driverCreditMapper.selectDriverCreditById(driverCredit.getId());
-        }
+		cc.setStatus(1L);
-        return 0;
-    }
+		try {
+			driverCreditMapper.updateDriverCredit(cc);
-    @Override
-    public List<DriverCredit> selectDriverCreditHistory(DriverCredit driverCredit)
-    {	
-    	
-    	List<DriverCredit> list = new ArrayList<>();
+			cc.setReason(driverCredit.getReason());
+			cc.setTime(new Date());
+			cc.setLostCredit(0L);
-			List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
+			return insertDriverCredit(cc);
-			
-			if (companys.size() > 0) {
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
-				List<String> ids = new ArrayList<>();
-				
-			        JSONArray jsonArray = RemoteServerUtils.getDriverList(trashConfig.getToken());
-									
-					for(Object obj:jsonArray){
-						JSONObject json = (JSONObject) obj;
-						if(companys.indexOf(json.getString("companyId")) > -1){
-							ids.add(json.getString("id"));
-						}
+		return 0;
+	}
+
+	@Override
+	public List<DriverCredit> selectDriverCreditHistory(DriverCredit driverCredit) {
+
+		List<DriverCredit> list = new ArrayList<>();
+
+		List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
+		List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+		
+		if (areas.size() > 0) {
+			JSONArray array = redisCache.getCacheObject("companyList");
+			if (array != null) {
+				for (Object obj : array) {
+					JSONObject json = (JSONObject) obj;
+					if (areas.indexOf(json.getString("areaCode")) > -1) {
+						companys.add(json.getString("id"));
 					}
+				}
+			}
+		}
+
+		if (companys.size() > 0) {
+			
+			
+			List<String> ids = new ArrayList<>();
+
+			JSONArray jsonArray = redisCache.getCacheObject("driverList");
+			if(jsonArray == null){
+				Map map = new HashMap<>();
+				map.put("size", "99999");
+				map.put("page", "1");
+				jsonArray = RemoteServerUtils.getDriverList(trashConfig.getToken(), map);
+				if(jsonArray != null){
+					redisCache.setCacheObject("driverList", jsonArray, 60, TimeUnit.DAYS);
+				}
-				driverCredit.setIds(ids);
-				
-				
-				
-				list = driverCreditMapper.selectDriverCreditHistory(driverCredit);
 			}
-    	
-        return list;
-    }
-
-    /**
-     * 批量删除驾驶员失信
-     *
-     * @param ids 需要删除的驾驶员失信ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDriverCreditByIds(Long[] ids)
-    {
-        return driverCreditMapper.deleteDriverCreditByIds(ids);
-    }
-    
-    
-    
-    public List<String> getNames(DriverCredit driverCredit) {
-    	
-            return driverCreditMapper.getNames(driverCredit);
-    }
-
-    /**
-     * 删除驾驶员失信信息
-     *
-     * @param id 驾驶员失信ID
-     * @return 结果
-     */
-    @Override
-    public int deleteDriverCreditById(Long id)
-    {
-        return driverCreditMapper.deleteDriverCreditById(id);
-    }
+			for (Object obj : jsonArray) {
+				JSONObject json = (JSONObject) obj;
+				if (companys.indexOf(json.getString("companyId")) > -1) {
+					ids.add(json.getString("id"));
+				}
+			}
+
+			driverCredit.setIds(ids);
+
+			list = driverCreditMapper.selectDriverCreditHistory(driverCredit);
+		}
+
+		return list;
+	}
+
+	/**
+	 * 批量删除驾驶员失信
+	 *
+	 * @param ids
+	 *            需要删除的驾驶员失信ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteDriverCreditByIds(Long[] ids) {
+		return driverCreditMapper.deleteDriverCreditByIds(ids);
+	}
+
+	public List<String> getNames(DriverCredit driverCredit) {
+
+		return driverCreditMapper.getNames(driverCredit);
+	}
+
+	/**
+	 * 删除驾驶员失信信息
+	 *
+	 * @param id
+	 *            驾驶员失信ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteDriverCreditById(Long id) {
+		return driverCreditMapper.deleteDriverCreditById(id);
+	}
 }
 \ No newline at end of file
@@ -196,7 +196,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		if (ids.size() == 0) {
 			return list;
 		}
-
+		
 		list = supervisionThreestepMapper.selectSupervisionThreestepList(supervisionThreestep);
 		if (supervisionThreestep.getHis() != null && supervisionThreestep.getHis().equals("2")) {
@@ -989,7 +989,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				JSONObject truckObject = (JSONObject) object;
 				for (TruckActivate ta : taList) {
-
+					
+					
 					if (truckObject.getString("vehicleId").equals(ta.getObjectId())) {
 						if (truckObject.getInteger("vehicleStatus") == 1) {
@@ -77,9 +77,6 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 		List<TruckActivate> list = new ArrayList<>();
-		if(1==1){
-			return truckActivateMapper.selectTruckActivateList(truckActivate);
-		}
 				List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
 				List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
 package com.trash.casefile.kafka;
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.casefile.domain.KafkaCompensation;
@@ -35,408 +36,464 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class Consumer {
-    private static final Logger log = LoggerFactory.getLogger(Consumer.class);
-
-    @Autowired
-    private IViolationWarningInformationService violationWarningInformationService;
-
-    @KafkaListener(topics = "record_process_alarm")
-    public void consume(ConsumerRecord<?, ?> record, Acknowledgment ack) throws InterruptedException, IOException {
-        if(record==null){
-            throw new RuntimeException("kafka record对象为空");
-        }
-        if(record.value()==null){
-            throw new RuntimeException("kafka消费数据为空");
-        }
-        if(ack==null){
-            throw new RuntimeException("kafka ack对象为空");
-        }
-        log.info("kafka消费数据成功,offset:"+ record.offset() +",data:" + record.value());
-        String id = insertKafkaCompensation(record.value().toString());
-        autoViolationWarning(record.value().toString(),id);
-        //手动提交offset
-        ack.acknowledge();
-    }
-
-    @Autowired
-    trashConfig trashConfig;
-
-    @Autowired
-    SysLoginService loginService;
-
-    @Autowired
-    RedisCache redisCache;
-
-    public void autoViolationWarning(String data,String id) throws InterruptedException, IOException {
-    	
-        JSONObject jsonObject = JSONObject.parseObject(data);
-        //报警时间
-        Date alarmTime = new Date(jsonObject.getLong("alarmTime")*1000L);
-
-        //这一块是一天内同一工地，同一类型的报警，只报有一条数据，不重复报工，只累加
-        String nowHour = DateFormatUtils.format(alarmTime, "HH");
-        String nowDate = null;
-        String tomorrowDate = null;
-        if(Integer.valueOf(nowHour)<8){
-            nowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, -1), "yyyy-MM-dd");
-            tomorrowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
-        }else{
-            nowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
-            tomorrowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, 1), "yyyy-MM-dd");
-        }
-
-        //违规类型code
-        String violationTypeCode = jsonObject.getString("alarmType");
-        //违规类型
-        String violationType = jsonObject.getString("alarmName");
-        if(RemoteServerUtils.remote==null){
-            //登录
-            RemoteServerUtils.remote = trashConfig.getRemotePath();
-            loginService.loginByRemote(trashConfig.getToken());
-        }
-        ViolationWarningInformation violationWarningInformation1 = null;
-        JSONArray company1 = null;
-        JSONObject basevehicleInfo = null;
-        //这些类型无需累加
-            if(violationTypeCode.equals("44030021") || violationTypeCode.equals("44030025")||violationTypeCode.equals("44030023")){
-            violationWarningInformation1 = null;
-        }else if(violationTypeCode.equals("44030033")||violationTypeCode.equals("44030034")){//这两种类型根据公司累加
-            company1 = redisCache.getCacheObject("companyList");
-            basevehicleInfo = RemoteServerUtils.getBasevehicleInfo(jsonObject.getString("vehicleId"),trashConfig.getToken());
-            if(company1==null){
-                throw new RuntimeException("获取公司列表失败！！！");
-            }
-
-            if(basevehicleInfo==null){
-                throw new RuntimeException("获取公司详情失败！vehicleId:"+jsonObject.getString("vehicleId"));
-            }
-        }else{//其他都是根据工地/消纳站累加
-            String project = jsonObject.getString("siteName");
-            violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class).selectViolationWarningInformation(null,project, violationTypeCode, nowDate, tomorrowDate);
-        }
-        String siteName = jsonObject.getString("siteName");
-        //判断该类型，该工地，该时间段是否已经存在报警信息，如果存在则不再新增，如果不存在则新增
-        if (violationWarningInformation1 == null) {
-            ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
-            String siteType = jsonObject.getString("siteType");
-            if ("2".equals(siteType)) {//消纳场
-                violationWarningInformation.setViolationObjectType("1");
-            }
-            //所属区域
-            violationWarningInformation.setOwningRegion(jsonObject.getString("areaName"));
-            //案卷编码
-            String number = DateFormatUtils.format(alarmTime, "yyyyMMddHHmmssSSS");
-            violationWarningInformation.setNumber(number.substring(2));
-            //公司名称
-            violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
-            //违规类型
-            violationWarningInformation.setViolationType(violationTypeCode);
-            //发送人
-            violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
-            //推送对象
-            violationWarningInformation.setViolationGrade("一般类");
-            violationWarningInformation.setSendObject("区管理部门");
-            String describe = "";
-            String alarmTimeString = DateFormatUtils.format(alarmTime,"HH:mm");
-            //根据不同违规类型，走不同流程
-            switch (violationTypeCode) {
-                case "44030020"://工地预警-未报开工作业
-                    //获取报警次数
-                    int count44030020 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020")==null?1:Integer.parseInt(redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020").toString())+1;
-                    //获取累计报警描述
-                    String describe44030020 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020describe")==null?"":redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020describe").toString();
-                    if(!StringUtils.isEmpty(describe44030020)){
-                        describe44030020 = describe44030020 + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                                jsonObject.get("siteName") + "出现" + violationType;
-                    }else{
-                        describe44030020 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                                jsonObject.get("siteName") + "出现" + violationType;
-                    }
-                    //报警次数等于5推送案卷
-                    if(count44030020==5){
-                        violationWarningInformation.setViolationObjectType("0");
-                        violationWarningInformation.setSendObject("区管理部门");
-                        violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-                        violationWarningInformation.setCreateTime(alarmTime);
-                        violationWarningInformation.setDescribe(describe44030020);
-                        // 业务逻辑
-                        violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-                    }
-                    //次数+1
-                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030020",count44030020,24, TimeUnit.HOURS);
-                    //累计描述
-                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030020describe",describe44030020,24, TimeUnit.HOURS);
-                    break;
-                case "44030023"://工地预警-未按时间作业
-                    try{
-                        //获取工地信息
-                        JSONObject object = RemoteServerUtils.getConstructionLicenseById(jsonObject.getString("siteId"), trashConfig.getToken());
-                        String transportEndTime = object.getString("transportEndTime");
-                        String transportStartTime = object.getString("transportStartTime");
-                        String endTime = manipulateTime(transportEndTime,30);
-                        String startTime = manipulateTime(transportStartTime,-30);
-                        //获取结束运输报警次数
-                        String countKey = nowDate+jsonObject.getString("siteId")+"44030023"+transportEndTime;
-                        int count44030023 = redisCache.getCacheObject(countKey)==null?1:Integer.parseInt(redisCache.getCacheObject(countKey).toString())+1;
-                        //获取结束运输累计报警描述
-                        String describeKey = nowDate+jsonObject.getString("siteId")+"44030023describe"+transportEndTime;
-                        String describe44030023 = redisCache.getCacheObject(describeKey)==null?"":redisCache.getCacheObject(describeKey).toString();
-                        //获取结束运输报警次数
-                        String countEKey = nowDate+jsonObject.getString("siteId")+"44030023"+transportStartTime;
-                        int countE = redisCache.getCacheObject(countEKey)==null?1:Integer.parseInt(redisCache.getCacheObject(countEKey).toString())+1;
-                        //获取结束运输累计报警描述
-                        String describeEKey = nowDate+jsonObject.getString("siteId")+"44030023describe"+transportStartTime;
-                        String describeE = redisCache.getCacheObject(describeEKey)==null?"":redisCache.getCacheObject(describeEKey).toString();
-
-                        if(!StringUtils.isEmpty(describe44030023)){
-                            describe44030023 = describe44030023 + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                                    jsonObject.get("siteName") + "出现" + violationType;
-                        }else{
-                            describe44030023 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                                    jsonObject.get("siteName") + "出现" + violationType;
-                        }
-                        //报警次数等于5推送案卷
-                        if(count44030023==5&&isTimeWithinRange(alarmTimeString,transportEndTime,endTime)){
-                            violationWarningInformation.setViolationObjectType("0");
-                            violationWarningInformation.setSendObject("区管理部门");
-                            violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-
-                            violationWarningInformation.setCreateTime(alarmTime);
-                            violationWarningInformation.setDescribe(describe44030023);
-                            // 业务逻辑
-                            violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-                        }
-
-                        if(!StringUtils.isEmpty(describeE)){
-                            describeE = describeE + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                                    jsonObject.get("siteName") + "出现" + violationType;
-                        }else{
-                            describeE = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                                    jsonObject.get("siteName") + "出现" + violationType;
-                        }
-                        //报警次数等于5推送案卷
-                        if(countE==5&&isTimeWithinRange(alarmTimeString,startTime,transportStartTime)){
-                            violationWarningInformation.setViolationObjectType("0");
-                            violationWarningInformation.setSendObject("区管理部门");
-                            violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-
-                            violationWarningInformation.setCreateTime(alarmTime);
-                            violationWarningInformation.setDescribe(describeE);
-                            // 业务逻辑
-                            violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-                        }
-
-
-                        //判断结束运输
-                        if(isTimeWithinRange(alarmTimeString,transportEndTime,endTime)){
-                            //次数+1
-                            redisCache.setCacheObject(countKey,count44030023,1, TimeUnit.HOURS);
-                            //累计描述
-                            redisCache.setCacheObject(describeKey,describe44030023,1, TimeUnit.HOURS);
-                        }else if(isTimeWithinRange(alarmTimeString,startTime,transportStartTime)){
-                            //次数+1
-                            redisCache.setCacheObject(countEKey,countE,1, TimeUnit.HOURS);
-                            //累计描述
-                            redisCache.setCacheObject(describeEKey,describeE,1, TimeUnit.HOURS);
-                        }
-                    }catch (NullPointerException e){
-                        throw e;
-                    }
-                    break;
-
-                case "44030030"://未激活车辆作业
-                case "44030031"://未核准作业车辆作业
-                case "44030022"://工地预警-三无车辆进入工地
-                case "44030021"://工地预警-视频设备离线超时报警
-                case "44030028"://离线运输报警(工)
-
-                    violationWarningInformation.setViolationObjectType("0");
-                    violationWarningInformation.setSendObject("区管理部门");
-                    violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                            jsonObject.get("siteName") + "出现" + violationType;
-                    violationWarningInformation.setCreateTime(alarmTime);
-                    violationWarningInformation.setDescribe(describe);
-                    // 业务逻辑
-                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-                    break;
-
-                case "44030024"://处理场所预警-未报开工作业
-                    //获取报警次数
-                    int count44030024 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024")==null?1:Integer.parseInt(redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024").toString())+1;
-                    //获取累计报警描述
-                    String describe44030024 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe")==null?"":redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe").toString();
-                    if(!StringUtils.isEmpty(describe44030024)){
-                        describe44030024 = describe44030024 + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                                jsonObject.get("siteName") + "出现" + violationType;
-                    }else{
-                        describe44030024 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                                jsonObject.get("siteName") + "出现" + violationType;
-                    }
-                    //报警次数等于5推送案卷
-                    if(count44030024==5){
-                        violationWarningInformation.setViolationObjectType("1");
-                        violationWarningInformation.setSendObject("区管理部门");
-                        violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-
-                        violationWarningInformation.setCreateTime(alarmTime);
-                        violationWarningInformation.setDescribe(describe44030024);
-                        // 业务逻辑
-                        violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-                    }
-
-
-                    //次数+1
-                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030024",count44030024,24, TimeUnit.HOURS);
-                    //累计描述
-                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe",describe44030024,24, TimeUnit.HOURS);
-                    break;
-                case "44030027"://处理场所预警-未到指定的处理场所作业
-                case "44030026"://处理场所预警-三无车辆进入处理场所
-                case "44030029"://离线运输报警(消)
-                case "44030025"://处理场所预警-视频设备离线超时报警
-                    violationWarningInformation.setViolationObjectType("1");
-                    violationWarningInformation.setSendObject("区管理部门");
-                    violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                            jsonObject.get("siteName") + "出现" + violationType;
-                    violationWarningInformation.setCreateTime(alarmTime);
-                    violationWarningInformation.setDescribe(describe);
-                    // 业务逻辑
-                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-                    break;
-                case "44030032"://未按线路行驶
-                    violationWarningInformation.setViolationObjectType("0");
-                    violationWarningInformation.setSendObject("区管理部门");
-                    violationWarningInformation.setProjectName(siteName);
-                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-                            jsonObject.get("siteName") + "出现" + violationType;
-                    violationWarningInformation.setCreateTime(alarmTime);
-                    violationWarningInformation.setDescribe(describe);
-                    // 业务逻辑
-                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-                    break;
-                case "44030033"://闯禁行驶
-                    violationWarningInformation.setViolationObjectType("0");
-                    violationWarningInformation.setSendObject("区管理部门");
-                    violationWarningInformation.setProjectName(siteName);
-                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationType;
-                    //设置公司简称
-                    for(Object o:company1){
-                        JSONObject jo = (JSONObject) o;
-                        if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
-                            violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
-                        }
-                    }
-                    violationWarningInformation.setCreateTime(alarmTime);
-                    violationWarningInformation.setDescribe(describe);
-                    // 业务逻辑
-                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-                    break;
-
-                case "44030034"://失信车辆作业
-                case "44030035"://卫星
-                    violationWarningInformation.setProjectName(siteName);
-                	violationWarningInformation.setViolationObjectType("2");
-                    violationWarningInformation.setSendObject("运输企业");
-                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationType;
-                    //设置公司简称
-                    for(Object o:company1){
-                        JSONObject jo = (JSONObject) o;
-                        if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
-                            violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
-                        }
-                    }
-                    violationWarningInformation.setCreateTime(alarmTime);
-                    violationWarningInformation.setDescribe(describe);
-                    // 业务逻辑
-                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-                    break;
-            }
-
-
-
-
-        } else {
-            String describe = "";
-            if(violationTypeCode.equals("44030033")||violationTypeCode.equals("44030034")){
-                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                        + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "出现" + jsonObject.getString("alarmName");
-            }else{
-                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-                        + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在" +
-                        jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
-            }
-
-            violationWarningInformation1.setDescribe(describe);
-            SpringUtils.getBean(ViolationWarningInformationMapper.class).updateViolationWarningInformation(violationWarningInformation1);
-        }
-        //kafka消费成功
-        KafkaCompensation kafkaCompensation = new KafkaCompensation();
-        kafkaCompensation.setId(Long.valueOf(id));
-        kafkaCompensation.setStatus(1);
-        SpringUtils.getBean(KafkaCompensationMapper.class).updateKafkaCompensation(kafkaCompensation);
-
-    }
-
-    public String insertKafkaCompensation(String data){
-        KafkaCompensation kafkaCompensation = new KafkaCompensation();
-        kafkaCompensation.setData(data);
-        kafkaCompensation.setCreateTime(DateUtils.getNowDate());
-        kafkaCompensation.setStatus(0);
-        SpringUtils.getBean(KafkaCompensationMapper.class).insertKafkaCompensation(kafkaCompensation);
-        return kafkaCompensation.getId().toString();
-    }
-
-    /**
-     * 对HH:mm格式时间进行分钟的加减
-     * @param timeStr
-     * @param minutesToAddOrSubtract
-     * @return
-     */
-    public  String manipulateTime(String timeStr, int minutesToAddOrSubtract) {
-        // 定义输入时间格式的日期时间格式器
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
-
-        // 解析输入的时间字符串为 LocalTime 对象
-        LocalTime time = LocalTime.parse(timeStr, formatter);
-
-        // 执行加减分钟的操作
-        LocalTime modifiedTime = time.plusMinutes(minutesToAddOrSubtract);
-
-        // 将修改后的时间格式化为 HH:mm 格式
-        String formattedModifiedTime = modifiedTime.format(formatter);
-
-        return formattedModifiedTime;
-    }
-
-    /**
-     * 判断timeStr是否在startTimeStr-endTimeStr区间
-     * @param timeStr
-     * @param startTimeStr
-     * @param endTimeStr
-     * @return
-     */
-    public boolean isTimeWithinRange(String timeStr, String startTimeStr, String endTimeStr) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
-        LocalTime time = LocalTime.parse(timeStr, formatter);
-        LocalTime startTime = LocalTime.parse(startTimeStr, formatter);
-        LocalTime endTime = LocalTime.parse(endTimeStr, formatter);
-
-        return !time.isBefore(startTime) && !time.isAfter(endTime);
-
-    }
+	private static final Logger log = LoggerFactory.getLogger(Consumer.class);
+
+	@Autowired
+	private IViolationWarningInformationService violationWarningInformationService;
+
+	@KafkaListener(topics = "record_process_alarm")
+	public void consume(ConsumerRecord<?, ?> record, Acknowledgment ack) throws InterruptedException, IOException {
+		if (record == null) {
+			throw new RuntimeException("kafka record对象为空");
+		}
+		if (record.value() == null) {
+			throw new RuntimeException("kafka消费数据为空");
+		}
+		if (ack == null) {
+			throw new RuntimeException("kafka ack对象为空");
+		}
+		log.info("kafka消费数据成功,offset:" + record.offset() + ",data:" + record.value());
+		String id = insertKafkaCompensation(record.value().toString());
+		autoViolationWarning(record.value().toString(), id);
+		// 手动提交offset
+		ack.acknowledge();
+	}
+
+	@Autowired
+	trashConfig trashConfig;
+
+	@Autowired
+	SysLoginService loginService;
+
+	@Autowired
+	RedisCache redisCache;
+
+	Map<String, Long> cMap = new HashMap<String, Long>();
+
+	JSONArray company1 = null;
+
+	public void autoViolationWarning(String data, String id) throws InterruptedException, IOException {
+
+		JSONObject jsonObject = JSONObject.parseObject(data);
+		// 报警时间
+		Date alarmTime = new Date(jsonObject.getLong("alarmTime") * 1000L);
+
+		// 这一块是一天内同一工地，同一类型的报警，只报有一条数据，不重复报工，只累加
+		String nowHour = DateFormatUtils.format(alarmTime, "HH");
+		String nowDate = null;
+		String tomorrowDate = null;
+		if (Integer.valueOf(nowHour) < 8) {
+			nowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, -1), "yyyy-MM-dd");
+			tomorrowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
+		} else {
+			nowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
+			tomorrowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, 1), "yyyy-MM-dd");
+		}
+
+		// 违规类型code
+		String violationTypeCode = jsonObject.getString("alarmType");
+		// 违规类型
+		String violationType = jsonObject.getString("alarmName");
+		if (RemoteServerUtils.remote == null) {
+			// 登录
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+			loginService.loginByRemote(trashConfig.getToken());
+		}
+		ViolationWarningInformation violationWarningInformation1 = null;
+		JSONObject basevehicleInfo = null;
+		// 这些类型无需累加
+		if (violationTypeCode.equals("44030021") || violationTypeCode.equals("44030025")
+				|| violationTypeCode.equals("44030023")) {
+			violationWarningInformation1 = null;
+		} else if (violationTypeCode.equals("44030033") || violationTypeCode.equals("44030034")
+				|| violationTypeCode.equals("44030035")) {// 这两种类型根据公司累加
+
+			if (company1 == null || cMap.get("companyTime")==null || (new Date().getTime() - cMap.get("companyTime")) > 1000 * 60 * 60) {
+				company1 = redisCache.getCacheObject("companyList");
+				cMap.put("companyTime", new Date().getTime());
+			}
+			basevehicleInfo = RemoteServerUtils.getBasevehicleInfo(jsonObject.getString("vehicleId"),
+					trashConfig.getToken());
+			if (company1 == null) {
+				throw new RuntimeException("获取公司列表失败！！！");
+			}
+
+			if (basevehicleInfo == null) {
+				throw new RuntimeException("获取公司详情失败！vehicleId:" + jsonObject.getString("vehicleId"));
+			}
+		} else {// 其他都是根据工地/消纳站累加
+			String project = jsonObject.getString("siteName");
+			violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class)
+					.selectViolationWarningInformation(null, project, violationTypeCode, nowDate, tomorrowDate);
+		}
+		String siteName = jsonObject.getString("siteName");
+		// 判断该类型，该工地，该时间段是否已经存在报警信息，如果存在则不再新增，如果不存在则新增
+		if (violationWarningInformation1 == null) {
+			ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
+			String siteType = jsonObject.getString("siteType");
+			if ("2".equals(siteType)) {// 消纳场
+				violationWarningInformation.setViolationObjectType("1");
+			}
+			// 所属区域
+			violationWarningInformation.setOwningRegion(jsonObject.getString("areaName"));
+			// 案卷编码
+			String number = DateFormatUtils.format(alarmTime, "yyyyMMddHHmmssSSS");
+			violationWarningInformation.setNumber(number.substring(2));
+			// 公司名称
+			violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
+			// 违规类型
+			violationWarningInformation.setViolationType(violationTypeCode);
+			// 发送人
+			violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
+			// 推送对象
+			violationWarningInformation.setViolationGrade("一般类");
+			violationWarningInformation.setSendObject("区管理部门");
+			String describe = "";
+			String alarmTimeString = DateFormatUtils.format(alarmTime, "HH:mm");
+			// 根据不同违规类型，走不同流程
+			switch (violationTypeCode) {
+			case "44030020":// 工地预警-未报开工作业
+				// 获取报警次数
+				int count44030020 = redisCache
+						.getCacheObject(nowDate + jsonObject.getString("siteId") + "44030020") == null
+								? 1
+								: Integer.parseInt(
+										redisCache.getCacheObject(nowDate + jsonObject.getString("siteId") + "44030020")
+												.toString())
+										+ 1;
+				// 获取累计报警描述
+				String describe44030020 = redisCache
+						.getCacheObject(nowDate + jsonObject.getString("siteId") + "44030020describe") == null
+								? ""
+								: redisCache
+										.getCacheObject(nowDate + jsonObject.getString("siteId") + "44030020describe")
+										.toString();
+				if (!StringUtils.isEmpty(describe44030020)) {
+					describe44030020 = describe44030020 + ";\n"
+							+ DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+							+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo")
+							+ "在" + jsonObject.get("siteName") + "出现" + violationType;
+				} else {
+					describe44030020 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+							+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo")
+							+ "在" + jsonObject.get("siteName") + "出现" + violationType;
+				}
+				// 报警次数等于5推送案卷
+				if (count44030020 == 5) {
+					violationWarningInformation.setViolationObjectType("0");
+					violationWarningInformation.setSendObject("区管理部门");
+					violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+					violationWarningInformation.setCreateTime(alarmTime);
+					violationWarningInformation.setDescribe(describe44030020);
+					// 业务逻辑
+					violationWarningInformationService.insertViolationWarningInformation(null,
+							violationWarningInformation);
+				}
+				// 次数+1
+				redisCache.setCacheObject(nowDate + jsonObject.getString("siteId") + "44030020", count44030020, 24,
+						TimeUnit.HOURS);
+				// 累计描述
+				redisCache.setCacheObject(nowDate + jsonObject.getString("siteId") + "44030020describe",
+						describe44030020, 24, TimeUnit.HOURS);
+				break;
+			case "44030023":// 工地预警-未按时间作业
+				try {
+					// 获取工地信息
+					JSONObject object = RemoteServerUtils.getConstructionLicenseById(jsonObject.getString("siteId"),
+							trashConfig.getToken());
+					String transportEndTime = object.getString("transportEndTime");
+					String transportStartTime = object.getString("transportStartTime");
+					String endTime = manipulateTime(transportEndTime, 30);
+					String startTime = manipulateTime(transportStartTime, -30);
+					// 获取结束运输报警次数
+					String countKey = nowDate + jsonObject.getString("siteId") + "44030023" + transportEndTime;
+					int count44030023 = redisCache.getCacheObject(countKey) == null ? 1
+							: Integer.parseInt(redisCache.getCacheObject(countKey).toString()) + 1;
+					// 获取结束运输累计报警描述
+					String describeKey = nowDate + jsonObject.getString("siteId") + "44030023describe"
+							+ transportEndTime;
+					String describe44030023 = redisCache.getCacheObject(describeKey) == null ? ""
+							: redisCache.getCacheObject(describeKey).toString();
+					// 获取结束运输报警次数
+					String countEKey = nowDate + jsonObject.getString("siteId") + "44030023" + transportStartTime;
+					int countE = redisCache.getCacheObject(countEKey) == null ? 1
+							: Integer.parseInt(redisCache.getCacheObject(countEKey).toString()) + 1;
+					// 获取结束运输累计报警描述
+					String describeEKey = nowDate + jsonObject.getString("siteId") + "44030023describe"
+							+ transportStartTime;
+					String describeE = redisCache.getCacheObject(describeEKey) == null ? ""
+							: redisCache.getCacheObject(describeEKey).toString();
+
+					if (!StringUtils.isEmpty(describe44030023)) {
+						describe44030023 = describe44030023 + ";\n"
+								+ DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+								+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo")
+								+ "在" + jsonObject.get("siteName") + "出现" + violationType;
+					} else {
+						describe44030023 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+								+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo")
+								+ "在" + jsonObject.get("siteName") + "出现" + violationType;
+					}
+					// 报警次数等于5推送案卷
+					if (count44030023 == 5 && isTimeWithinRange(alarmTimeString, transportEndTime, endTime)) {
+						violationWarningInformation.setViolationObjectType("0");
+						violationWarningInformation.setSendObject("区管理部门");
+						violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+
+						violationWarningInformation.setCreateTime(alarmTime);
+						violationWarningInformation.setDescribe(describe44030023);
+						// 业务逻辑
+						violationWarningInformationService.insertViolationWarningInformation(null,
+								violationWarningInformation);
+					}
+
+					if (!StringUtils.isEmpty(describeE)) {
+						describeE = describeE + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+								+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo")
+								+ "在" + jsonObject.get("siteName") + "出现" + violationType;
+					} else {
+						describeE = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+								+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo")
+								+ "在" + jsonObject.get("siteName") + "出现" + violationType;
+					}
+					// 报警次数等于5推送案卷
+					if (countE == 5 && isTimeWithinRange(alarmTimeString, startTime, transportStartTime)) {
+						violationWarningInformation.setViolationObjectType("0");
+						violationWarningInformation.setSendObject("区管理部门");
+						violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+
+						violationWarningInformation.setCreateTime(alarmTime);
+						violationWarningInformation.setDescribe(describeE);
+						// 业务逻辑
+						violationWarningInformationService.insertViolationWarningInformation(null,
+								violationWarningInformation);
+					}
+
+					// 判断结束运输
+					if (isTimeWithinRange(alarmTimeString, transportEndTime, endTime)) {
+						// 次数+1
+						redisCache.setCacheObject(countKey, count44030023, 1, TimeUnit.HOURS);
+						// 累计描述
+						redisCache.setCacheObject(describeKey, describe44030023, 1, TimeUnit.HOURS);
+					} else if (isTimeWithinRange(alarmTimeString, startTime, transportStartTime)) {
+						// 次数+1
+						redisCache.setCacheObject(countEKey, countE, 1, TimeUnit.HOURS);
+						// 累计描述
+						redisCache.setCacheObject(describeEKey, describeE, 1, TimeUnit.HOURS);
+					}
+				} catch (NullPointerException e) {
+					throw e;
+				}
+				break;
+
+			case "44030030":// 未激活车辆作业
+			case "44030031":// 未核准作业车辆作业
+			case "44030022":// 工地预警-三无车辆进入工地
+			case "44030021":// 工地预警-视频设备离线超时报警
+			case "44030028":// 离线运输报警(工)
+
+				violationWarningInformation.setViolationObjectType("0");
+				violationWarningInformation.setSendObject("区管理部门");
+				violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+				describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+						+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在"
+						+ jsonObject.get("siteName") + "出现" + violationType;
+				violationWarningInformation.setCreateTime(alarmTime);
+				violationWarningInformation.setDescribe(describe);
+				// 业务逻辑
+				violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+				break;
+
+			case "44030024":// 处理场所预警-未报开工作业
+				// 获取报警次数
+				int count44030024 = redisCache
+						.getCacheObject(nowDate + jsonObject.getString("siteId") + "44030024") == null
+								? 1
+								: Integer.parseInt(
+										redisCache.getCacheObject(nowDate + jsonObject.getString("siteId") + "44030024")
+												.toString())
+										+ 1;
+				// 获取累计报警描述
+				String describe44030024 = redisCache
+						.getCacheObject(nowDate + jsonObject.getString("siteId") + "44030024describe") == null
+								? ""
+								: redisCache
+										.getCacheObject(nowDate + jsonObject.getString("siteId") + "44030024describe")
+										.toString();
+				if (!StringUtils.isEmpty(describe44030024)) {
+					describe44030024 = describe44030024 + ";\n"
+							+ DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+							+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo")
+							+ "在" + jsonObject.get("siteName") + "出现" + violationType;
+				} else {
+					describe44030024 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+							+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo")
+							+ "在" + jsonObject.get("siteName") + "出现" + violationType;
+				}
+				// 报警次数等于5推送案卷
+				if (count44030024 == 5) {
+					violationWarningInformation.setViolationObjectType("1");
+					violationWarningInformation.setSendObject("区管理部门");
+					violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+
+					violationWarningInformation.setCreateTime(alarmTime);
+					violationWarningInformation.setDescribe(describe44030024);
+					// 业务逻辑
+					violationWarningInformationService.insertViolationWarningInformation(null,
+							violationWarningInformation);
+				}
+
+				// 次数+1
+				redisCache.setCacheObject(nowDate + jsonObject.getString("siteId") + "44030024", count44030024, 24,
+						TimeUnit.HOURS);
+				// 累计描述
+				redisCache.setCacheObject(nowDate + jsonObject.getString("siteId") + "44030024describe",
+						describe44030024, 24, TimeUnit.HOURS);
+				break;
+			case "44030027":// 处理场所预警-未到指定的处理场所作业
+			case "44030026":// 处理场所预警-三无车辆进入处理场所
+			case "44030029":// 离线运输报警(消)
+			case "44030025":// 处理场所预警-视频设备离线超时报警
+				violationWarningInformation.setViolationObjectType("1");
+				violationWarningInformation.setSendObject("区管理部门");
+				violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+				describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+						+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在"
+						+ jsonObject.get("siteName") + "出现" + violationType;
+				violationWarningInformation.setCreateTime(alarmTime);
+				violationWarningInformation.setDescribe(describe);
+				// 业务逻辑
+				violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+				break;
+			case "44030032":// 未按线路行驶
+				violationWarningInformation.setViolationObjectType("0");
+				violationWarningInformation.setSendObject("区管理部门");
+				violationWarningInformation.setProjectName(siteName);
+				describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+						+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在"
+						+ jsonObject.get("siteName") + "出现" + violationType;
+				violationWarningInformation.setCreateTime(alarmTime);
+				violationWarningInformation.setDescribe(describe);
+				// 业务逻辑
+				violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+				break;
+			case "44030033":// 闯禁行驶
+				violationWarningInformation.setViolationObjectType("0");
+				violationWarningInformation.setSendObject("区管理部门");
+				violationWarningInformation.setProjectName(siteName);
+				describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+						+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现"
+						+ violationType;
+				// 设置公司简称
+				for (Object o : company1) {
+					JSONObject jo = (JSONObject) o;
+					if (basevehicleInfo.getString("companyID").equals(jo.getString("id"))) {
+						violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
+						break;
+					}
+				}
+				violationWarningInformation.setCreateTime(alarmTime);
+				violationWarningInformation.setDescribe(describe);
+				// 业务逻辑
+				violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+				break;
+
+			case "44030034":// 失信车辆作业
+			case "44030035":// 卫星
+				violationWarningInformation.setProjectName(siteName);
+				violationWarningInformation.setViolationObjectType("2");
+				violationWarningInformation.setSendObject("运输企业");
+				describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+						+ violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现"
+						+ violationType;
+				// 设置公司简称
+				for (Object o : company1) {
+					JSONObject jo = (JSONObject) o;
+					if (basevehicleInfo.getString("companyID").equals(jo.getString("id"))) {
+						violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
+						break;
+					}
+				}
+				violationWarningInformation.setCreateTime(alarmTime);
+				violationWarningInformation.setDescribe(describe);
+				// 业务逻辑
+				violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+				break;
+			}
+
+		} else {
+			String describe = "";
+			if (violationTypeCode.equals("44030033") || violationTypeCode.equals("44030034")) {
+				describe = violationWarningInformation1.getDescribe() + ";\n"
+						+ DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+						+ jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "出现"
+						+ jsonObject.getString("alarmName");
+			} else {
+				describe = violationWarningInformation1.getDescribe() + ";\n"
+						+ DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+						+ jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在"
+						+ jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
+			}
+
+			violationWarningInformation1.setDescribe(describe);
+			SpringUtils.getBean(ViolationWarningInformationMapper.class)
+					.updateViolationWarningInformation(violationWarningInformation1);
+		}
+		// kafka消费成功
+		KafkaCompensation kafkaCompensation = new KafkaCompensation();
+		kafkaCompensation.setId(Long.valueOf(id));
+		kafkaCompensation.setStatus(1);
+		SpringUtils.getBean(KafkaCompensationMapper.class).updateKafkaCompensation(kafkaCompensation);
+
+	}
+
+	public String insertKafkaCompensation(String data) {
+		KafkaCompensation kafkaCompensation = new KafkaCompensation();
+		kafkaCompensation.setData(data);
+		kafkaCompensation.setCreateTime(DateUtils.getNowDate());
+		kafkaCompensation.setStatus(0);
+		SpringUtils.getBean(KafkaCompensationMapper.class).insertKafkaCompensation(kafkaCompensation);
+		return kafkaCompensation.getId().toString();
+	}
+
+	/**
+	 * 对HH:mm格式时间进行分钟的加减
+	 * 
+	 * @param timeStr
+	 * @param minutesToAddOrSubtract
+	 * @return
+	 */
+	public String manipulateTime(String timeStr, int minutesToAddOrSubtract) {
+		// 定义输入时间格式的日期时间格式器
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+
+		// 解析输入的时间字符串为 LocalTime 对象
+		LocalTime time = LocalTime.parse(timeStr, formatter);
+
+		// 执行加减分钟的操作
+		LocalTime modifiedTime = time.plusMinutes(minutesToAddOrSubtract);
+
+		// 将修改后的时间格式化为 HH:mm 格式
+		String formattedModifiedTime = modifiedTime.format(formatter);
+
+		return formattedModifiedTime;
+	}
+
+	/**
+	 * 判断timeStr是否在startTimeStr-endTimeStr区间
+	 * 
+	 * @param timeStr
+	 * @param startTimeStr
+	 * @param endTimeStr
+	 * @return
+	 */
+	public boolean isTimeWithinRange(String timeStr, String startTimeStr, String endTimeStr) {
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+		LocalTime time = LocalTime.parse(timeStr, formatter);
+		LocalTime startTime = LocalTime.parse(startTimeStr, formatter);
+		LocalTime endTime = LocalTime.parse(endTimeStr, formatter);
+
+		return !time.isBefore(startTime) && !time.isAfter(endTime);
+
+	}
 }
+package com.trash.workflow.listener;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.ExecutionListener;
+import org.activiti.engine.delegate.Expression;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.trash.business.mapper.GarMapper;
+import com.trash.common.utils.spring.SpringUtils;
+
+
+public class DropPointListener implements ExecutionListener {
+
+	private Expression state;
+	
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+
+    	List<Map> maps = new ArrayList<Map>();
+    	    	
+    	String idString = (delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
+    	String status = (state.getValue(delegateExecution).toString());
+    	
+    	SpringUtils.getBean(GarMapper.class).updateDropPointById(idString, status);
+    	
+        workflowUtils.sendDataToHisTory(delegateExecution, state,null);
+    	
+    	System.out.println("纪检督察流程状态更新 更新ID:" + delegateExecution.getProcessInstanceBusinessKey()  + "状态:" + state.getValue(delegateExecution).toString());
+    }
+
+
+
+}
@@ -3,17 +3,12 @@ package com.trash.workflow.service;
 import java.util.List;
 import java.util.Map;
-import com.trash.casefile.domain.ViolationWarningInformation;
-import org.activiti.api.process.model.ProcessInstance;
-
-import com.trash.activiti.domain.dto.HistoryDataDTO;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.casefile.domain.ViolationCaseFile;
+import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.workflow.domain.Workflow;
-import net.sf.jsqlparser.statement.create.table.Index;
-
 /**
  * 请假Service接口
  * 
@@ -79,6 +74,7 @@ public interface IWorkflowService
      */
     int deleteWorkflowById(String id);
+    int createDropPointWorkFlow(Map<String,String> droppoint);
 	int createLeaveWorkFlow(Workflow workflow,int index);
@@ -4,33 +4,20 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import com.trash.casefile.domain.ViolationWarningInformation;
-import com.trash.common.config.trashConfig;
-import com.trash.common.core.redis.RedisCache;
-import com.trash.common.core.domain.entity.SysUser;
-import com.trash.common.core.domain.model.LoginUser;
-import com.trash.framework.web.service.SysLoginService;
 import org.activiti.api.process.model.ProcessInstance;
 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
-import org.activiti.api.process.model.payloads.StartProcessPayload;
 import org.activiti.api.process.runtime.ProcessRuntime;
 import org.activiti.api.task.runtime.TaskRuntime;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.IdentityLink;
-import org.activiti.engine.task.IdentityLinkType;
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextImpl;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,11 +31,14 @@ import com.trash.business.service.IConstructionSignService;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.casefile.domain.ViolationCaseFile;
+import com.trash.casefile.domain.ViolationWarningInformation;
+import com.trash.common.core.domain.entity.SysUser;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.StringUtils;
-import com.trash.common.utils.uuid.UUID;
+import com.trash.framework.web.service.SysLoginService;
 import com.trash.system.service.ISysUserService;
 import com.trash.workflow.domain.Workflow;
 import com.trash.workflow.mapper.WorkflowMapper;
@@ -280,6 +270,46 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		return 0;
 	}
+	
+	@Override
+	@Transactional
+	public int createDropPointWorkFlow(Map<String,String> droppoint) { // 三查
+		ProcessInstance processInstance = null;
+		ActWorkflowFormData awf = null;
+		try {
+			String name = "投放点审批:" + droppoint.get("name");
+			
+			processInstance = processRuntime.start(ProcessPayloadBuilder.start()
+					.withProcessDefinitionKey("workflow_drop_point").withName(name)
+					.withBusinessKey("workflow_drop_point:" + droppoint.get("id")).build());
+			
+			PorcThreeStepTask(processInstance, droppoint.get("area"));
+
+			Workflow workflow = new Workflow();
+			workflow.setId("workflow_drop_point:" + droppoint.get("id"));
+			workflow.setTitle(name);
+			workflow.setReason(droppoint.get("name") + "审批流程");
+			workflow.setStartTime(sdf.format(new Date()));
+			workflow.setEndTime(sdf.format(new Date()));
+			workflow.setType("投放点审批");
+			workflow.setInstanceId(processInstance.getId());
+			workflow.setState("0");
+			workflow.setCreateTime(new Date());
+			
+
+			SysUser user = SecurityUtils.getLoginUser().getUser();
+			awf = insertAwf(user,workflow);
+
+			return workflowMapper.insertWorkflow(workflow);
+		} catch (Exception e) {
+			e.printStackTrace();
+			if(awf.getId() != null)
+				awfServer.deleteActWorkflowFormDataById(awf.getId());
+			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
+		}
+
+		return 0;
+	}
 	@Override
 	@Transactional
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.trash.business.mapper.GarMapper">
+	
+	<update id="updateDropPointById" parameterType="String">
+		update drop_point_info Set update_time = NOW(),status = #{status}
+		where id = #{id}
+	</update>
+</mapper> 
 \ No newline at end of file
@@ -133,6 +133,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="phone != null  and phone != ''"> and phone = #{phone}</if>
 			<if test="status != null"> and status = #{status}</if>
 			<if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+			<if test="checkStatus != null and checkStatus==1 "> and check_end_time is not null</if>
+			<if test="checkStatus != null and checkStatus==0 "> and check_end_time is null</if>
+			
 			<if test="workStartTime != null"> and self_check_time BETWEEN #{workStartTime} and
 				#{workEndTime}</if>
@@ -149,7 +152,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 					close=")">
 					#{id}
 				</foreach>
-			</if>
+			</if> 
 		</where>
 		ORDER BY create_time desc
 	</select>
@@ -26,9 +26,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="transportEndTime"    column="transport_end_time"    />
         <result property="routeName"    column="route_name"    />
         <result property="earthName"    column="earth_name"    />
-        <result property="routeInfo"    column="route_info"    />
+<!--         <result property="routeInfo"    column="route_info"    />
         <result property="earthList"    column="earth_list"    />
-        <result property="coord"    column="coord"    />
+        <result property="coord"    column="coord"    /> -->
     </resultMap>
     <sql id="selectTruckActivateVo">
@@ -161,9 +161,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="transportEndTime != null">transport_end_time,</if>
             <if test="routeName != null">route_name,</if>
             <if test="earthName != null">earth_name,</if>
-            <if test="routeInfo != null">route_info,</if>
+<!--             <if test="routeInfo != null">route_info,</if>
             <if test="earthList != null">earth_list,</if>
-            <if test="coord != null">coord,</if>            
+            <if test="coord != null">coord,</if>   -->          
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="company != null">#{company},</if>
@@ -187,9 +187,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="transportEndTime != null">#{transportEndTime},</if>
             <if test="routeName != null">#{routeName},</if>
             <if test="earthName != null">#{earthName},</if>
-            <if test="routeInfo != null">#{routeInfo},</if>
+<!--             <if test="routeInfo != null">#{routeInfo},</if>
             <if test="earthList != null">#{earthList},</if>
-            <if test="coord != null">#{coord},</if>
+            <if test="coord != null">#{coord},</if> -->
          </trim>
     </insert>
@@ -216,9 +216,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="transportEndTime != null">transport_end_time = #{transportEndTime},</if>
             <if test="routeName != null">route_name = #{routeName},</if>
             <if test="earthName != null">earth_name = #{earthName},</if>
-            <if test="routeInfo != null">route_info = #{routeInfo},</if>
+<!--             <if test="routeInfo != null">route_info = #{routeInfo},</if>
             <if test="earthList != null">earth_list = #{earthList},</if>
-            <if test="coord != null">coord = #{coord},</if>
+            <if test="coord != null">coord = #{coord},</if> -->
         </trim>
         where id = #{id}
     </update>