m

youxiw2000
1 parent f9ee74ad
Showing 24 changed files with 300 additions and 162 deletions
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-generator/src/main/java/com/trash/generator/service/GenTableServiceImpl.java
trash-quartz/pom.xml
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-system/src/main/java/com/trash/system/mapper/SysTempMapper.java
trash-system/src/main/resources/mapper/system/SysTempMapper.xml
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/EarthsitesCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
trash-workFlow/src/main/java/com/trash/business/mapper/SmsMapper.java
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/ThreestepHistoryServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/caseOffline/service/impl/CaseOfflineServiceImpl.java
@@ -32,6 +32,7 @@ import javax.net.ssl.X509TrustManager;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.trash.common.utils.spring.SpringUtils;
 import com.trash.common.utils.util.PostSms;
 import com.trash.common.utils.vo.mt.JsonSmsSend;
 import com.trash.common.utils.vo.mt.Mobile;
@@ -930,7 +931,7 @@ public class RemoteServerUtils {
 		Map map = new HashMap<>();
 		map.put("userName", "市渣土管理系统");
-		map.put("password", "u2nuQKePryLy6ccJywKCCQ==");
+		map.put("password", "mwcfVIiTfWttBJL02O+CGw==");
 		String param = JSON.toJSON(map).toString();
 		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
@@ -1246,7 +1247,7 @@ public class RemoteServerUtils {
 			okHttpClient = new OkHttpClient.Builder().connectTimeout(20, TimeUnit.SECONDS)
 					.writeTimeout(20, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build();
 		}
-
+		
 		Map map = new HashMap<>();
 		String param = JSON.toJSON(map).toString();
@@ -1280,6 +1281,8 @@ public class RemoteServerUtils {
 		return get(GETAUTH, null, token.replace("Bearer ", ""));
 	}
+
+	
 package com.trash.framework.web.service;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
-import org.apache.commons.collections4.iterators.ArrayListIterator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -23,7 +19,6 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.trash.common.config.trashConfig;
 import com.trash.common.constant.Constants;
 import com.trash.common.core.domain.entity.SysDept;
 import com.trash.common.core.domain.entity.SysRole;
@@ -36,9 +31,9 @@ import com.trash.common.exception.user.CaptchaExpireException;
 import com.trash.common.exception.user.UserPasswordNotMatchException;
 import com.trash.common.utils.MessageUtils;
 import com.trash.common.utils.RemoteServerUtils;
-import com.trash.common.utils.SecurityUtils;
 import com.trash.framework.manager.AsyncManager;
 import com.trash.framework.manager.factory.AsyncFactory;
+import com.trash.system.mapper.SysTempMapper;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -62,6 +57,9 @@ public class SysLoginService
     @Autowired
     UserDetailsService UserDetailsService;
+
+    @Autowired
+	SysTempMapper tempMapper;
     /**
      * 登录验证
@@ -180,7 +178,7 @@ public class SysLoginService
             	  for(Object obj:userJson.getJSONArray("userIdentityList")){
-              		JSONObject uId = (JSONObject)obj;
+            		  JSONObject uId = (JSONObject)obj;
               		poStrings.add(uId.getString("postType"));
@@ -202,22 +200,28 @@ public class SysLoginService
         }
-        
             JSONArray compnayList = redisCache.getCacheObject("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;
-       		 }
-       		 
+            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){
 package com.trash.garbage.service.impl;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.http.HttpUtil;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Resource;
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -25,6 +45,7 @@ import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.GlobalRedisProperties;
 import com.trash.garbage.global.GlobalStatus;
 import com.trash.garbage.global.ResultCode;
+import com.trash.garbage.mapper.GarUserMapper;
 import com.trash.garbage.pojo.domain.GarAddress;
 import com.trash.garbage.pojo.domain.GarUser;
 import com.trash.garbage.pojo.dto.AddressDto;
@@ -32,23 +53,11 @@ import com.trash.garbage.pojo.dto.LoginDto;
 import com.trash.garbage.pojo.vo.LoginVo;
 import com.trash.garbage.service.GarAddressService;
 import com.trash.garbage.service.GarUserService;
-import com.trash.garbage.mapper.GarUserMapper;
-import com.trash.garbage.utils.*;
-import org.apache.commons.codec.binary.Base64;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import com.trash.garbage.utils.JwtUtils;
+import com.trash.garbage.utils.ValidateCodeUtil;
-import javax.annotation.Resource;
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import javax.servlet.http.HttpServletRequest;
-import java.security.spec.AlgorithmParameterSpec;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.http.HttpUtil;
 /**
  * @author 20412
@@ -407,7 +407,7 @@ public class GenTableServiceImpl implements IGenTableService
      */
     public void setTableFromOptions(GenTable genTable)
     {
-        JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions());
+    	JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions());
         if (StringUtils.isNotNull(paramsObj))
         {
             String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
@@ -38,7 +38,10 @@
             <groupId>com.trash</groupId>
             <artifactId>trash-activiti</artifactId>
         </dependency>
-        
+         <dependency>
+            <groupId>com.trash</groupId>
+            <artifactId>trash-system</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.trash</groupId>
             <artifactId>trash-workflow</artifactId>
@@ -15,17 +15,13 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import javax.swing.Spring;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import com.trash.activiti.service.IActTaskService;
 import com.trash.business.domain.CompanyCredit;
@@ -48,13 +44,10 @@ import com.trash.casefile.kafka.Consumer;
 import com.trash.casefile.mapper.KafkaCompensationMapper;
 import com.trash.casefile.mapper.ReplyApprovalProcessMapper;
 import com.trash.casefile.mapper.ViolationCaseFileMapper;
-import com.trash.casefile.service.IViolationCaseFileService;
 import com.trash.common.config.trashConfig;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.LogUtils;
 import com.trash.common.utils.RemoteServerUtils;
-import com.trash.common.utils.SecurityUtils;
-import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.common.utils.spring.SpringUtils;
 import com.trash.common.utils.util.PostSms;
 import com.trash.common.utils.vo.mt.JsonSmsSend;
@@ -63,6 +56,7 @@ import com.trash.office.domain.LogisticsManagement;
 import com.trash.office.domain.UploadFile;
 import com.trash.office.mapper.LogisticsManagementMapper;
 import com.trash.office.mapper.UploadFileMapper;
+import com.trash.system.mapper.SysTempMapper;
 import com.trash.workflow.service.IWorkflowService;
 /**
@@ -84,7 +78,18 @@ public class DriverTask {
 	private RedisCache redisCache;
 	public void getUpCase() {
-		JSONArray array = RemoteServerUtils.getCaseList();
+		JSONArray array = null;
+		try{
+			array = RemoteServerUtils.getCaseList();
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		
+		if(array == null){
+			System.out.print("综管数据无法获取!");
+			return;
+		}
+		
 		Map map = new HashMap<>();
 		List<String> ids = new ArrayList<String>();
@@ -130,7 +135,20 @@ public class DriverTask {
 		getCaseStateIntoDB("/api/thirdApi/query/superviseList", "supUser", "supDesc", "supTime", "Q4");
-		JSONArray array = RemoteServerUtils.getUpCaseResult();
+		JSONArray array = null;
+		
+		try{
+			array = RemoteServerUtils.getUpCaseResult();
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		
+		if(array == null){
+			System.out.print("综管数据无法获取!");
+			return;
+		}
+		
+		
 		Map map = new HashMap<>();
 		List<String> ids = new ArrayList<String>();
@@ -938,7 +956,10 @@ public class DriverTask {
 		map.put("size", 99999);
 		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getCompanyList(map, trashConfig.getToken());
+		
 		if (jsonArray != null) {
+			SpringUtils.getBean(SysTempMapper.class).delLocalData("companyList");
+			SpringUtils.getBean(SysTempMapper.class).setLocalData("companyList",jsonArray.toString());
 			redisCache.setCacheObject("companyList", jsonArray, 1,TimeUnit.DAYS);
 		}
 	}
@@ -954,6 +975,9 @@ public class DriverTask {
 		map.put("auditStatus", 1);
 		JSONArray jsonArray = RemoteServerUtils.getContractList(map, trashConfig.getToken());
 		if (jsonArray != null) {
+
+			SpringUtils.getBean(SysTempMapper.class).delLocalData("contractList");
+			SpringUtils.getBean(SysTempMapper.class).setLocalData("contractList",jsonArray.toString());
 			redisCache.setCacheObject("contractList", jsonArray, 1,TimeUnit.DAYS);
 		}
 	}
@@ -970,11 +994,15 @@ public class DriverTask {
 		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getConstructionList(map, trashConfig.getToken());
 		if (jsonArray != null) {
+			SpringUtils.getBean(SysTempMapper.class).delLocalData("constructionList");
+			SpringUtils.getBean(SysTempMapper.class).setLocalData("constructionList",jsonArray.toString());
 			redisCache.setCacheObject("constructionList", jsonArray, 1,TimeUnit.DAYS);
 		}
 		jsonArray = RemoteServerUtils.getConstructionLedgerList(map, trashConfig.getToken());
 		if (jsonArray != null) {
+			SpringUtils.getBean(SysTempMapper.class).delLocalData("constructionLedgerList");
+			SpringUtils.getBean(SysTempMapper.class).setLocalData("constructionLedgerList",jsonArray.toString());
 			redisCache.setCacheObject("constructionLedgerList", jsonArray, 1,TimeUnit.DAYS);
 		}
 	}
@@ -991,6 +1019,8 @@ public class DriverTask {
 		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getEarthSitesList(map, trashConfig.getToken());
 		if (jsonArray != null) {
+			SpringUtils.getBean(SysTempMapper.class).delLocalData("earthSitesList");
+			SpringUtils.getBean(SysTempMapper.class).setLocalData("earthSitesList",jsonArray.toString());
 			redisCache.setCacheObject("earthSitesList", jsonArray, 1,TimeUnit.DAYS);
 		}
 	}
@@ -1009,6 +1039,8 @@ public class DriverTask {
 		JSONArray jsonArray = RemoteServerUtils.getTruckList(map, trashConfig.getToken());
 		if (jsonArray != null) {
+			SpringUtils.getBean(SysTempMapper.class).delLocalData("truckList");
+			SpringUtils.getBean(SysTempMapper.class).setLocalData("truckList",jsonArray.toString());
 			redisCache.setCacheObject("truckList", jsonArray, 1,TimeUnit.DAYS);
 		}
 	}
@@ -1025,6 +1057,8 @@ public class DriverTask {
 		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getAreas(trashConfig.getToken());
 		if (jsonArray != null) {
+			SpringUtils.getBean(SysTempMapper.class).delLocalData("areaList");
+			SpringUtils.getBean(SysTempMapper.class).setLocalData("areaList",jsonArray.toString());
 			redisCache.setCacheObject("areaList", jsonArray, 1,TimeUnit.DAYS);
 		}
 	}
+package com.trash.system.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface SysTempMapper {
+
+		public String getPhoneNumber(@Param("type")String  type ,@Param("checkpoint") String checkpoint);
+		
+
+		public String getLocalData(@Param("type")String  type);
+		
+
+		public String delLocalData(@Param("type")String  type);
+
+		public String setLocalData(@Param("type")String  type,@Param("data") String json);
+		
+
+}
+<?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.system.mapper.SysTempMapper">
+	
+	<select id="getPhoneNumber"  parameterType="String" resultType="java.lang.String">
+	   	select number from sms where checkpoint = #{checkpoint} and type = #{type}
+	</select>
+	
+	
+	<select id="getLocalData"  parameterType="String" resultType="java.lang.String">
+	   	select json from temp where type = #{type}
+	</select>
+	
+	<select id="setLocalData"  parameterType="String" resultType="java.lang.String">
+	   	insert INTO temp(type,json) values(#{type},#{data});
+	</select>
+	
+	<select id="delLocalData"  parameterType="String" resultType="java.lang.String">
+	   	delete from temp where type = #{type}
+	</select>
+	
+	
+</mapper> 
 \ No newline at end of file
@@ -5,7 +5,6 @@ import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,9 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.trash.business.domain.CompanyCredit;
 import com.trash.business.domain.ConstructionCredit;
 import com.trash.business.service.IConstructionCreditService;
 import com.trash.common.annotation.Log;
@@ -25,7 +21,6 @@ import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.page.TableDataInfo;
-import com.trash.common.core.redis.RedisCache;
 import com.trash.common.enums.BusinessType;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.poi.ExcelUtil;
@@ -4,30 +4,26 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.trash.business.domain.ConstructionCredit;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import com.trash.business.domain.EarthsitesCredit;
+import com.trash.business.service.IEarthsitesCreditService;
 import com.trash.common.annotation.Log;
 import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.core.page.TableDataInfo;
 import com.trash.common.enums.BusinessType;
-import com.trash.business.domain.EarthsitesCredit;
-import com.trash.business.service.IEarthsitesCreditService;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.poi.ExcelUtil;
-import com.trash.common.core.page.TableDataInfo;
-import com.trash.common.core.redis.RedisCache;
 /**
  * 处理场所失信Controller
@@ -3,6 +3,7 @@ package com.trash.business.controller;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -13,42 +14,41 @@ import java.util.concurrent.TimeUnit;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.Base64Utils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Base64Utils;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import com.trash.common.annotation.Log;
-import com.trash.common.annotation.RepeatSubmit;
-import com.trash.common.config.trashConfig;
-import com.trash.common.core.controller.BaseController;
-import com.trash.common.core.domain.AjaxResult;
-import com.trash.common.enums.BusinessType;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.domain.SupervisionThreestepWithWorkArea;
 import com.trash.business.domain.dayWork;
+import com.trash.business.mapper.SupervisionThreestepMapper;
 import com.trash.business.service.ISupervisionThreestepService;
-import com.trash.common.utils.RemoteServerUtils;
-import com.trash.common.utils.SecurityUtils;
-import com.trash.common.utils.StringUtils;
-import com.trash.common.utils.file.FileUtils;
-import com.trash.common.utils.poi.ExcelUtil;
+import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
+import com.trash.common.config.trashConfig;
+import com.trash.common.core.controller.BaseController;
+import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.page.PageDomain;
 import com.trash.common.core.page.TableDataInfo;
 import com.trash.common.core.page.TableSupport;
 import com.trash.common.core.redis.RedisCache;
+import com.trash.common.enums.BusinessType;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.file.FileUtils;
+import com.trash.common.utils.poi.ExcelUtil;
+import com.trash.common.utils.spring.SpringUtils;
+import com.trash.system.mapper.SysTempMapper;
 /**
  * 三查机制Controller
@@ -63,6 +63,8 @@ public class SupervisionThreestepController extends BaseController {
 	private ISupervisionThreestepService supervisionThreestepService;
 	@Autowired
+	private SupervisionThreestepMapper mapper;
+	@Autowired
 	RedisCache redisCache;
 	/**
@@ -87,8 +89,38 @@ public class SupervisionThreestepController extends BaseController {
 	@PostMapping("/getByObjects")
 	public AjaxResult getLists(@RequestBody SupervisionThreestep supervisionThreestep) {
 		AjaxResult ajaxResult = AjaxResult.success();
+		
+		if (supervisionThreestep.getWorkStartTime() == null) {
+			String start, end;
+
+			SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			Date date = new Date();
+
+			if (new Date().getHours() < 8) {
+				end = yearFomat.format(date);
+				date.setDate(date.getDate() - 1);
+				start = yearFomat.format(date);
+			} else {
+				start = yearFomat.format(date);
+				date.setDate(date.getDate() + 1);
+				end = yearFomat.format(date);
+			}
+
+			end += " 8:00:00";
+			start += " 8:00:00";
+
+			try {
+				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
+				supervisionThreestep.setWorkEndTime(dateTime.parse(end));
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		
 		try {
-			ajaxResult.put("result", supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep));
+			ajaxResult.put("result", mapper.selectSupervisionThreestepList(supervisionThreestep));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -119,7 +151,7 @@ public class SupervisionThreestepController extends BaseController {
 		JSONArray areas = redisCache.getCacheObject("areas");
 		if (areas == null) {
-			areas = RemoteServerUtils.getAreas();
+			areas = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("areas"));
 			redisCache.setCacheObject("areas", areas);
 		}
@@ -249,10 +281,7 @@ public class SupervisionThreestepController extends BaseController {
 		JSONArray constructionList = redisCache.getCacheObject("constructionLedgerList");
 		if (constructionList == null) {
-			Map<String, Object> map = new HashMap<>();
-			map.put("size", 99999);
-			map.put("page", 1);
-			constructionList = RemoteServerUtils.getConstructionLedgerList(map);
+			constructionList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionLedgerList"));
 			if (constructionList != null) {
 				redisCache.setCacheObject("constructionLedgerList", constructionList, 60, TimeUnit.MINUTES);
 			}
 package com.trash.business.controller;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.apache.commons.collections4.map.HashedMap;
-import org.apache.tomcat.jni.Mmap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.trash.common.annotation.Log;
-import com.trash.common.annotation.RepeatSubmit;
-import com.trash.common.core.controller.BaseController;
-import com.trash.common.core.domain.AjaxResult;
-import com.trash.common.enums.BusinessType;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.trash.business.domain.SupervisionThreestep;
+
 import com.trash.business.domain.TruckActivate;
 import com.trash.business.domain.TruckActivateInfo;
-import com.trash.business.mapper.SupervisionThreestepMapper;
 import com.trash.business.mapper.TruckActivateMapper;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.business.service.ITruckActivateService;
-import com.trash.common.utils.RemoteServerUtils;
-import com.trash.common.utils.SecurityUtils;
-import com.trash.common.utils.poi.ExcelUtil;
+import com.trash.common.annotation.Log;
+import com.trash.common.annotation.RepeatSubmit;
+import com.trash.common.core.controller.BaseController;
+import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.page.TableDataInfo;
 import com.trash.common.core.redis.RedisCache;
+import com.trash.common.enums.BusinessType;
+import com.trash.common.utils.poi.ExcelUtil;
 /**
  * 车辆激活Controller
@@ -8,14 +8,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
-/**
- * 汇讯数码科技(深圳)有限公司
- * 创建日期:2020/10/23-15:47
- * 版本   开发者     日期
- * 1.0    Danny    2020/10/23
- */
 public interface SmsMapper {
 		public String getPhoneNumber(@Param("type")String  type ,@Param("checkpoint") String checkpoint);
+		
+
+		public String getLocalData(@Param("type")String  type);
 }
@@ -24,7 +24,6 @@ import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.util.PostSms;
 import com.trash.common.utils.vo.mt.JsonSmsSend;
 import com.trash.common.utils.vo.mt.Mobile;
-import com.trash.common.utils.vo.mt.SendSms;
 /**
  * 企业失信Service业务层处理
@@ -12,7 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.trash.business.domain.CompanyCredit;
 import com.trash.business.domain.ConstructionCredit;
 import com.trash.business.mapper.ConstructionCreditMapper;
 import com.trash.business.mapper.SmsMapper;
@@ -31,6 +31,8 @@ import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.file.FileUploadUtils;
+import com.trash.common.utils.spring.SpringUtils;
+import com.trash.system.mapper.SysTempMapper;
 import com.trash.workflow.service.IWorkflowService;
 import net.sf.jsqlparser.expression.DateTimeLiteralExpression.DateTime;
@@ -129,14 +131,9 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
 		List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
-
-
 		JSONArray constructionList = redisCache.getCacheObject("constructionLedgerList");
 		if (constructionList == null) {
-			Map<String, Object> map = new HashMap<>();
-			map.put("size", 99999);
-			map.put("page", 1);
-			constructionList = RemoteServerUtils.getConstructionLedgerList(map);
+			constructionList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionLedgerList"));
 			if (constructionList != null) {
 				redisCache.setCacheObject("constructionLedgerList", constructionList, 1, TimeUnit.DAYS);
 			}
@@ -182,10 +179,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			JSONArray jsonArray = redis.getCacheObject("earthSitesList");
 			if(jsonArray == null){
-				Map<String, Object> map = new HashMap<>();
-				map.put("size", 99999);
-				map.put("page", 1);
-				jsonArray = RemoteServerUtils.getEarthSitesList(map);
+				jsonArray = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
 				if (jsonArray != null) {
 					redisCache.setCacheObject("earthSitesList", jsonArray, 1,TimeUnit.DAYS);
 				}
@@ -320,23 +314,17 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		JSONArray contracts = redisCache.getCacheObject("contractList");
 		if (contracts == null) {
-			Map param = new HashMap<>();
-			param.put("page", 1);
-			param.put("size", 99999);
-			param.put("contractStatus", 1);
-			param.put("auditStatus", 1);
-
-			contracts = RemoteServerUtils.getContractList(param);
-			redisCache.setCacheObject("contractList", contracts);
+			contracts = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("contractList"));
+			if(contracts != null){
+				redisCache.setCacheObject("contractList", contracts);
+			}
 		}
 		JSONArray constructionList = redisCache.getCacheObject("constructionLedgerList");
 		if (constructionList == null) {
-			Map<String, Object> map = new HashMap<>();
-			map.put("size", 99999);
-			map.put("page", 1);
-			constructionList = RemoteServerUtils.getConstructionLedgerList(map);
+
+			constructionList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionLedgerList"));
 			if (constructionList != null) {
 				redisCache.setCacheObject("constructionLedgerList", constructionList, 1, TimeUnit.DAYS);
 			}
@@ -349,7 +337,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		String areaCode = "";
 		if (areas == null) {
-			areas = RemoteServerUtils.getAreas();
+			areas = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("areas"));
 			redisCache.setCacheObject("areas", areas);
 		}
@@ -715,10 +703,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			JSONArray array = redisCache.getCacheObject("constructionList");
 			if(array == null){
-				Map<String, Object> map = new HashMap<>();
-				map.put("size", 99999);
-				map.put("page", 1);
-				array = RemoteServerUtils.getConstructionList(map);
+				array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
 				if(array != null){
 					redisCache.setCacheObject("constructionList", array,1,TimeUnit.DAYS);
 				}
@@ -1135,14 +1120,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		JSONArray contracts = redisCache.getCacheObject("contractList");
 		if (contracts == null) {
-			Map param = new HashMap<>();
-
-			param.put("page", 1);
-			param.put("size", 99999);
-			param.put("contractStatus", 1);
-			param.put("auditStatus", 1);
-
-			contracts = RemoteServerUtils.getContractList(param, token);
+			contracts = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("contractList"));
 			redisCache.setCacheObject("contractList", contracts);
 		}
@@ -24,6 +24,8 @@ 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.spring.SpringUtils;
+import com.trash.system.mapper.SysTempMapper;
 /**
  * 开停工Service业务层处理
@@ -70,10 +72,8 @@ public class ThreestepHistoryServiceImpl implements IThreestepHistoryService
 		JSONArray constructionList = redisCache.getCacheObject("constructionLedgerList");
 		List<String> ids = redisCache.getCacheObject("constructionIds");
 		if (constructionList == null || ids == null) {
-			Map<String, Object> map = new HashMap<>();
-			map.put("size", 99999);
-			map.put("page", 1);
-			constructionList = RemoteServerUtils.getConstructionLedgerList(map);
+			
+			constructionList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionLedgerList"));
 			if (constructionList != null) {
 				ids = new ArrayList();
@@ -13,6 +13,8 @@ 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.spring.SpringUtils;
+import com.trash.system.mapper.SysTempMapper;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,6 +90,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 				if(areas.size() > 0) {
 					JSONArray array = redis.getCacheObject("companyList");
+					if(array == null)
+						array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
 					if(array != null) {
 						for(Object obj:array) {
 							JSONObject json = (JSONObject)obj;
@@ -106,7 +110,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 					if (companys.size() > 0) {
 						JSONArray jsonArray = redis.getCacheObject("truckList");
-
+						if(jsonArray == null)
+							jsonArray = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("truckList"));
 						for (Object obj : jsonArray) {
 							JSONObject json = (JSONObject) obj;
 							if (companys.indexOf(json.getString("companyID")) > -1) {
@@ -448,10 +453,8 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
 		JSONArray contracts = redis.getCacheObject("contractList");
 		if (contracts == null) {
-			param.put("page", 1);
-			param.put("size", 99999);
-			contracts = RemoteServerUtils.getContractList(param);
+			contracts = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("contractList"));
 			redis.setCacheObject("contractList", contracts);
 		}
@@ -20,9 +20,11 @@ import com.trash.business.service.ITruckCreditService;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.spring.SpringUtils;
 import com.trash.common.utils.util.PostSms;
 import com.trash.common.utils.vo.mt.JsonSmsSend;
 import com.trash.common.utils.vo.mt.Mobile;
+import com.trash.system.mapper.SysTempMapper;
 /**
  * 车辆失信Service业务层处理
@@ -69,6 +71,8 @@ public class TruckCreditServiceImpl implements ITruckCreditService
 			if(areas.size() > 0) {
 				JSONArray array = redisCache.getCacheObject("companyList");
+				if(array == null)
+					array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
 				if(array != null) {
 					for(Object obj:array) {
 						JSONObject json = (JSONObject)obj;
@@ -90,7 +94,8 @@ public class TruckCreditServiceImpl implements ITruckCreditService
 				if(companys.size() > 0){
 					JSONArray jsonArray = redisCache.getCacheObject("truckList");
-					
+					if(jsonArray == null)
+						jsonArray = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("truckList"));
 					for(Object obj:jsonArray){
 						JSONObject json = (JSONObject) obj;
 						if(companys.indexOf(json.getString("companyID")) > -1){
@@ -141,7 +146,9 @@ public class TruckCreditServiceImpl implements ITruckCreditService
 	        JSONArray array = redisCache.getCacheObject("companyList");
-			
+
+			if(array == null)
+				array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
 			String number = null;
 			for(Object obj:array){
 				JSONObject json = (JSONObject)obj;
@@ -258,6 +265,9 @@ public class TruckCreditServiceImpl implements ITruckCreditService
 			if(areas.size() > 0) {
 				JSONArray array = redisCache.getCacheObject("companyList");
+
+				if(array == null)
+					array = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
 				if(array != null) {
 					for(Object obj:array) {
 						JSONObject json = (JSONObject)obj;
@@ -13,6 +13,7 @@ import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.spring.SpringUtils;
+import com.trash.system.mapper.SysTempMapper;
 import com.trash.system.service.ISysDictTypeService;
 import com.trash.workflow.service.IWorkflowService;
@@ -92,6 +93,15 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
 		JSONArray earthList = redisCache.getCacheObject("earthSitesList");
 		JSONArray construList = redisCache.getCacheObject("constructionList");
+
+		if(earthList == null){
+			earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
+		}
+
+		if(construList == null){
+			construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
+		}
+		
 		if(caseOffline.status1 != null){
 			if(caseOffline.status1.equals("0")){
 				caseOffline.status1 = " and advice1 is null";
@@ -16,6 +16,8 @@ import org.springframework.web.multipart.MultipartFile;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
 import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.domain.vo.ViolationCaseFileVo;
 import com.trash.casefile.mapper.ViolationCaseFileMapper;
@@ -31,6 +33,7 @@ import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.common.utils.spring.SpringUtils;
 import com.trash.office.domain.UploadFile;
 import com.trash.office.mapper.UploadFileMapper;
+import com.trash.system.mapper.SysTempMapper;
 import com.trash.system.service.ISysDictTypeService;
 import com.trash.workflow.service.IWorkflowService;
@@ -175,6 +178,17 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService {
 		JSONArray earthList = redisCache.getCacheObject("earthSitesList");
 		JSONArray construList = redisCache.getCacheObject("constructionList");
 		JSONArray companyList = redisCache.getCacheObject("companyList");
+		
+		
+		if(construList == null){
+			construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
+		}
+		if(earthList == null){
+			earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
+		}
+		if(companyList == null){
+			companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
+		}
 		for (Object obj : companyList) {
 			JSONObject jsonObject = (JSONObject) obj;
@@ -264,6 +278,9 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService {
 		// 判断公司是否为空，如果不为空则查询公司简称
 		if (StringUtils.isNotEmpty(violationCaseFile.getCompanyName())) {
 			JSONArray companyList = redisCache.getCacheObject("companyList");
+			if(companyList==null){
+				companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
+			}
 			for (Object o : companyList) {
 				JSONObject jo = (JSONObject) o;
 				if (violationCaseFile.getCompanyName().equals(jo.getString("name"))) {
@@ -29,6 +29,7 @@ import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.common.utils.spring.SpringUtils;
 import com.trash.office.domain.UploadFile;
 import com.trash.office.mapper.UploadFileMapper;
+import com.trash.system.mapper.SysTempMapper;
 import com.trash.system.service.ISysDictTypeService;
 import com.trash.workflow.service.IWorkflowService;
@@ -120,8 +121,18 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 		JSONArray earthList = redisCache.getCacheObject("earthSitesList");
 		JSONArray construList = redisCache.getCacheObject("constructionList");
-
 		JSONArray companyList = redisCache.getCacheObject("companyList");
+		
+		if(construList == null){
+			construList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("constructionList"));
+		}
+		if(earthList == null){
+			earthList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("earthSitesList"));
+		}
+		if(companyList == null){
+			companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
+		}
+		
 		List<String> companyAreas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
 		List<String> companyIds = SecurityUtils.getLoginUser().getUser().getCompanyIds();
@@ -224,6 +235,10 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 		// 判断公司是否为空，如果不为空则查询公司简称
 		if (StringUtils.isNotEmpty(violationWarningInformation.getCompanyName())) {
 			JSONArray companyList = redisCache.getCacheObject("companyList");
+
+			if(companyList == null){
+				companyList = JSONArray.parseArray(SpringUtils.getBean(SysTempMapper.class).getLocalData("companyList"));
+			}
 			for (Object o : companyList) {
 				JSONObject jo = (JSONObject) o;
 				if (violationWarningInformation.getCompanyName().equals(jo.getString("name"))) {
@@ -286,8 +286,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			  if(areas == null){
 			            areas = RemoteServerUtils.getAreas();
 				        redisCache.setCacheObject("areas", areas);
-			    	}		
-					
+			    	}	
 				for(Object obj : areas){
 					JSONObject jsonObject = (JSONObject) obj;
@@ -8,4 +8,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 	   	select number from sms where checkpoint = #{checkpoint} and type = #{type}
 	</select>
+	
+	<select id="getLocalData"  parameterType="String" resultType="java.lang.String">
+	   	select json from temp where type = #{type}
+	</select>
+	
 </mapper> 
 \ No newline at end of file