444

saicLogistics/src/main/java/com/fuzamei/entity/OperationHistoryAdmin.java

@@ -6,14 +6,14 @@ public class OperationHistoryAdmin {
 	private Integer operationTypeId;	//操作类型id
 	private String operationTypeName;	//操作类型名
 	private String beOperatedName;		//被操作人名
+	private String beOperatedUsername;	//被操作人账号名
 	private Long operationTime;			//操作时间
 	private String hash;				//操作hash
-	private String sign;				//签名
-	public String getSign() {
-		return sign;
+	public String getBeOperatedUsername() {
+		return beOperatedUsername;
 	}
-	public void setSign(String sign) {
-		this.sign = sign;
+	public void setBeOperatedUsername(String beOperatedUsername) {
+		this.beOperatedUsername = beOperatedUsername;
 	}
 	public Integer getId() {
 		return id;

saicLogistics/src/main/java/com/fuzamei/mapper/OperationHistoryMapper.xml

@@ -83,7 +83,8 @@
 			ot.operation_type_name,
 			oha.hash,
 			u1.person_name as operator_name,
-			u2.person_name as be_operated_name			
+			u2.person_name as be_operated_name,
+			u2.username as be_operated_username		
 		from 
 			operation_history_admin oha
 		left join 
@@ -116,7 +117,7 @@
 		select
 			count(*)
 		from 
-			operation_history
+			operation_history_admin
 		<where>
 			operator_id=#{userId}
 			<if test="operationTypeId!=null">

saicLogistics/src/main/java/com/fuzamei/mapper/UserMapper.xml

@@ -20,7 +20,7 @@
 	<select id="findUserByuserIdandusername" parameterType="com.fuzamei.entity.User" resultType = "com.fuzamei.entity.User">
 		select * from users where user_id != #{userId} and  username = #{username}
 	</select>
-	<!--根据用户id  查询角色名称  --><!-- ？？？？？？？？？？待待？？？ -->
+	<!--根据用户id  查询角色名称  --><!-- ？？？？？？？？？？待待删？？？ -->
 	<select id="selectRoleNameByuserId">
 		select r.role_name from   users y left  join  role r on r.role_id=y.role_id  where user_id=1003
 	</select>
@@ -78,7 +78,7 @@
 	
 	<!--根据用户id修改角色，账号，密码，名称  -->
 	<update id="updateAccountByUserId" parameterType="com.fuzamei.entity.User">
-		update users set role_id = #{roleId}, username=#{username} , password=#{password} , person_name=#{personName},update_time=#{updateTime} where user_id=#{userId}
+		update users set  username=#{username} , password=#{password} , person_name=#{personName},update_time=#{updateTime} where user_id=#{userId}
 	</update>
 	
 	<!--参数类型为1001,1002,1003等， 批量删除 -->

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/PlannerServiceImpl.java

@@ -7,17 +7,21 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.constant.OperationType;
 import com.fuzamei.constant.Roles;
 import com.fuzamei.entity.PlannerSupplier;
 import com.fuzamei.entity.User;
 import com.fuzamei.mapperInterface.PlannerMapper;
 import com.fuzamei.mapperInterface.ReceivingClerkMapper;
+import com.fuzamei.mapperInterface.UserMapper;
 import com.fuzamei.service.PlannerService;
 @Service
 public class PlannerServiceImpl implements  PlannerService{
   @Autowired
   private PlannerMapper  plannerMapper;
-
+  @Autowired
+  private UserMapper userMapper;
 	@Override
 	public List<User> queryPlanner(Map<String, Object> map) {
 		 return plannerMapper.queryPlanner(map);
@@ -49,7 +53,28 @@ public class PlannerServiceImpl implements  PlannerService{
 			plannerMapper.insertAgainSupplier(pp);
 		}
 		
-		//plannerMapper.insertAgainSupplier(pp);
+		
+		
+		//下面待改动   XXX
+		//下面往【操作记录】表插入数据
+		Long currentTime = System.currentTimeMillis();//得到当前系统时间
+		User user=new  User();
+		String sign = user.getSign();
+		@SuppressWarnings("unchecked")
+		Map<String,Object> map = JSON.parseObject(sign, Map.class);
+		String hash = (String) map.get("sid");
+		user.setOperatorId(user.getUserId());//操作人id
+		user.setOperationTypeId(OperationType.EDIT);//操作类型 (编辑修改)
+		user.setBeOperatedId(user.getUserId());//被操作人账号id  TODO？？？？？？？？？？？？？？待
+		user.setOperationTime(currentTime);//操作时间
+		user.setHash(hash);//操作hash
+		userMapper.insertOperationHistory(user);//插入到操作记录表去
+		
+		/*boolean flag = blockChainUtil.sendBlockChain(user.getSign());//发送签名直接转发到区块链
+		if(!flag) {
+			 throw new RuntimeException("区块链操作失败2");	
+		}*/
+
 	}
 
 	

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/UserServiceImpl.java

@@ -67,9 +67,9 @@ public class UserServiceImpl  implements  UserService {
 		@SuppressWarnings("unchecked")
 		Map<String,Object> map = JSON.parseObject(sign, Map.class);
 		String hash = (String) map.get("sid");
-		user.setUserId(user.getUserId());//操作人
+		user.setUserId(user.getUserId());//操作人（管理员）
 		user.setOperationTypeId(OperationType.ADD);//操作类型 (添加)
-		user.setUserIdb(user.getUserId());//被操作人账号  TODO？？？？？？？？？？？？？？待
+		user.setUserIdb(user.getUserId());//被操作人账号  ？？？？？？？？？？？？？？待
 		user.setOperationTime(currentTime);//操作时间
 		user.setHash(hash);//操作hash
 		userMapper.insertOperationHistory(user);
@@ -94,18 +94,18 @@ public class UserServiceImpl  implements  UserService {
 		userMapper.updateAccountByUserId(user);
 		
 		
-		
-		//往【操作记录】表插入数据
+		//下面往【操作记录】表插入一条数据
 		String sign = user.getSign();
 		@SuppressWarnings("unchecked")
 		Map<String,Object> map = JSON.parseObject(sign, Map.class);
 		String hash = (String) map.get("sid");
-		user.setOperatorId(user.getUserId());//操作人id
-		user.setOperationTypeId(OperationType.EDIT);//操作类型 (编辑修改)
-		user.setBeOperatedId(user.getUserId());//被操作人账号id  TODO？？？？？？？？？？？？？？待
+		user.setUserId(user.getUserId());//操作人（管理员）
+		user.setOperationTypeId(OperationType.EDIT);//操作类型 (编辑)
+		user.setUserIdb(user.getUserId());//被操作人账号  ？？？？？？？？？？？？？？待
 		user.setOperationTime(currentTime);//操作时间
 		user.setHash(hash);//操作hash
 		userMapper.insertOperationHistory(user);
+		userMapper.insertOperationHistory(user);//插入到操作记录表去
 		
 		/*boolean flag = blockChainUtil.sendBlockChain(user.getSign());//发送签名直接转发到区块链
 		if(!flag) {

saicLogistics/src/main/java/com/fuzamei/web/OperationHistoryAction.java

@@ -110,7 +110,7 @@ public class OperationHistoryAction {
 	/**
 	 * 
 	* @Title: showAllOperationTypeOfUser
-	* @Description: TODO(这里用一句话描述这个方法的作用)
+	* @Description: TODO(给普通用户显示操作类型id和操作类型名称)
 	* @param @param params
 	* @param @return    设定文件
 	* @return Map<String,Object>    返回类型
@@ -119,7 +119,7 @@ public class OperationHistoryAction {
 	* @throws
 	 */
 	@RequestMapping(value="/showAllOperationTypeOfUser",method=RequestMethod.POST)
-	public Map<String, Object> showAllOperationTypeOfUser(@RequestBody Params params){
+	public Map<String, Object> showAllOperationTypeOfUser(){
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.PLANNER,Role.SUPPLIER,Role.CARRIER,Role.STOCKER);
@@ -133,7 +133,7 @@ public class OperationHistoryAction {
 	/**
 	 * 
 	* @Title: showAllOperationTypeOfAdmin
-	* @Description: TODO(这里用一句话描述这个方法的作用)
+	* @Description: TODO(给管理员显示操作类型id和操作类型名称)
 	* @param @param params
 	* @param @return    设定文件
 	* @return Map<String,Object>    返回类型
@@ -142,7 +142,7 @@ public class OperationHistoryAction {
 	* @throws
 	 */
 	@RequestMapping(value="/showAllOperationTypeOfAdmin",method=RequestMethod.POST)
-	public Map<String, Object> showAllOperationTypeOfAdmin(@RequestBody Params params){
+	public Map<String, Object> showAllOperationTypeOfAdmin(){
 		try {
 			String userId = req.getHeader("Authorization").split("&")[1];
 			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(userId), Role.ADMIN);

saicLogistics/src/main/java/com/fuzamei/web/PlannerAction.java

@@ -125,17 +125,6 @@ public class PlannerAction {
 		    	plannerService.insertAgainSupplier(pp);
 		    }
 			 
-			//String  supplierId = ValidationUtil.checkNullAndAssignString(pp.getSupplierId());//得到挪动得供应商id  要以逗号隔开传过来
-			/*String[] str=supplierId.split(",");
-			for (int i = 0; i < str.length; i++) {
-				//System.out.println(str.length);
-				//System.out.println(str[i]);
-				pp.setSupplierId(str[i]);
-				plannerService.insertAgainSupplier(pp);
-			}*/
-			
-			
-			
 			return  JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS,pp);//待
 		} catch (Exception e) {
 			return JSONUtil.getJsonMap(500, false, HintMSG.OPERATION_FAIL+":"+e.getMessage(), null);

saicLogistics/src/main/java/com/fuzamei/web/UserAction.java

@@ -127,9 +127,9 @@ public class UserAction {
 	public Map<String, Object> updateAccountByUserId(@RequestBody User user) {
 		try {
 			 Integer user_id = ValidationUtil.checkAndAssignInt(req.getHeader("Authorization").split("&")[1]);
-			 
+			 user.setUserId(user_id);
 			 userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(user_id), Roles.ADMIN);
-			 ValidationUtil.checkBlankIntegerAndAssignNullIfIsBlank(user.getRoleId());//校验角色
+			 //ValidationUtil.checkBlankIntegerAndAssignNullIfIsBlank(user.getRoleId());//校验角色      角色不能修改就暂注释了    不用校验了
 			 ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getUsername());//校验账号
 			 ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPassword());//校验密码
 			 ValidationUtil.checkBlankStringAndAssignEmptyIfIsBlank(user.getPersonName());//校验名称
@@ -141,6 +141,7 @@ public class UserAction {
 				return JSONUtil.getJsonMap(500, false, "修改失败,该账号已存在了", null);
 			}
 		} catch (Exception e) {
+			e.printStackTrace();
 			return JSONUtil.getJsonMap(500, false, "修改失败", null);
 		}
 

saicLogistics/src/main/resources/spring-mvc.xml

@@ -37,7 +37,6 @@
 	<!-- 对token拦截验证 (为方便测试,测试环境给注释掉) -->
   <!--    	<mvc:interceptors>
 		<mvc:interceptor>
-			拦截路径
 			<mvc:mapping path="/**" />
 			<mvc:exclude-mapping path="/login"/>
 			<bean class="com.fuzamei.interceptor.TokenInterceptor" />

saicLogistics/src/test/java/com/fuzamei/web/OperationHistoryActionTest.java

@@ -8,10 +8,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSON;
 import com.fuzamei.baseTest.BaseJunit4Test;
 import com.fuzamei.entity.Params;
+import com.fuzamei.service.OperationHistoryService;
+import com.fuzamei.util.PageDTO;
 
 public class OperationHistoryActionTest extends BaseJunit4Test{
 	@Autowired
 	private OperationHistoryAction operationHistoryAction;
+
+	@Autowired
+	private OperationHistoryService operationHistoryService;
 	
 	/*@Test
 	public void test01(){
@@ -24,4 +29,19 @@ public class OperationHistoryActionTest extends BaseJunit4Test{
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}*/
+	
+	@Test
+	public void test02(){
+		Params params=new Params();
+		params.setUserId(9001);
+		params.setStartPage(0);
+		params.setPage(1);
+		params.setRowNum(10);
+		params.setStartTime(null);
+		params.setEndTime(null);
+		params.setOperationTypeId(null);
+		PageDTO result = operationHistoryService.queryOperationHistory(params);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
 }