1.

王通
1 parent c2d594c8
Showing 8 changed files with 154 additions and 298 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/calc/CalcMixController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/maintenance_plan/MtPlanDataLoadThread.java
src/main/java/com/bsth/entity/sys/SecurityUser.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/service/calc/CalcMixService.java
src/main/java/com/bsth/service/calc/impl/CalcMixServiceImpl.java
@@ -87,8 +87,8 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     SafeDrivDataLoadThread safeDrivDataLoadThread;
-    @Autowired
-    MtPlanDataLoadThread mtPlanDataLoadThread;
+//    @Autowired
+//    MtPlanDataLoadThread mtPlanDataLoadThread;
     @Autowired
     FixedCheckStationCodeThread fixedCheckStationCodeThread;
@@ -190,7 +190,7 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
-        sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
@@ -235,7 +235,7 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
-        sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         //dayOfSchedule.dataRecovery();
@@ -281,7 +281,7 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
-        sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(mtPlanDataLoadThread, 180, 10, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
-package com.bsth.controller.calc;
-
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bsth.entity.calc.CalcInvestigateMonth;
-import com.bsth.service.calc.CalcMixService;
-
-@RestController
-@RequestMapping("calc_mix")
-public class CalcMixController {
-	
-	@Autowired
-	CalcMixService service;
-
-	@RequestMapping(value="/calcjsyspy")
-	public List<Map<String, Object>> calcjsyspy(@RequestParam Map<String, Object> map){
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString().trim();
-		}
-		String startDate="";
-		if(map.get("startDate")!=null){
-			startDate=map.get("startDate").toString().trim();
-		}
-		String endDate="";
-		if(map.get("endDate")!=null){
-			endDate=map.get("endDate").toString().trim();
-		}
-		String empnames="";
-		if(map.get("empnames")!=null){
-			empnames=map.get("empnames").toString().trim();
-		}
-		String cont="";
-		if(map.get("cont")!=null){
-			cont=map.get("cont").toString().trim();
-		}
-		String gsdmManth="";
-		if(map.get("gsdmManth")!=null){
-			gsdmManth=map.get("gsdmManth").toString().trim();
-		}
-		String fgsdmManth="";
-		if(map.get("fgsdmManth")!=null){
-			fgsdmManth=map.get("fgsdmManth").toString().trim();
-		}
-		return service.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth);
-	}
-
-	@RequestMapping(value = "/singledatatj", method = RequestMethod.GET)
-	public List<Map<String, Object>> singledatatj(@RequestParam Map<String, Object> map) {
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString().trim();
-		}
-		String startDate="";
-		if(map.get("startDate")!=null){
-			startDate=map.get("startDate").toString().trim();
-		}
-		String endDate="";
-		if(map.get("endDate")!=null){
-			endDate=map.get("endDate").toString().trim();
-		}
-		String tjtype="";
-		if(map.get("tjtype")!=null){
-			tjtype=map.get("tjtype").toString().trim();
-		}
-		String cont="";
-		if(map.get("cont")!=null){
-			cont=map.get("cont").toString().trim();
-		}
-		String gsdmSing="";
-		if(map.get("gsdmSing")!=null){
-			gsdmSing=map.get("gsdmSing").toString().trim();
-		}
-		String fgsdmSing="";
-		if(map.get("fgsdmSing")!=null){
-			fgsdmSing=map.get("fgsdmSing").toString().trim();
-		}
-		String sfdc="";
-		if(map.get("sfdc")!=null){
-			sfdc=map.get("sfdc").toString().trim();
-		}
-		return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc);
-	}
-
-	//浦东公交线路调查表
-	@RequestMapping(value = "/calcInvestigateMonth", method = RequestMethod.GET)
-	public List<CalcInvestigateMonth> calcInvestigateMonth(@RequestParam Map<String, Object> map) {
-		String gsbm="";
-		if(map.get("gsbm")!=null){
-			gsbm=map.get("gsbm").toString().trim();
-		}
-		String fgsbm="";
-		if(map.get("fgsbm")!=null){
-			fgsbm=map.get("fgsbm").toString().trim();
-		}
-		String month="";
-		if(map.get("month")!=null){
-			month=map.get("month").toString().trim();
-		}
-		String line="";
-		if(map.get("line")!=null){
-			line=map.get("line").toString().trim();
-		}
-		String xlName="";
-		if(map.get("xlName")!=null){
-			xlName=map.get("xlName").toString().trim();
-		}
-		String nature="";
-		if(map.get("nature")!=null){
-			nature=map.get("nature").toString().trim();
-		}
-		String type="";
-		if(map.get("type")!=null){
-			type=map.get("type").toString().trim();
-		}
-		return service.calcInvestigateMonth(gsbm, fgsbm, month, line, xlName, nature, type);
-	}
-	
-}
+package com.bsth.controller.calc;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.bsth.entity.calc.CalcInvestigateMonth;
+import com.bsth.service.calc.CalcMixService;
+
+@RestController
+@RequestMapping("calc_mix")
+public class CalcMixController {
+	
+	@Autowired
+	CalcMixService service;
+
+	@RequestMapping(value="/calcjsyspy")
+	public List<Map<String, Object>> calcjsyspy(@RequestParam Map<String, Object> map){
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String empnames="";
+		if(map.get("empnames")!=null){
+			empnames=map.get("empnames").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String gsdmManth="";
+		if(map.get("gsdmManth")!=null){
+			gsdmManth=map.get("gsdmManth").toString().trim();
+		}
+		String fgsdmManth="";
+		if(map.get("fgsdmManth")!=null){
+			fgsdmManth=map.get("fgsdmManth").toString().trim();
+		}
+		return service.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth);
+	}
+
+	@RequestMapping(value = "/singledatatj", method = RequestMethod.GET)
+	public List<Map<String, Object>> singledatatj(@RequestParam Map<String, Object> map) {
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String tjtype="";
+		if(map.get("tjtype")!=null){
+			tjtype=map.get("tjtype").toString().trim();
+		}
+		String cont="";
+		if(map.get("cont")!=null){
+			cont=map.get("cont").toString().trim();
+		}
+		String gsdmSing="";
+		if(map.get("gsdmSing")!=null){
+			gsdmSing=map.get("gsdmSing").toString().trim();
+		}
+		String fgsdmSing="";
+		if(map.get("fgsdmSing")!=null){
+			fgsdmSing=map.get("fgsdmSing").toString().trim();
+		}
+		String sfdc="";
+		if(map.get("sfdc")!=null){
+			sfdc=map.get("sfdc").toString().trim();
+		}
+		return service.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc);
+	}
+
+	//陆家嘴旅游线路调查表
+	@RequestMapping(value = "/calcInvestigateMonth", method = RequestMethod.GET)
+	public List<CalcInvestigateMonth> calcInvestigateMonth(@RequestParam Map<String, Object> map) {
+		String gsbm="";
+		if(map.get("gsbm")!=null){
+			gsbm=map.get("gsbm").toString().trim();
+		}
+		String fgsbm="";
+		if(map.get("fgsbm")!=null){
+			fgsbm=map.get("fgsbm").toString().trim();
+		}
+		String month="";
+		if(map.get("month")!=null){
+			month=map.get("month").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String xlName="";
+		if(map.get("xlName")!=null){
+			xlName=map.get("xlName").toString().trim();
+		}
+		String nature="";
+		if(map.get("nature")!=null){
+			nature=map.get("nature").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		return service.calcInvestigateMonth(gsbm, fgsbm, month, line, xlName, nature, type);
+	}
+	
+}
@@ -192,25 +192,6 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
                 return rs;
             }
