fix all known bugs

N/A
Signed-off-by: Nmegagao <megagao@126.com>

production_ssm.sql

@@ -10,7 +10,7 @@ Target Server Type    : MYSQL
 Target Server Version : 50617
 File Encoding         : 65001
 
-Date: 2017-04-14 20:58:04
+Date: 2018-01-23 22:04:52
 */
 
 SET FOREIGN_KEY_CHECKS=0;
@@ -653,9 +653,9 @@ INSERT INTO `sys_permission` VALUES ('221', '物料消耗新增', 'permission',
 INSERT INTO `sys_permission` VALUES ('222', '物料消耗修改', 'permission', null, 'materialConsume:edit', null, null, null, null);
 INSERT INTO `sys_permission` VALUES ('223', '物料消耗删除', 'permission', null, 'materialConsume:delete', null, null, null, null);
 INSERT INTO `sys_permission` VALUES ('230', '设备管理', 'menu', null, null, null, null, null, null);
-INSERT INTO `sys_permission` VALUES ('231', '设备新增', 'permission', null, 'device:add', null, null, null, null);
-INSERT INTO `sys_permission` VALUES ('232', '设备修改', 'permission', null, 'device:edit', null, null, null, null);
-INSERT INTO `sys_permission` VALUES ('233', '设备删除', 'permission', null, 'device:delete', null, null, null, null);
+INSERT INTO `sys_permission` VALUES ('231', '设备新增', 'permission', null, 'deviceList:add', null, null, null, null);
+INSERT INTO `sys_permission` VALUES ('232', '设备修改', 'permission', null, 'deviceList:edit', null, null, null, null);
+INSERT INTO `sys_permission` VALUES ('233', '设备删除', 'permission', null, 'deviceList:delete', null, null, null, null);
 INSERT INTO `sys_permission` VALUES ('240', '设备例检管理', 'menu', null, null, null, null, null, null);
 INSERT INTO `sys_permission` VALUES ('241', '设备例检新增', 'permission', null, 'deviceCheck:add', null, null, null, null);
 INSERT INTO `sys_permission` VALUES ('242', '设备例检修改', 'permission', null, 'deviceCheck:edit', null, null, null, null);

src/main/java/com/megagao/production/ssm/controller/scheduling/ManufactureController.java

@@ -7,6 +7,7 @@ import javax.validation.Valid;
 import com.megagao.production.ssm.domain.customize.CustomResult;
 import com.megagao.production.ssm.domain.customize.EUDataGridResult;
 import com.megagao.production.ssm.domain.Manufacture;
+import com.megagao.production.ssm.domain.vo.ManufactureVO;
 import com.megagao.production.ssm.service.ManufactureService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -26,8 +27,8 @@ public class ManufactureController {
 	
 	@RequestMapping("/get/{manufactureId}")
 	@ResponseBody
-	public Manufacture getItemById(@PathVariable String manufactureId) throws Exception{
-		Manufacture manufacture = manufactureService.get(manufactureId);
+	public ManufactureVO getItemById(@PathVariable String manufactureId) throws Exception{
+		ManufactureVO manufacture = manufactureService.get(manufactureId);
 		return manufacture;
 	}
 	
@@ -38,7 +39,7 @@ public class ManufactureController {
 	
 	@RequestMapping("/get_data")
 	@ResponseBody
-	public List<Manufacture> getData() throws Exception{
+	public List<ManufactureVO> getData() throws Exception{
 		return manufactureService.find();
 	}
 	

src/main/java/com/megagao/production/ssm/controller/scheduling/OrderController.java

@@ -27,15 +27,15 @@ public class OrderController {
 	
 	@RequestMapping("/get/{orderId}")
 	@ResponseBody
-	public COrder getItemById(@PathVariable String orderId) throws Exception{
-		COrder cOrder = orderService.get(orderId);
+	public COrderVO getItemById(@PathVariable String orderId) throws Exception{
+		COrderVO cOrder = orderService.get(orderId);
 		return cOrder;
 	}
 	
 	@RequestMapping("/get_data")
 	@ResponseBody
-	public List<COrder> getData() throws Exception{
-		 List<COrder> list = orderService.find();
+	public List<COrderVO> getData() throws Exception{
+		 List<COrderVO> list = orderService.find();
 		return list;
 	}
 	

src/main/java/com/megagao/production/ssm/controller/scheduling/WorkController.java

@@ -27,8 +27,8 @@ public class WorkController {
 	
 	@RequestMapping("/get/{workId}")
 	@ResponseBody
-	public Work getItemById(@PathVariable String workId) throws Exception{
-		Work work = workService.get(workId);
+	public WorkVO getItemById(@PathVariable String workId) throws Exception{
+		WorkVO work = workService.get(workId);
 		return work;
 	}
 	
@@ -39,7 +39,7 @@ public class WorkController {
 	
 	@RequestMapping("/get_data")
 	@ResponseBody
-	public List<Work> getData() throws Exception{
+	public List<WorkVO> getData() throws Exception{
 		return workService.find();
 	}
 	

src/main/java/com/megagao/production/ssm/mapper/COrderMapper.java

@@ -36,9 +36,9 @@ public interface COrderMapper {
 
     int insertSelective(COrder record);
 
-    List<COrder> selectByExample(COrderExample example);
+    List<COrderVO> selectByExample(COrderExample example);
 
-    COrder selectByPrimaryKey(String orderId);
+    COrderVO selectByPrimaryKey(String orderId);
 
     int updateByExampleSelective(@Param("record") COrder record, @Param("example") COrderExample example);
 

src/main/java/com/megagao/production/ssm/mapper/ManufactureMapper.java

@@ -33,9 +33,9 @@ public interface ManufactureMapper {
 
     int insertSelective(Manufacture record);
 
-    List<Manufacture> selectByExample(ManufactureExample example);
+    List<ManufactureVO> selectByExample(ManufactureExample example);
 
-    Manufacture selectByPrimaryKey(String manufactureSn);
+    ManufactureVO selectByPrimaryKey(String manufactureSn);
 
     int updateByExampleSelective(@Param("record") Manufacture record, @Param("example") ManufactureExample example);
 

src/main/java/com/megagao/production/ssm/mapper/WorkMapper.java

@@ -33,9 +33,9 @@ public interface WorkMapper {
 
     int insertSelective(Work record);
 
-    List<Work> selectByExample(WorkExample example);
+    List<WorkVO> selectByExample(WorkExample example);
 
-    Work selectByPrimaryKey(String workId);
+    WorkVO selectByPrimaryKey(String workId);
 
     int updateByExampleSelective(@Param("record") Work record, @Param("example") WorkExample example);
 

src/main/java/com/megagao/production/ssm/service/ManufactureService.java

@@ -5,14 +5,15 @@ import java.util.List;
 import com.megagao.production.ssm.domain.Manufacture;
 import com.megagao.production.ssm.domain.customize.CustomResult;
 import com.megagao.production.ssm.domain.customize.EUDataGridResult;
+import com.megagao.production.ssm.domain.vo.ManufactureVO;
 
 public interface ManufactureService {
 	
-	List<Manufacture> find() throws Exception;
+	List<ManufactureVO> find() throws Exception;
 	
 	EUDataGridResult getList(int page, int rows) throws Exception;
 
-	Manufacture get(String string) throws Exception;
+	ManufactureVO get(String string) throws Exception;
 	
 	CustomResult delete(String string) throws Exception;
 

src/main/java/com/megagao/production/ssm/service/OrderService.java

@@ -9,11 +9,11 @@ import com.megagao.production.ssm.domain.customize.EUDataGridResult;
 
 public interface OrderService {
 	
-	List<COrder> find() throws Exception;
+	List<COrderVO> find() throws Exception;
 	
 	EUDataGridResult getList(int page, int rows, COrderVO cOrder) throws Exception;
 
-	COrder get(String string) throws Exception;
+	COrderVO get(String string) throws Exception;
 	
 	CustomResult delete(String string) throws Exception;
 

src/main/java/com/megagao/production/ssm/service/WorkService.java

@@ -9,11 +9,11 @@ import com.megagao.production.ssm.domain.Work;
 
 public interface WorkService {
 	
-	List<Work> find() throws Exception;
+	List<WorkVO> find() throws Exception;
 	
 	EUDataGridResult getList(int page, int rows, WorkVO work) throws Exception;
 
-	Work get(String string) throws Exception;
+	WorkVO get(String string) throws Exception;
 	
 	CustomResult delete(String string) throws Exception;
 

src/main/java/com/megagao/production/ssm/service/impl/ManufactureServiceImpl.java

@@ -37,8 +37,7 @@ public class ManufactureServiceImpl implements ManufactureService{
 	}
 
 	@Override
-	public Manufacture get(String id) throws Exception{
-		
+	public ManufactureVO get(String id) throws Exception{
 		return manufactureMapper.selectByPrimaryKey(id);
 	}
 
@@ -93,7 +92,7 @@ public class ManufactureServiceImpl implements ManufactureService{
 	}
 
 	@Override
-	public List<Manufacture> find() throws Exception{
+	public List<ManufactureVO> find() throws Exception{
 		ManufactureExample example = new ManufactureExample();
 		return manufactureMapper.selectByExample(example);
 	}

src/main/java/com/megagao/production/ssm/service/impl/OrderServiceImpl.java

@@ -30,7 +30,7 @@ public class OrderServiceImpl implements OrderService {
     ProductService productService;
 	
 	@Override
-	public List<COrder> find() throws Exception{
+	public List<COrderVO> find() throws Exception{
 		COrderExample example = new COrderExample();
 		return cOrderMapper.selectByExample(example);
 	}
@@ -51,8 +51,7 @@ public class OrderServiceImpl implements OrderService {
 	}
 
 	@Override
-	public COrder get(String id) throws Exception{
-		
+	public COrderVO get(String id) throws Exception{
 		return cOrderMapper.selectByPrimaryKey(id);
 	}
 

src/main/java/com/megagao/production/ssm/service/impl/WorkServiceImpl.java

@@ -36,8 +36,7 @@ public class WorkServiceImpl implements WorkService{
 	}
 
 	@Override
-	public Work get(String string) throws Exception{
-		
+	public WorkVO get(String string) throws Exception{
 		return workMapper.selectByPrimaryKey(string);
 	}
 
@@ -92,7 +91,7 @@ public class WorkServiceImpl implements WorkService{
 	}
 
 	@Override
-	public List<Work> find() throws Exception{
+	public List<WorkVO> find() throws Exception{
 		WorkExample example = new WorkExample();
 		return workMapper.selectByExample(example);
 	}

src/main/resources/ehcache.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache updateCheck="false"  name="shirocache">
+    <diskStore path="java.io.tmpdir"/>
+    <!-- 登录记录缓存 锁定10分钟 -->
+    <cache name="passwordRetryCache"
+           maxEntriesLocalHeap="2000"
+           eternal="false"
+           timeToIdleSeconds="3600"
+           timeToLiveSeconds="0"
+           overflowToDisk="false"
+           statistics="true">
+    </cache>
+    <cache name="authorizationCache"
+           maxEntriesLocalHeap="2000"
+           eternal="false"
+           timeToIdleSeconds="3600"
+           timeToLiveSeconds="0"
+           overflowToDisk="false"
+           statistics="true">
+    </cache>
+    <cache name="authenticationCache"
+           maxEntriesLocalHeap="2000"
+           eternal="false"
+           timeToIdleSeconds="3600"
+           timeToLiveSeconds="0"
+           overflowToDisk="false"
+           statistics="true">
+    </cache>
+    <cache name="shiro-activeSessionCache"
+           maxEntriesLocalHeap="2000"
+           eternal="false"
+           timeToIdleSeconds="3600"
+           timeToLiveSeconds="0"
+           overflowToDisk="false"
+           statistics="true">
+    </cache>
+    <cache name="shiro_cache"
+    	   maxElementsInMemory="2000"
+           maxEntriesLocalHeap="2000"
+           eternal="false"
+           timeToIdleSeconds="0"
+           timeToLiveSeconds="0"
+           maxElementsOnDisk="0"
+           overflowToDisk="true"
+           memoryStoreEvictionPolicy="FIFO"
+           statistics="true">
+    </cache>
+</ehcache>
\ No newline at end of file

src/main/resources/spring/applicationContext-service.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:context="http://www.springframework.org/schema/context" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
+	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
 		http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
 		http://www.springframework.org/schema/context 
-		http://www.springframework.org/schema/context/spring-context-4.0.xsd
-		http://www.springframework.org/schema/aop 
-		http://www.springframework.org/schema/aop/spring-aop-4.0.xsd 
-		http://www.springframework.org/schema/tx 
-		http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
-		http://www.springframework.org/schema/util 
-		http://www.springframework.org/schema/util/spring-util-4.0.xsd">
+		http://www.springframework.org/schema/context/spring-context-4.0.xsd">
           
 	<!-- service包扫描 -->
 	<context:component-scan base-package="com.megagao.production.ssm.service"/>

src/main/resources/spring/applicationContext-shiro.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:context="http://www.springframework.org/schema/context" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-		http://www.springframework.org/schema/context 
-		http://www.springframework.org/schema/context/spring-context-4.0.xsd
-		http://www.springframework.org/schema/aop 
-		http://www.springframework.org/schema/aop/spring-aop-4.0.xsd 
-		http://www.springframework.org/schema/tx 
-		http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
-		http://www.springframework.org/schema/util 
-		http://www.springframework.org/schema/util/spring-util-4.0.xsd">
+		http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
 	<!-- web.xml中shiro的filter对应的bean -->
 	<!-- Shiro 的Web过滤器 -->
@@ -58,7 +48,7 @@
 	<bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
 		<property name="realm" ref="customRealm" />
 		<!-- 注入缓存管理器 -->
-		<property name="cacheManager" ref="cacheManager"/>
+		<!--<property name="cacheManager" ref="cacheManager"/>-->
 		<!-- 注入session管理器 -->
 		<property name="sessionManager" ref="sessionManager" />
 		<!-- 记住我 -->

src/main/resources/spring/springmvc-servlet.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop"
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans