m

youxiw2000
1 parent 670f5354
Showing 6 changed files with 103 additions and 14 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUser.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/LoginDto.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-ui/src/views/gar/user/index.vue
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
@@ -70,6 +70,7 @@ public class GarUser implements Serializable {
      * 备注
      */
     private String garRemark;
+    private String password;
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
@@ -208,5 +209,15 @@ public class GarUser implements Serializable {
 	public static long getSerialversionuid() {
 		return serialVersionUID;
 	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	
+	
 }
 \ No newline at end of file
@@ -17,6 +17,21 @@ public class LoginDto {
     private Integer loginType;
     private String encryptedData;
     private String iv;
+    private String password;
+    private int signin;
+    
+	public int getSignin() {
+		return signin;
+	}
+	public void setSignin(int signin) {
+		this.signin = signin;
+	}
+	public String getPassword() {
+		return password;
+	}
+	public void setPassword(String password) {
+		this.password = password;
+	}
 	public String getTel() {
 		return tel;
 	}
@@ -25,6 +25,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -112,9 +113,18 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Override
     public LoginVo login(LoginDto loginDto) {
         LoginVo vo = new LoginVo();
+        
+        if(loginDto.getSignin() == 1){
+        	 QueryWrapper<GarUser> qw = new QueryWrapper<>();
+             GarUser nUser = null;
+	         qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
+	         nUser = this.getOne(qw);
+        	if (nUser != null) {
+                throw new UsernameNotFoundException("当前用户已存在!");
+            }
+        }
         vo.setLoginPhone(loginDto.getTel());
-
         if (Objects.isNull(loginDto)) {
             throw new UsernameNotFoundException("当前用户不存在!");
         }
@@ -130,22 +140,35 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
                 throw new BizException(ResultCode.CODE_500, "解密失败");
             }
         }
-        // 验证码验证
-        String code = redisCache.getCacheObject(GlobalRedisProperties.REDIS_USER_CODE.getValue() + loginDto.getTel());
-        if (loginDto.getCode() == null || !loginDto.getCode().equals(code)) {
-            throw new BizException(ResultCode.CODE_400, "验证码错误！！");
-        }
+        
         // 查询用户
         QueryWrapper<GarUser> qw = new QueryWrapper<>();
+        GarUser nUser = null;
         qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
-        GarUser nUser = this.getOne(qw);
+        if(loginDto.getCode() == null && loginDto.getPassword() != null){
+        	qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
+        	qw.lambda().eq(GarUser::getPassword, new BCryptPasswordEncoder().encode(loginDto.getPassword()));
+        }else{
+        	// 验证码验证
+            String code = redisCache.getCacheObject(GlobalRedisProperties.REDIS_USER_CODE.getValue() + loginDto.getTel());
+            if (loginDto.getCode() == null || !loginDto.getCode().equals(code)) {
+                throw new BizException(ResultCode.CODE_400, "验证码错误！！");
+            }
+            nUser = this.getOne(qw);
+        }
+
         if (Objects.isNull(nUser)) {
             // 不存在就创建用户
             nUser = new GarUser();
             nUser.setGarUserTel(loginDto.getTel());
             nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
+            
+            if(loginDto.getSignin() == 1){
+            	nUser.setGarUserName(loginDto.getNickname());
+            	nUser.setPassword(new BCryptPasswordEncoder().encode(loginDto.getPassword()));
+            }
+            
             nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
-            this.save(nUser);
         }
         //是否是投放点用户
         List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoListByPhone(loginDto.getTel());
@@ -185,6 +208,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             ruleVo = new LoginVo.RuleVo();
             ruleVo.setTransportCompanyName(detail.getCompanyName());
             ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
+            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
+            nUser.setGarUserName(detail.getName());
             vo.getRuleVos().add(ruleVo);
             vo.setName(detail.getName());
         }
@@ -195,6 +220,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             ruleVo = new LoginVo.RuleVo();
             ruleVo.setTransportCompanyName(detail.getCompanyName());
             ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
+            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
+            nUser.setGarUserName(detail.getCompanyName());
             vo.getRuleVos().add(ruleVo);
         }
@@ -204,6 +231,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             ruleVo = new LoginVo.RuleVo();
             ruleVo.setTransportCompanyName(detail.getName());
             ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription());
+            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription());
+            nUser.setGarUserName(detail.getName());
             vo.getRuleVos().add(ruleVo);
         }
@@ -213,6 +242,9 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
                 vo.setTestUser(true);
             }
         }
+        
+        
+        this.saveOrUpdate(nUser);
         return vo;
     }
@@ -30,7 +30,7 @@
     <el-table v-loading="loading" :data="GarUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="手机号" align="center" prop="garUserTel" />
-<!--      <el-table-column label="用户名" align="center" prop="garUserName" />-->
+      <el-table-column label="用户名" align="center" prop="garUserName" />
       <el-table-column label="用户类型" align="center" prop="garUserType" />
       <el-table-column label="创建时间" align="center" prop="garCreateTime" width="180">
         <template slot-scope="scope">
@@ -12,6 +12,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.expression.spel.ast.NullLiteral;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -166,8 +167,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 				JSONObject json = (JSONObject) obj;
 				if (cArea.indexOf(json.getString("areaCode")) > -1) {
 					if(companyName != null){
-						if(json.getString("transportCompany").equals(companyName) 
-								|| json.getString("unitCompanyName").contains(companyName)){
+						if((json.get("transportCompany") != null && json.getString("transportCompany").equals(companyName)) 
+								|| (json.get("unitCompanyName") != null && json.getString("unitCompanyName").contains(companyName))){
 							ids.add(json.getString("id"));
 						}
 					}else{
@@ -1014,8 +1015,6 @@ 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) {
@@ -430,8 +430,21 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 			return null;
 		}
+	        
 		List<ViolationWarningInformation> list = violationWarningInformationMapper.selectViolationWarningInformationListLessTime(violationWarningInformation);
+
+		 List<SysDictData> caseType =  SpringUtils.getBean(ISysDictTypeService.class).selectDictDataByType("vio_warning");
+		for(SysDictData type:caseType){
+            for(ViolationWarningInformation file:list){
+                if(type.getDictValue().equals(file.getViolationType())){
+                    
+                	file.setViolationType(type.getDictLabel());
+                }
+            }
+        }
+		
+		
 		Map<String, List> data = new HashMap<>();
@@ -533,6 +546,15 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 		list = violationWarningInformationMapper.selectViolationWarningInformationListLessTime(violationWarningInformation);
+		for(SysDictData type:caseType){
+           for(ViolationWarningInformation file:list){
+               if(type.getDictValue().equals(file.getViolationType())){
+                   
+               	file.setViolationType(type.getDictLabel());
+               }
+           }
+       }
+		
 		List<Map> years = new ArrayList<Map>();
 		List<Map> months = new ArrayList<Map>();
@@ -580,7 +602,17 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
 			violationWarningInformation.setCreateTime(now);
 			list = violationWarningInformationMapper.selectViolationWarningInformationListLessTime(violationWarningInformation);
-
+			
+				for(SysDictData type:caseType){
+		            for(ViolationWarningInformation file:list){
+		                if(type.getDictValue().equals(file.getViolationType())){
+		                    
+		                	file.setViolationType(type.getDictLabel());
+		                }
+		            }
+		        }
+				
+			
 			for(int i = 0;i<list.size();i++){
 				int count = 0;
 				int typeCount = 0;