Browse Source

Merge remote-tracking branch 'origin/test' into dev

Conflicts:
	src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
anderx 7 years ago
parent
commit
368efa8136

+ 13 - 0
src/main/java/com/goafanti/admin/bo/AdminListBo.java

@@ -20,6 +20,11 @@ public class AdminListBo {
 	 * 用户名
 	 */
 	private String	name;
+	
+	/**
+	 * 密码
+	 */
+	private String password;
 
 	/**
 	 * 邮箱
@@ -251,4 +256,12 @@ public class AdminListBo {
 		this.lastLoginTime = lastLoginTime;
 	}
 
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
 }

+ 1 - 1
src/main/java/com/goafanti/admin/bo/InputAdmin.java

@@ -11,7 +11,7 @@ public class InputAdmin {
 	@Size(min = 0, max = 15, message = "{" + ErrorConstants.MOBILE_SIZE_ERROR + "}")
 	private String	mobile;
 
-	@Size(min = 0, max = 6, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	name;
 
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

+ 4 - 4
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -335,10 +335,10 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/adminInfo", method = RequestMethod.GET)
 	public Result adminInfo() {
 		Result res = new Result();
-		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "超级管理员"));
-			return res;
-		}
+//		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+//			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "超级管理员"));
+//			return res;
+//		}
 		res.setData(adminService.selectByPrimaryKey(TokenManager.getAdminId()));
 		return res;
 	}

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminSystemController.java

@@ -62,10 +62,10 @@ public class AdminSystemController extends BaseApiController {
 	@RequestMapping(value = "/updateAdminInfo", method = RequestMethod.POST)
 	public Result updateAdminInfo(@Valid InputAdmin admin, String pwd, BindingResult bindingResult) {
 		Result res = new Result();
-		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+		/*if (TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "超级管理员"));
 			return res;
-		}
+		}*/
 
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),

+ 2 - 0
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -66,4 +66,6 @@ public interface AdminService {
 	List<AdminListBo> selectDepartmentStaff(String departmentId,String name);
 
 	int updateLockAdmin();
+
+	List<Admin> getListDefaultPassword(String id);
 }

+ 18 - 2
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -18,6 +18,7 @@ import com.goafanti.admin.service.AdminService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.dao.UserRoleMapper;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.utils.LoggerUtils;
@@ -40,7 +41,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	private PasswordUtil					passwordUtil;
 	@Override
 	public List<Admin> selectAllAdmin() {
-		return adminMapper.selectAllAdmin();
+		return adminMapper.selectAllAdmin(null);
 	}
 
 	@Override
@@ -241,7 +242,7 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	@Override
 	public int updateLockAdmin() {
 		int count=0;
-		List<Admin> list=adminMapper.selectAllAdmin();//获取所有用户
+		List<Admin> list=adminMapper.selectAllAdmin(null);//获取所有用户
 		List<List<Admin>>aList=groupList(list);//拆分成多个
 		String lockIds = "";
 		for(List<Admin> al:aList){
@@ -303,6 +304,21 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	        System.out.println(listGroup);
 	}*/
 
+	@Override
+	public List<Admin> getListDefaultPassword(String depId) {
+		List<Admin> list=adminMapper.selectAllAdmin(depId);
+		List<Admin> list2=new ArrayList<>();
+		for (Admin a : list) {
+			String pwd=a.getPassword();
+			a.setPassword("123456");
+			String pwd2=passwordUtil.getEncryptPwd(a);
+			if (pwd.equals(pwd2)) {
+				list2.add(a);
+			}
+		}
+		return list2;
+	}
+
 	
 
 }

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -57,7 +57,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 	
 	@Override
 	public List<Admin> selectAllAdmin() {
-		return adminMapper.selectAllAdmin();
+		return adminMapper.selectAllAdmin(null);
 	}
 
 	@Override

+ 10 - 1
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.AttachmentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
@@ -68,6 +69,8 @@ public class PublicController extends BaseController {
 
 	@Resource
 	private AttachmentService			aftFileService;
+	@Resource
+	private AdminService	adminService;
 	
 	@Resource
 	private FieldGlossoryService			fieldGlossoryService;
@@ -519,6 +522,12 @@ public class PublicController extends BaseController {
 		res.setData(districtGlossoryService.getProvince());
 		return res;
 	}
-	
+	@RequestMapping(value = "/listDefaultPassword" , method = RequestMethod.GET)
+	@ResponseBody
+	public Result listDefaultPassword(String depId){
+		Result res=new Result();
+		res.setData(adminService.getListDefaultPassword(depId));
+		return res;
+	}
 	
 }

+ 3 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -169,10 +169,12 @@ public interface AdminMapper {
 	
 	Admin selectAdminName(@Param("name")String name);
 
-	List<Admin> selectAllAdmin();
+	List<Admin> selectAllAdmin(@Param("depId")String depId);
 
 	int updateLockIds(@Param("lockIds")String lockIds);
 
+	List<AdminListBo> getListDefaultPassword(String id);
+
 	
 
 }

+ 4 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -513,6 +513,9 @@
     <include refid="Base_Column_List" />
     from admin 
     where status !='锁定' 
+     <if test="depId != null">
+       and department_id = #{depId,jdbcType=VARCHAR}
+     </if>
   </select>
   
   <select id="selectByMobile" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -930,7 +933,7 @@
   </select>
   
   <select id="selectDepartmentStaff" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
-	select a.id ,a.name,a.department_id,b.name 
+	select a.id ,a.name,a.password,a.department_id,b.name 
 		from admin a left join department b
 		on a.department_id= b.id
 		where 1=1

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PermissionMapper.xml

@@ -273,7 +273,7 @@
   </select>
   <select id="selectIdByName" resultType="java.lang.String">
 		select
-		name
+		id
 		from permission
 		where
 		name=#{name,jdbcType=VARCHAR}

+ 1 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1970,6 +1970,7 @@ inner join(
 		select count(*) from `user`
 		where aid= #{aid,jdbcType=VARCHAR}
 		and source=2
+		and share_type=0
 		and to_days(transfer_time)=to_days(now())
 	</select>
 </mapper>

+ 2 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1,5 +1,6 @@
 package com.goafanti.order.service.impl;
 
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -141,4 +142,5 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderMapper> implements
 		
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
+
 }

+ 2 - 2
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -174,8 +174,8 @@ public class NewPermissionApiController extends BaseApiController {
 			
 		}
 		//*********权限编号判断**************
-		//record.setSuperId(permissionMapper.selectIdByName(record.getSuperId()));
-		String superName=permissionMapper.selectIdByName(record.getSuperId());//上级名称
+		String superName=record.getSuperId();//上级名称
+		record.setSuperId(permissionMapper.selectIdByName(record.getSuperId()));
 		String autNo=permissionMapper.selectAutNoByName(record.getSuperId());
 		int Count=permissionMapper.selectAutNoCount(record.getSuperId());
 		if((Count+1)>99){

+ 3 - 3
src/main/resources/props/config_test.properties

@@ -66,9 +66,9 @@ accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
 aesSecretKey=aft1234567890123
 
-mobileCodeTemplate=SMS_37845022
-patentTemplate=SMS_72005286
-mobileRemindCodeTemplate=SMS_137421952
+mobileCodeTemplate=WSMS_37845022
+patentTemplate=WSMS_72005286
+mobileRemindCodeTemplate=WSMS_137421952
 
 easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA