new

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

@@ -0,0 +1,46 @@
+package com.fuzamei.entity;
+/**
+ * 
+ * @className:OperationHistory[操作历史实体类]
+ * @author:ylx--->[yanglingxiao2009@163.com]
+ * @date:2018年1月26日下午6:40:33
+ * @version v1.0
+ */
+public class OperationHistory {
+	private Integer orderId;				//订单id
+	private Integer operationTypeId;		//操作类型id
+	private String operationTypeName;		//操作类型名
+	private String operatorName;			//操作人名
+	private Long operationTime;				//操作时间
+	public Integer getOrderId() {
+		return orderId;
+	}
+	public void setOrderId(Integer orderId) {
+		this.orderId = orderId;
+	}
+	public Integer getOperationTypeId() {
+		return operationTypeId;
+	}
+	public void setOperationTypeId(Integer operationTypeId) {
+		this.operationTypeId = operationTypeId;
+	}
+	public String getOperationTypeName() {
+		return operationTypeName;
+	}
+	public void setOperationTypeName(String operationTypeName) {
+		this.operationTypeName = operationTypeName;
+	}
+	public String getOperatorName() {
+		return operatorName;
+	}
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+	public Long getOperationTime() {
+		return operationTime;
+	}
+	public void setOperationTime(Long operationTime) {
+		this.operationTime = operationTime;
+	}
+	
+}

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

@@ -15,4 +15,41 @@
 				   #{operationTime}) 
 	</insert>
 	
+	<select id="queryOperationHistory" parameterType="Param" resultType="OperationHistory">
+		select
+			oh.order_id,
+			ot.operation_type_name,
+			u.person_name as operatorName,
+			oh.operation_time
+		from 
+			operation_history oh
+		left join 
+			operation_type ot
+		on 
+			oh.operation_type_id=ot.operation_type_id
+		left join 
+			users u
+		on 
+			oh.operator_id=u.user_id
+		<where>
+			<if test="startTime!=null and endTime!=null">
+				oh.operation_time between #{startTime} and #{endTime}
+			</if>
+		</where>
+		order by oh.operation_time desc
+		limit #{startPage},#{rowNum}
+	</select>
+	
+	<select id="findQueryCount" parameterType="Param" resultType="int">
+		select
+			count(*)
+		from 
+			operation_history
+		<where>
+			<if test="startTime!=null and endTime!=null">
+				operation_time between #{startTime} and #{endTime}
+			</if>
+		</where>
+	</select>
+	
 </mapper>

saicLogistics/src/main/java/com/fuzamei/mapperInterface/OperationHistoryMapper.java

@@ -1,9 +1,17 @@
 package com.fuzamei.mapperInterface;
 
+import java.util.List;
+
+import com.fuzamei.entity.OperationHistory;
 import com.fuzamei.entity.Param;
+import com.fuzamei.entity.SendOrder;
 
 public interface OperationHistoryMapper {
 
 	void addToHistory(Param param);
 
+	List<OperationHistory> queryOperationHistory(Param param);
+
+	int findQueryCount(Param param);
+
 }

saicLogistics/src/main/java/com/fuzamei/service/OperationHistoryService.java

@@ -0,0 +1,10 @@
+package com.fuzamei.service;
+
+import com.fuzamei.entity.Param;
+import com.fuzamei.util.PageDTO;
+
+public interface OperationHistoryService {
+
+	PageDTO queryOperationHistory(Param param);
+
+}

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

@@ -0,0 +1,31 @@
+package com.fuzamei.service.serviceImpl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.fuzamei.entity.OperationHistory;
+import com.fuzamei.entity.Param;
+import com.fuzamei.entity.SendOrder;
+import com.fuzamei.mapperInterface.OperationHistoryMapper;
+import com.fuzamei.service.OperationHistoryService;
+import com.fuzamei.util.PageDTO;
+@Service
+public class OperationHistoryServiceImpl implements OperationHistoryService {
+	
+	@Autowired
+	private OperationHistoryMapper operationHistoryMapper;
+
+	@Override
+	public PageDTO queryOperationHistory(Param param) {
+		PageDTO pageDto=new PageDTO();
+		List<OperationHistory> orderList = operationHistoryMapper.queryOperationHistory(param);
+		int count = operationHistoryMapper.findQueryCount(param);
+		pageDto.setRows(orderList);
+		pageDto.setTotal(count);
+		return pageDto;
+	}
+	
+	
+}

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