-            // 检验密码有效期
-            Date lastPwdDate = user.getLastPwdDate();
-            if (lastPwdDate != null) {
-                if (user.getPwdExpiredDate().before(new Date())) {
-                    return put(rs, "msg", "密码已过期，不能登录，请联系管理员");
-                }
-
-                Integer validPeriod = user.getPwdValidPeriod();
-                if (validPeriod == null) {
-                    validPeriod = 30;
-                }
-                Period p = new Period(new DateTime(lastPwdDate), new DateTime(new Date()), PeriodType.days());
-                if (p.getDays() > validPeriod) {
-                    return put(rs, "msg", "天没有修改密码，不能登录，请联系管理员");
-                }
-            } else {
-                return put(rs, "msg", "从未更新过密码，不能登录，请联系管理员");
-            }
-
             // 弱密码检查
             Matcher matcher = pattern.matcher(password);
             if (!matcher.matches()) {
@@ -489,66 +470,4 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
         return result;
     }
-
-    /**
-     * 弱密码
-     * @return
-     */
-    @RequestMapping(value = "/isRealName", method = RequestMethod.POST)
-    public Map<String, Object> hasJobCode() {
-        Map<String, Object> result = new HashMap<>();
-        SysUser user = SecurityUtils.getCurrentUser();
-        result.put("status", ResponseCode.SUCCESS);
-        result.put("data", (StringUtils.isBlank(user.getJobCode()) || StringUtils.isBlank(user.getRealName())) ? 0 : 1);
-
-        return result;
-    }
-
-    // 重置密码
-    @RequestMapping(value = "/realName", method = RequestMethod.POST)
-    public Map<String, Object> setJobCode(@RequestParam String jobCode, @RequestParam String realName) throws Exception {
-        Map<String, Object> data = new HashMap<>(), result = new HashMap<>();
-        result.put("status", ResponseCode.ERROR);
-        result.put("data", "设置成功");
-
-        if (jobCode == null || realName == null) {
-            result.put("data", "你跳过验证了是吧");
-            return result;
-        }
-        data.put("account", jobCode);
-        data.put("pageSize", 2);
-        data.put("pageNum", 1);
-        StringBuilder stringBuilder = HttpClientUtils.post("https://112.64.45.51/businessCenter/userInfo/queryUserList", mapper.writeValueAsString(data));
-        if (stringBuilder == null) {
-            result.put("data", "统一平台验证失败1");
-            return result;
-        } else {
-            List<Map<String, Object>> maps = mapper.readValue(mapper.writeValueAsString(((Map) mapper.readValue(stringBuilder.toString(), Map.class).get("data")).get("list")), mapper.getTypeFactory().constructParametricType(List.class, Map.class));
-            if (maps.size() == 0) {
-                result.put("data", "统一平台验证失败2");
-                return result;
-            } else {
-                boolean isAuth = false;
-                for (Map<String, Object> map : maps) {
-                    if (realName.equals(map.get("name"))) {
-                        isAuth = true;
-                        break;
-                    }
-                }
-                if (!isAuth) {
-                    result.put("data", "统一平台验证失败3");
-                    return result;
-                }
-            }
-        }
-
-        SysUser user = SecurityUtils.getCurrentUser();
-        sysUserService.realName(jobCode, realName, user.getId());
-        user.setJobCode(jobCode);
-        user.setRealName(realName);
-
-        result.put("status", ResponseCode.SUCCESS);
-        return result;
-    }
-
 }
@@ -29,7 +29,7 @@ import java.util.Map;
  * 维修保养计划
  * @author Hill
  */
-@Component
+//@Component
 public class MtPlanDataLoadThread extends Thread implements InitializingBean {
     private Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -21,8 +21,6 @@ public class SecurityUser extends SysUser implements UserDetails {
 			this.setAgencies(user.getAgencies());
 			this.setRoles(user.getRoles());
 			this.setEnabled(user.isEnabled());
-			this.setJobCode(user.getJobCode());
-			this.setRealName(user.getRealName());
 		}
 	}
@@ -42,12 +42,6 @@ public class SysUser implements Serializable {
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date lastLoginDate;
-    /** 最近密码更新时间 */
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date lastPwdDate;
-    /** 密码有效期 */
-    private Integer pwdValidPeriod;
-
 	private String agencies;
 	private boolean enabled;
@@ -55,16 +49,6 @@ public class SysUser implements Serializable {
 	@ManyToMany(fetch = FetchType.EAGER)
 	private Set<Role> roles = new LinkedHashSet<>();
-	private String jobCode;
-
-	private String realName;
-
-	/**
-	 * 密码过期时间
-	 */
-	@Transient
-	private Date pwdExpiredDate;
-
 	public Integer getId() {
 		return id;
 	}
@@ -145,22 +129,6 @@ public class SysUser implements Serializable {
 		this.roles = roles;
 	}
-	public String getJobCode() {
-		return jobCode;
-	}
-
-	public void setJobCode(String jobCode) {
-		this.jobCode = jobCode;
-	}
-
-	public String getRealName() {
-		return realName;
-	}
-
-	public void setRealName(String realName) {
-		this.realName = realName;
-	}
-
 	public Set<String> getLinks() {
 		Set<String> links = new HashSet<>();
 		if (links.size() == 0) {
@@ -181,33 +149,4 @@ public class SysUser implements Serializable {
 		return links;
 	}
-
-    public Date getLastPwdDate() {
-        return lastPwdDate;
-    }
-
-    public void setLastPwdDate(Date lastPwdDate) {
-        this.lastPwdDate = lastPwdDate;
-    }
-
-    public Integer getPwdValidPeriod() {
-        return pwdValidPeriod;
-    }
-
-    public void setPwdValidPeriod(Integer pwdValidPeriod) {
-        this.pwdValidPeriod = pwdValidPeriod;
-    }
-
-	public Date getPwdExpiredDate() {
-		DateTime dateTime = new DateTime(getLastPwdDate());
-		if (pwdValidPeriod != null) {
-			dateTime = dateTime.plusDays(pwdValidPeriod);
-		}
-
-		return dateTime.toDate();
-	}
-
-	public void setPwdExpiredDate(Date pwdExpiredDate) {
-		this.pwdExpiredDate = pwdExpiredDate;
-	}
 }
-package com.bsth.service.calc;
-
-import java.util.List;
-import java.util.Map;
-
-import com.bsth.entity.calc.CalcInvestigateMonth;
-
-/**
- * Created by 19/02/28.
- */
-public interface CalcMixService {
-	
-	List<Map<String, Object>> calcjsyspy(String line, String startDate, String endDate, String cont, String empnames, String gsdmManth, String fgsdmManth);
-	
-	List<Map<String, Object>> singledatatj(String line, String startDate, String endDate, String tjtype, String cont, String gsdmSing, String fgsdmSing, String sfdc);
-	
-	//浦东公交线路调查表
-	List<CalcInvestigateMonth> calcInvestigateMonth(String gsbm, String fgsbm, String month, String line, String xlName, String nature, String type);
-	
-}
+package com.bsth.service.calc;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.calc.CalcInvestigateMonth;
+
+/**
+ * Created by 19/02/28.
+ */
+public interface CalcMixService {
+	
+	List<Map<String, Object>> calcjsyspy(String line, String startDate, String endDate, String cont, String empnames, String gsdmManth, String fgsdmManth);
+	
+	List<Map<String, Object>> singledatatj(String line, String startDate, String endDate, String tjtype, String cont, String gsdmSing, String fgsdmSing, String sfdc);
+	
+	//陆家嘴旅游线路调查表
+	List<CalcInvestigateMonth> calcInvestigateMonth(String gsbm, String fgsbm, String month, String line, String xlName, String nature, String type);
+	
+}
@@ -353,7 +353,7 @@ public class CalcMixServiceImpl implements CalcMixService {
 		return resList;
 	}
-	//浦东公交线路调查表
+	//陆家嘴旅游线路调查表
 	@Override
 	public List<CalcInvestigateMonth> calcInvestigateMonth(String gsbm, String fgsbm, String month, String line,
 			String xlName, String nature, String type) {
@@ -445,7 +445,7 @@ public class CalcMixServiceImpl implements CalcMixService {
 				listI.add(mapList.iterator());
 				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 				ee.excelReplace(listI, new Object[]{m}, path + "mould/calcInvestigateMonth.xls",
-						path + "export/" + "浦东公交线路调查表"+month+".xls");
+						path + "export/" + "陆家嘴旅游线路调查表"+month+".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();