@@ -0,0 +1,68 @@
+package com.fuzamei.web;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fuzamei.constant.HintMSG;
+import com.fuzamei.constant.Role;
+import com.fuzamei.entity.Param;
+import com.fuzamei.service.OperationHistoryService;
+import com.fuzamei.service.UserAuthoricationService;
+import com.fuzamei.util.JSONUtil;
+import com.fuzamei.util.PageDTO;
+import com.fuzamei.util.ReadConfUtil;
+import com.fuzamei.util.ValidationUtil;
+
+@RestController
+@RequestMapping(value="/operationHistory")
+public class OperationHistoryAction {
+
+	@Autowired
+	private OperationHistoryService operationHistoryService;
+	
+	@Autowired
+	private UserAuthoricationService userAuthoricationService;
+	
+	private static final Integer ROWNUM=Integer.parseInt(ReadConfUtil.getProperty("rowNum"));
+	
+	/**
+	 * 
+	* @Title: queryOperationHistory
+	* @Description: TODO(管理员查看操作历史)
+	{
+		"userId":"",
+		"page":"1",
+		"startTime":"",
+		"endTime":""
+	}
+	* @param @return    设定文件
+	* @return Map<String,Object>    返回类型
+	* @author ylx
+	* @date 2018年1月26日 下午6:34:22
+	* @throws
+	 */
+	@RequestMapping(value="/queryOperationHistory",method=RequestMethod.POST)
+	public Map<String, Object> queryOperationHistory(@RequestBody Param param){
+		try {
+			userAuthoricationService.queryUserAuthority(ValidationUtil.checkAndAssignInt(param.getUserId()), Role.ADMIN);
+			int page = ValidationUtil.checkMinAndAssignInt(param.getPage(), 1);
+			Long startTime=ValidationUtil.checkAndAssignDefaultLong(param.getStartTime(), 0L);
+			Long endTime=ValidationUtil.checkAndAssignDefaultLong(param.getEndTime(), Long.MAX_VALUE);
+			param.setStartTime(startTime);
+			if(startTime<=endTime) param.setEndTime(endTime);
+			else param.setEndTime(Long.MAX_VALUE);
+			param.setStartPage((page - 1) * ROWNUM);
+			param.setRowNum(ROWNUM);
+			PageDTO pageDto = operationHistoryService.queryOperationHistory(param);
+			return JSONUtil.getJsonMap(200, true, HintMSG.QUERY_SUCCESS, pageDto);
+		} catch (Exception e) {
+			return JSONUtil.getJsonMap(500, false, HintMSG.QUERY_FAIL+":"+e.getMessage(), null);
+		}
+	}
+}

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

@@ -56,7 +56,7 @@ public class CargoConsignActionTest extends BaseJunit4Test{
 	public void test04(){
 		Param param=new Param();
 		param.setUserId(9007);
-		param.setOrderId(100000001);
+		param.setOrderId(100000004);
 		param.setCarNo("浙A9819Y");
 		Map<String, Object> result = cargoConsignAction.doCarry(param);
 		String jsonString = JSON.toJSONString(result,true);

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

@@ -34,7 +34,7 @@ public class CargoDeliverActionTest extends BaseJunit4Test{
 	public void test02(){
 		Param param=new Param();
 		param.setUserId(9007);
-		param.setOrderId(100000001);
+		param.setOrderId(100000003);
 		Map<String, Object> result = cargoDeliverAction.orderTracking(param);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);

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

@@ -0,0 +1,27 @@
+package com.fuzamei.web;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.alibaba.fastjson.JSON;
+import com.fuzamei.baseTest.BaseJunit4Test;
+import com.fuzamei.entity.Param;
+
+public class OperationHistoryActionTest extends BaseJunit4Test{
+	@Autowired
+	private OperationHistoryAction operationHistoryAction;
+	
+	@Test
+	public void test01(){
+		Param param=new Param();
+		param.setUserId(1001);
+		param.setPage(2);
+		param.setStartTime(null);
+		param.setEndTime(null);
+		Map<String, Object> result = operationHistoryAction.queryOperationHistory(param);
+		String jsonString = JSON.toJSONString(result,true);
+		System.out.println(jsonString);
+	}
+}

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

@@ -24,10 +24,10 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	public void test01(){
 		Param param=new Param();
 		param.setUserId(9001);
-		param.setOrderId(100000001);
+		param.setOrderId(100000004);
 		param.setSupplierId(9003);
 		param.setPartNo("partNo1");
-		param.setBoxNo("FCIU4615794");
+		param.setBoxNo("FCIU4615791");
 		param.setInboxQty(20);
 		Map<String, Object> result = ordersIssueAction.addOrder(param);
 		String jsonString = JSON.toJSONString(result,true);
@@ -39,8 +39,8 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 		Param param=new Param();
 		param.setUserId(9001);
 		param.setPage(1);
-		param.setSupplierName("ylx003供应商");
-		param.setBoxNo("FCIU4615794");
+		param.setSupplierName("chb供应商");
+		param.setBoxNo(null);
 		param.setStartTime(null);
 		param.setEndTime(null);
 		Map<String, Object> result = ordersIssueAction.queryOrdersByPlanner(param);
@@ -85,7 +85,7 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	public void test06(){
 		Param param=new Param();
 		param.setUserId(9001);
-		param.setOrderId(100000001);
+		param.setOrderId(100000002);
 		Map<String, Object> result = ordersIssueAction.orderTracking(param);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
@@ -95,14 +95,11 @@ public class OrdersIssueActionTest extends BaseJunit4Test{
 	public void test07(){
 		Param param=new Param();
 		param.setUserId(9003);
-		param.setOrderId(100000001);
+		param.setOrderId(100000004);
 		param.setCarrierId(9007);
 		Map<String, Object> result = ordersIssueAction.consignment(param);
 		String jsonString = JSON.toJSONString(result,true);
 		System.out.println(jsonString);
 	}
 	
-	
-	
-	
 }