diff --git a/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp new file mode 100644 index 0000000..1d51c75 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp @@ -0,0 +1,150 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + + <%@ include file="../../system/index/top.jsp"%> + + + + + +
+ +
+
+
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
编号:
SN号:
是否正常:
工作模式:
生产时间:
+ 保存 + 取消 +
+
+ +
+
+ +
+ +
+ +
+
+ +
+ + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp new file mode 100644 index 0000000..862d9c8 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp @@ -0,0 +1,372 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<% + String path = request.getContextPath(); + String basePath = request.getScheme() + "://" + + request.getServerName() + ":" + request.getServerPort() + + path + "/"; +%> + + + + + + + +<%@ include file="../../system/index/top.jsp"%> + + + + + + +
+ +
+
+
+
+
+ + +
+ + + + + + + + + + + +
+
+ + + + +
+ 		+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 序号编号SN号是否正常工作模式生产时间操作
+ + ${vs.index+1}${var.NO}${var.SN}${var.IS_OK}${var.WORK_MODE}${var.PRODUCT_DATE} + + + + + +
您无权查看
没有相关数据
+
+ + + + + +
+ + 新增 + + + + +
+
+
+ +
+ +
+ +
+ +
+
+ + + + + + + +
+ + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/ftl/createCode/controllerTemplate.ftl b/resources/ftl/createCode/controllerTemplate.ftl index c8a20d8..99106b3 100644 --- a/resources/ftl/createCode/controllerTemplate.ftl +++ b/resources/ftl/createCode/controllerTemplate.ftl @@ -49,7 +49,6 @@ public class ${objectName}Controller extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键 <#list fieldList as var> <#if var[3] == "否"> <#if var[1] == 'Date'> diff --git a/resources/ftl/createCode/mapperMysqlTemplate.ftl b/resources/ftl/createCode/mapperMysqlTemplate.ftl index f3c62d6..fe9e24c 100644 --- a/resources/ftl/createCode/mapperMysqlTemplate.ftl +++ b/resources/ftl/createCode/mapperMysqlTemplate.ftl @@ -12,7 +12,7 @@ <#list fieldList as var> ${var[0]}, - ${objectNameUpper}_ID + $ID @@ -20,7 +20,7 @@ <#list fieldList as var> ${r"#{"}${var[0]}${r"}"}, - ${r"#{"}${objectNameUpper}_ID${r"}"} + ${r"#{"}$ID${r"}"} @@ -39,7 +39,7 @@ delete from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -52,9 +52,9 @@ ${var[0]} = ${r"#{"}${var[0]}${r"}"}, - ${objectNameUpper}_ID = ${objectNameUpper}_ID + $ID = $ID where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -64,7 +64,7 @@ from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -99,7 +99,7 @@ delete from where - ${objectNameUpper}_ID in + $ID in ${r"#{item}"} diff --git a/resources/ftl/createCode/mysql_SQL_Template.ftl b/resources/ftl/createCode/mysql_SQL_Template.ftl index ded2aa6..e63d631 100644 --- a/resources/ftl/createCode/mysql_SQL_Template.ftl +++ b/resources/ftl/createCode/mysql_SQL_Template.ftl @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`; CREATE TABLE `${tabletop}${objectNameUpper}` ( - `${objectNameUpper}_ID` varchar(100) NOT NULL, + `$ID` int(100) NOT NULL AUTO_INCREMENT, <#list fieldList as var> <#if var[1] == 'Integer'> `${var[0]}` int(${var[5]}) NOT NULL COMMENT '${var[2]}', @@ -16,5 +16,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` ( `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}', - PRIMARY KEY (`${objectNameUpper}_ID`) + PRIMARY KEY (`$ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/resources/ftl/createFaCode/controllerTemplate.ftl b/resources/ftl/createFaCode/controllerTemplate.ftl index eb16b3a..c8dae25 100644 --- a/resources/ftl/createFaCode/controllerTemplate.ftl +++ b/resources/ftl/createFaCode/controllerTemplate.ftl @@ -53,7 +53,6 @@ public class ${objectName}Controller extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键 <#list fieldList as var> <#if var[3] == "否"> <#if var[1] == 'Date'> diff --git a/resources/ftl/createFaCode/mapperMysqlTemplate.ftl b/resources/ftl/createFaCode/mapperMysqlTemplate.ftl index f3c62d6..fe9e24c 100644 --- a/resources/ftl/createFaCode/mapperMysqlTemplate.ftl +++ b/resources/ftl/createFaCode/mapperMysqlTemplate.ftl @@ -12,7 +12,7 @@ <#list fieldList as var> ${var[0]}, - ${objectNameUpper}_ID + $ID @@ -20,7 +20,7 @@ <#list fieldList as var> ${r"#{"}${var[0]}${r"}"}, - ${r"#{"}${objectNameUpper}_ID${r"}"} + ${r"#{"}$ID${r"}"} @@ -39,7 +39,7 @@ delete from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -52,9 +52,9 @@ ${var[0]} = ${r"#{"}${var[0]}${r"}"}, - ${objectNameUpper}_ID = ${objectNameUpper}_ID + $ID = $ID where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -64,7 +64,7 @@ from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -99,7 +99,7 @@ delete from where - ${objectNameUpper}_ID in + $ID in ${r"#{item}"} diff --git a/resources/ftl/createFaCode/mysql_SQL_Template.ftl b/resources/ftl/createFaCode/mysql_SQL_Template.ftl index ded2aa6..e63d631 100644 --- a/resources/ftl/createFaCode/mysql_SQL_Template.ftl +++ b/resources/ftl/createFaCode/mysql_SQL_Template.ftl @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`; CREATE TABLE `${tabletop}${objectNameUpper}` ( - `${objectNameUpper}_ID` varchar(100) NOT NULL, + `$ID` int(100) NOT NULL AUTO_INCREMENT, <#list fieldList as var> <#if var[1] == 'Integer'> `${var[0]}` int(${var[5]}) NOT NULL COMMENT '${var[2]}', @@ -16,5 +16,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` ( `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}', - PRIMARY KEY (`${objectNameUpper}_ID`) + PRIMARY KEY (`$ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/resources/ftl/createSoCode/controllerTemplate.ftl b/resources/ftl/createSoCode/controllerTemplate.ftl index c8a20d8..99106b3 100644 --- a/resources/ftl/createSoCode/controllerTemplate.ftl +++ b/resources/ftl/createSoCode/controllerTemplate.ftl @@ -49,7 +49,6 @@ public class ${objectName}Controller extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键 <#list fieldList as var> <#if var[3] == "否"> <#if var[1] == 'Date'> diff --git a/resources/ftl/createSoCode/mapperMysqlTemplate.ftl b/resources/ftl/createSoCode/mapperMysqlTemplate.ftl index a04b090..9f25657 100644 --- a/resources/ftl/createSoCode/mapperMysqlTemplate.ftl +++ b/resources/ftl/createSoCode/mapperMysqlTemplate.ftl @@ -12,7 +12,7 @@ <#list fieldList as var> ${var[0]}, - ${objectNameUpper}_ID, + $ID, ${faobject}_ID @@ -21,7 +21,7 @@ <#list fieldList as var> ${r"#{"}${var[0]}${r"}"}, - ${r"#{"}${objectNameUpper}_ID${r"}"}, + ${r"#{"}$ID${r"}"}, ${r"#{"}${faobject}_ID${r"}"} @@ -41,7 +41,7 @@ delete from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -54,9 +54,9 @@ ${var[0]} = ${r"#{"}${var[0]}${r"}"}, - ${objectNameUpper}_ID = ${objectNameUpper}_ID + $ID = $ID where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -66,7 +66,7 @@ from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -102,7 +102,7 @@ delete from where - ${objectNameUpper}_ID in + $ID in ${r"#{item}"} diff --git a/resources/ftl/createSoCode/mysql_SQL_Template.ftl b/resources/ftl/createSoCode/mysql_SQL_Template.ftl index 90b594a..74249a8 100644 --- a/resources/ftl/createSoCode/mysql_SQL_Template.ftl +++ b/resources/ftl/createSoCode/mysql_SQL_Template.ftl @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`; CREATE TABLE `${tabletop}${objectNameUpper}` ( - `${objectNameUpper}_ID` varchar(100) NOT NULL, + `$ID` int(100) NOT NULL AUTO_INCREMENT, `${faobject}_ID` varchar(100) NOT NULL, <#list fieldList as var> <#if var[1] == 'Integer'> @@ -17,5 +17,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` ( `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}', - PRIMARY KEY (`${objectNameUpper}_ID`) + PRIMARY KEY (`$ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/resources/ftl/createTreeCode/controllerTemplate.ftl b/resources/ftl/createTreeCode/controllerTemplate.ftl index 9297412..327ac53 100644 --- a/resources/ftl/createTreeCode/controllerTemplate.ftl +++ b/resources/ftl/createTreeCode/controllerTemplate.ftl @@ -51,7 +51,6 @@ public class ${objectName}Controller extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键 <#list fieldList as var> <#if var[3] == "否"> <#if var[1] == 'Date'> diff --git a/resources/ftl/createTreeCode/mapperMysqlTemplate.ftl b/resources/ftl/createTreeCode/mapperMysqlTemplate.ftl index e33cbeb..f5ec703 100644 --- a/resources/ftl/createTreeCode/mapperMysqlTemplate.ftl +++ b/resources/ftl/createTreeCode/mapperMysqlTemplate.ftl @@ -3,7 +3,7 @@ - + @@ -18,7 +18,7 @@ <#list fieldList as var> ${var[0]}, - ${objectNameUpper}_ID, + $ID, PARENT_ID, NAME @@ -28,7 +28,7 @@ <#list fieldList as var> ${r"#{"}${var[0]}${r"}"}, - ${r"#{"}${objectNameUpper}_ID${r"}"}, + ${r"#{"}$ID${r"}"}, ${r"#{"}PARENT_ID${r"}"}, ${r"#{"}NAME${r"}"} @@ -49,7 +49,7 @@ delete from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -63,9 +63,9 @@ NAME = ${r"#{"}NAME${r"}"}, - ${objectNameUpper}_ID = ${objectNameUpper}_ID + $ID = $ID where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -75,7 +75,7 @@ from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -85,8 +85,8 @@ from where 1=1 - - and PARENT_ID = ${r"#{"}pd.${objectNameUpper}_ID${r"}"} + + and PARENT_ID = ${r"#{"}pd.$ID${r"}"} and diff --git a/resources/ftl/createTreeCode/mysql_SQL_Template.ftl b/resources/ftl/createTreeCode/mysql_SQL_Template.ftl index c78ac6c..694c1f6 100644 --- a/resources/ftl/createTreeCode/mysql_SQL_Template.ftl +++ b/resources/ftl/createTreeCode/mysql_SQL_Template.ftl @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`; CREATE TABLE `${tabletop}${objectNameUpper}` ( - `${objectNameUpper}_ID` varchar(100) NOT NULL, + `$ID` int(100) NOT NULL AUTO_INCREMENT, `PARENT_ID` varchar(100) NOT NULL, `NAME` varchar(100) NOT NULL, <#list fieldList as var> @@ -18,5 +18,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` ( `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}', - PRIMARY KEY (`${objectNameUpper}_ID`) + PRIMARY KEY (`$ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/resources/ftl_backups/createCode/controllerTemplate.ftl b/resources/ftl_backups/createCode/controllerTemplate.ftl index c8a20d8..99106b3 100644 --- a/resources/ftl_backups/createCode/controllerTemplate.ftl +++ b/resources/ftl_backups/createCode/controllerTemplate.ftl @@ -49,7 +49,6 @@ public class ${objectName}Controller extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键 <#list fieldList as var> <#if var[3] == "否"> <#if var[1] == 'Date'> diff --git a/resources/ftl_backups/createCode/mapperMysqlTemplate.ftl b/resources/ftl_backups/createCode/mapperMysqlTemplate.ftl index f3c62d6..fe9e24c 100644 --- a/resources/ftl_backups/createCode/mapperMysqlTemplate.ftl +++ b/resources/ftl_backups/createCode/mapperMysqlTemplate.ftl @@ -12,7 +12,7 @@ <#list fieldList as var> ${var[0]}, - ${objectNameUpper}_ID + $ID @@ -20,7 +20,7 @@ <#list fieldList as var> ${r"#{"}${var[0]}${r"}"}, - ${r"#{"}${objectNameUpper}_ID${r"}"} + ${r"#{"}$ID${r"}"} @@ -39,7 +39,7 @@ delete from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -52,9 +52,9 @@ ${var[0]} = ${r"#{"}${var[0]}${r"}"}, - ${objectNameUpper}_ID = ${objectNameUpper}_ID + $ID = $ID where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -64,7 +64,7 @@ from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -99,7 +99,7 @@ delete from where - ${objectNameUpper}_ID in + $ID in ${r"#{item}"} diff --git a/resources/ftl_backups/createCode/mysql_SQL_Template.ftl b/resources/ftl_backups/createCode/mysql_SQL_Template.ftl index ded2aa6..e63d631 100644 --- a/resources/ftl_backups/createCode/mysql_SQL_Template.ftl +++ b/resources/ftl_backups/createCode/mysql_SQL_Template.ftl @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`; CREATE TABLE `${tabletop}${objectNameUpper}` ( - `${objectNameUpper}_ID` varchar(100) NOT NULL, + `$ID` int(100) NOT NULL AUTO_INCREMENT, <#list fieldList as var> <#if var[1] == 'Integer'> `${var[0]}` int(${var[5]}) NOT NULL COMMENT '${var[2]}', @@ -16,5 +16,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` ( `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}', - PRIMARY KEY (`${objectNameUpper}_ID`) + PRIMARY KEY (`$ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/resources/ftl_backups/createFaCode/controllerTemplate.ftl b/resources/ftl_backups/createFaCode/controllerTemplate.ftl index eb16b3a..c8dae25 100644 --- a/resources/ftl_backups/createFaCode/controllerTemplate.ftl +++ b/resources/ftl_backups/createFaCode/controllerTemplate.ftl @@ -53,7 +53,6 @@ public class ${objectName}Controller extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键 <#list fieldList as var> <#if var[3] == "否"> <#if var[1] == 'Date'> diff --git a/resources/ftl_backups/createFaCode/mapperMysqlTemplate.ftl b/resources/ftl_backups/createFaCode/mapperMysqlTemplate.ftl index f3c62d6..fe9e24c 100644 --- a/resources/ftl_backups/createFaCode/mapperMysqlTemplate.ftl +++ b/resources/ftl_backups/createFaCode/mapperMysqlTemplate.ftl @@ -12,7 +12,7 @@ <#list fieldList as var> ${var[0]}, - ${objectNameUpper}_ID + $ID @@ -20,7 +20,7 @@ <#list fieldList as var> ${r"#{"}${var[0]}${r"}"}, - ${r"#{"}${objectNameUpper}_ID${r"}"} + ${r"#{"}$ID${r"}"} @@ -39,7 +39,7 @@ delete from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -52,9 +52,9 @@ ${var[0]} = ${r"#{"}${var[0]}${r"}"}, - ${objectNameUpper}_ID = ${objectNameUpper}_ID + $ID = $ID where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -64,7 +64,7 @@ from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -99,7 +99,7 @@ delete from where - ${objectNameUpper}_ID in + $ID in ${r"#{item}"} diff --git a/resources/ftl_backups/createFaCode/mysql_SQL_Template.ftl b/resources/ftl_backups/createFaCode/mysql_SQL_Template.ftl index ded2aa6..e63d631 100644 --- a/resources/ftl_backups/createFaCode/mysql_SQL_Template.ftl +++ b/resources/ftl_backups/createFaCode/mysql_SQL_Template.ftl @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`; CREATE TABLE `${tabletop}${objectNameUpper}` ( - `${objectNameUpper}_ID` varchar(100) NOT NULL, + `$ID` int(100) NOT NULL AUTO_INCREMENT, <#list fieldList as var> <#if var[1] == 'Integer'> `${var[0]}` int(${var[5]}) NOT NULL COMMENT '${var[2]}', @@ -16,5 +16,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` ( `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}', - PRIMARY KEY (`${objectNameUpper}_ID`) + PRIMARY KEY (`$ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/resources/ftl_backups/createSoCode/controllerTemplate.ftl b/resources/ftl_backups/createSoCode/controllerTemplate.ftl index c8a20d8..99106b3 100644 --- a/resources/ftl_backups/createSoCode/controllerTemplate.ftl +++ b/resources/ftl_backups/createSoCode/controllerTemplate.ftl @@ -49,7 +49,6 @@ public class ${objectName}Controller extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键 <#list fieldList as var> <#if var[3] == "否"> <#if var[1] == 'Date'> diff --git a/resources/ftl_backups/createSoCode/mapperMysqlTemplate.ftl b/resources/ftl_backups/createSoCode/mapperMysqlTemplate.ftl index a04b090..9f25657 100644 --- a/resources/ftl_backups/createSoCode/mapperMysqlTemplate.ftl +++ b/resources/ftl_backups/createSoCode/mapperMysqlTemplate.ftl @@ -12,7 +12,7 @@ <#list fieldList as var> ${var[0]}, - ${objectNameUpper}_ID, + $ID, ${faobject}_ID @@ -21,7 +21,7 @@ <#list fieldList as var> ${r"#{"}${var[0]}${r"}"}, - ${r"#{"}${objectNameUpper}_ID${r"}"}, + ${r"#{"}$ID${r"}"}, ${r"#{"}${faobject}_ID${r"}"} @@ -41,7 +41,7 @@ delete from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -54,9 +54,9 @@ ${var[0]} = ${r"#{"}${var[0]}${r"}"}, - ${objectNameUpper}_ID = ${objectNameUpper}_ID + $ID = $ID where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -66,7 +66,7 @@ from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -102,7 +102,7 @@ delete from where - ${objectNameUpper}_ID in + $ID in ${r"#{item}"} diff --git a/resources/ftl_backups/createSoCode/mysql_SQL_Template.ftl b/resources/ftl_backups/createSoCode/mysql_SQL_Template.ftl index 90b594a..74249a8 100644 --- a/resources/ftl_backups/createSoCode/mysql_SQL_Template.ftl +++ b/resources/ftl_backups/createSoCode/mysql_SQL_Template.ftl @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`; CREATE TABLE `${tabletop}${objectNameUpper}` ( - `${objectNameUpper}_ID` varchar(100) NOT NULL, + `$ID` int(100) NOT NULL AUTO_INCREMENT, `${faobject}_ID` varchar(100) NOT NULL, <#list fieldList as var> <#if var[1] == 'Integer'> @@ -17,5 +17,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` ( `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}', - PRIMARY KEY (`${objectNameUpper}_ID`) + PRIMARY KEY (`$ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/resources/ftl_backups/createTreeCode/controllerTemplate.ftl b/resources/ftl_backups/createTreeCode/controllerTemplate.ftl index 9297412..327ac53 100644 --- a/resources/ftl_backups/createTreeCode/controllerTemplate.ftl +++ b/resources/ftl_backups/createTreeCode/controllerTemplate.ftl @@ -51,7 +51,6 @@ public class ${objectName}Controller extends BaseController { ModelAndView mv = this.getModelAndView(); PageData pd = new PageData(); pd = this.getPageData(); - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键 <#list fieldList as var> <#if var[3] == "否"> <#if var[1] == 'Date'> diff --git a/resources/ftl_backups/createTreeCode/mapperMysqlTemplate.ftl b/resources/ftl_backups/createTreeCode/mapperMysqlTemplate.ftl index e33cbeb..f5ec703 100644 --- a/resources/ftl_backups/createTreeCode/mapperMysqlTemplate.ftl +++ b/resources/ftl_backups/createTreeCode/mapperMysqlTemplate.ftl @@ -3,7 +3,7 @@ - + @@ -18,7 +18,7 @@ <#list fieldList as var> ${var[0]}, - ${objectNameUpper}_ID, + $ID, PARENT_ID, NAME @@ -28,7 +28,7 @@ <#list fieldList as var> ${r"#{"}${var[0]}${r"}"}, - ${r"#{"}${objectNameUpper}_ID${r"}"}, + ${r"#{"}$ID${r"}"}, ${r"#{"}PARENT_ID${r"}"}, ${r"#{"}NAME${r"}"} @@ -49,7 +49,7 @@ delete from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -63,9 +63,9 @@ NAME = ${r"#{"}NAME${r"}"}, - ${objectNameUpper}_ID = ${objectNameUpper}_ID + $ID = $ID where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -75,7 +75,7 @@ from where - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"} + $ID = ${r"#{"}$ID${r"}"} @@ -85,8 +85,8 @@ from where 1=1 - - and PARENT_ID = ${r"#{"}pd.${objectNameUpper}_ID${r"}"} + + and PARENT_ID = ${r"#{"}pd.$ID${r"}"} and diff --git a/resources/ftl_backups/createTreeCode/mysql_SQL_Template.ftl b/resources/ftl_backups/createTreeCode/mysql_SQL_Template.ftl index c78ac6c..694c1f6 100644 --- a/resources/ftl_backups/createTreeCode/mysql_SQL_Template.ftl +++ b/resources/ftl_backups/createTreeCode/mysql_SQL_Template.ftl @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0; -- ---------------------------- DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`; CREATE TABLE `${tabletop}${objectNameUpper}` ( - `${objectNameUpper}_ID` varchar(100) NOT NULL, + `$ID` int(100) NOT NULL AUTO_INCREMENT, `PARENT_ID` varchar(100) NOT NULL, `NAME` varchar(100) NOT NULL, <#list fieldList as var> @@ -18,5 +18,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` ( `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}', - PRIMARY KEY (`${objectNameUpper}_ID`) + PRIMARY KEY (`$ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/resources/mybatis1/sunvote/BasestationMapper.xml b/resources/mybatis1/sunvote/BasestationMapper.xml index 05efeee..f42b922 100644 --- a/resources/mybatis1/sunvote/BasestationMapper.xml +++ b/resources/mybatis1/sunvote/BasestationMapper.xml @@ -17,7 +17,7 @@ PRODUCTION_TIME, IS_OK, REMARK, - BASESTATION_ID + ID @@ -30,11 +30,15 @@ #{PRODUCTION_TIME}, #{IS_OK}, #{REMARK}, - #{BASESTATION_ID} + #{ID} + + + SELECT LAST_INSERT_ID() + insert into ( @@ -63,7 +67,7 @@ delete from where - BASESTATION_ID = #{BASESTATION_ID} + ID = #{ID} @@ -79,9 +83,9 @@ PRODUCTION_TIME = #{PRODUCTION_TIME}, IS_OK = #{IS_OK}, REMARK = #{REMARK}, - BASESTATION_ID = BASESTATION_ID + ID = ID where - BASESTATION_ID = #{BASESTATION_ID} + ID = #{ID} @@ -91,7 +95,7 @@ from where - BASESTATION_ID = #{BASESTATION_ID} + ID = #{ID} @@ -126,11 +130,10 @@ delete from where - BASESTATION_ID in + ID in #{item} - \ No newline at end of file diff --git a/resources/mybatis1/sunvote/KeypadMapper.xml b/resources/mybatis1/sunvote/KeypadMapper.xml new file mode 100644 index 0000000..69a661c --- /dev/null +++ b/resources/mybatis1/sunvote/KeypadMapper.xml @@ -0,0 +1,121 @@ + + + + + + + SV_KEYPAD + + + + + NO, + SN, + IS_OK, + WORK_MODE, + PRODUCT_DATE, + ID + + + + + #{NO}, + #{SN}, + #{IS_OK}, + #{WORK_MODE}, + #{PRODUCT_DATE}, + #{ID} + + + + + insert into + + ( + NO, + SN, + IS_OK, + WORK_MODE, + PRODUCT_DATE + ) values ( + #{NO}, + #{SN}, + #{IS_OK}, + #{WORK_MODE}, + #{PRODUCT_DATE} + ) + + + + + delete from + + where + ID = #{ID} + + + + + update + + set + NO = #{NO}, + SN = #{SN}, + IS_OK = #{IS_OK}, + WORK_MODE = #{WORK_MODE}, + PRODUCT_DATE = #{PRODUCT_DATE}, + ID = ID + where + ID = #{ID} + + + + + + + + + + + + + + delete from + + where + ID in + + #{item} + + + + + \ No newline at end of file diff --git a/resources/mybatis1/sunvote/SchoolMapper.xml b/resources/mybatis1/sunvote/SchoolMapper.xml index 9c4bd87..c8957bf 100644 --- a/resources/mybatis1/sunvote/SchoolMapper.xml +++ b/resources/mybatis1/sunvote/SchoolMapper.xml @@ -14,7 +14,7 @@ PRESIDENT, PHONE, REMARK, - SCHOOL_ID + ID @@ -24,7 +24,7 @@ #{PRESIDENT}, #{PHONE}, #{REMARK}, - #{SCHOOL_ID} + #{ID} @@ -51,7 +51,7 @@ delete from where - SCHOOL_ID = #{SCHOOL_ID} + ID = #{ID} @@ -64,9 +64,9 @@ PRESIDENT = #{PRESIDENT}, PHONE = #{PHONE}, REMARK = #{REMARK}, - SCHOOL_ID = SCHOOL_ID + ID = ID where - SCHOOL_ID = #{SCHOOL_ID} + ID = #{ID} @@ -76,7 +76,7 @@ from where - SCHOOL_ID = #{SCHOOL_ID} + ID = #{ID} @@ -111,11 +111,19 @@ delete from where - SCHOOL_ID in + ID in #{item} + + + \ No newline at end of file diff --git a/resources/mybatis1/sunvote/TeachingMaterialMapper.xml b/resources/mybatis1/sunvote/TeachingMaterialMapper.xml index 0a8f1a5..9d2fd09 100644 --- a/resources/mybatis1/sunvote/TeachingMaterialMapper.xml +++ b/resources/mybatis1/sunvote/TeachingMaterialMapper.xml @@ -14,7 +14,7 @@ GRADE_ID, VERSION_CODE, VERSION_NAME, - TEACHINGMATERIAL_ID + ID @@ -24,7 +24,7 @@ #{GRADE_ID}, #{VERSION_CODE}, #{VERSION_NAME}, - #{TEACHINGMATERIAL_ID} + #{ID} @@ -43,7 +43,7 @@ delete from where - TEACHINGMATERIAL_ID = #{TEACHINGMATERIAL_ID} + ID = #{ID} @@ -56,9 +56,9 @@ GRADE_ID = #{GRADE_ID}, VERSION_CODE = #{VERSION_CODE}, VERSION_NAME = #{VERSION_NAME}, - TEACHINGMATERIAL_ID = TEACHINGMATERIAL_ID + ID = ID where - TEACHINGMATERIAL_ID = #{TEACHINGMATERIAL_ID} + ID = #{ID} @@ -68,7 +68,7 @@ from where - TEACHINGMATERIAL_ID = #{TEACHINGMATERIAL_ID} + ID = #{ID} @@ -103,7 +103,7 @@ delete from where - TEACHINGMATERIAL_ID in + ID in #{item} diff --git a/src/com/fh/controller/api/ApiServer.java b/src/com/fh/controller/api/ApiServer.java index b98ca92..0946b5e 100644 --- a/src/com/fh/controller/api/ApiServer.java +++ b/src/com/fh/controller/api/ApiServer.java @@ -32,9 +32,8 @@ public class ApiServer extends BaseController { @ResponseBody public Object schoolList() throws Exception{ PageData pd = this.getPageData(); - String id = pd.getString("id"); + String id = pd.getString("ID"); if(id != null && !"".equals(id)){ - pd.put("SCHOOL_ID", pd.getString("id")); PageData ret = schoolService.findById(pd); ResponseGson res = new ResponseGson(); res.setData(ret); @@ -50,11 +49,11 @@ public class ApiServer extends BaseController { @ResponseBody public Object schoolAdd() throws Exception{ PageData pd = this.getPageData(); - ResponseGson res = new ResponseGson(); + ResponseGson res = new ResponseGson(); try { - if (pd.get("name") != null) { - schoolService.save(pd); - res.setData(pd); + if (pd.get("NAME") != null) { + Integer id = schoolService.save(pd); + res.setData(id); } else { res.setDataError(); } @@ -69,11 +68,13 @@ public class ApiServer extends BaseController { public Object schoolDelete() throws Exception{ ResponseGson res = new ResponseGson(); PageData pd = this.getPageData(); - String id = pd.getString("id"); + String id = pd.getString("ID"); if(id != null && !"".equals(id)){ - pd.put("SCHOOL_ID", pd.getString("id")); - schoolService.delete(pd); - res.setData(pd); + try { + schoolService.delete(pd); + } catch (Exception e) { + res.setDataError(); + } }else{ res.setDataError(); } @@ -85,11 +86,13 @@ public class ApiServer extends BaseController { public Object schoolUpdate() throws Exception{ ResponseGson res = new ResponseGson(); PageData pd = this.getPageData(); - String id = pd.getString("id"); + String id = pd.getString("ID"); if(id != null && !"".equals(id)){ - pd.put("SCHOOL_ID", pd.getString("id")); - schoolService.edit(pd); - res.setData(pd); + try { + schoolService.edit(pd); + } catch (Exception e) { + res.setDataError(); + } }else{ res.setDataError(); } @@ -101,7 +104,7 @@ public class ApiServer extends BaseController { @ResponseBody public Object basestation() throws Exception{ PageData pd = this.getPageData(); - String id = pd.getString("id"); + String id = pd.getString("ID"); if(id != null && !"".equals(id)){ pd.put("BASESTATION_ID", pd.getString("id")); PageData ret = basestationService.findById(pd); @@ -117,13 +120,65 @@ public class ApiServer extends BaseController { } + @RequestMapping(value="/basestation/add" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object basestationAdd() throws Exception { + ResponseGson res = new ResponseGson(); + PageData pd = this.getPageData(); + if (pd.getString("NAME") != null) { + try { + basestationService.edit(pd); + } catch (Exception ex) { + res.setDataError(); + } + }else{ + res.setDataError(); + } + return res.toJson(); + } + + @RequestMapping(value="/basestation/delete" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object basestationDelete() throws Exception{ + PageData pd = this.getPageData(); + ResponseGson res = new ResponseGson(); + String id = pd.getString("ID"); + if(id != null && !"".equals(id)){ + try { + basestationService.delete(pd); + } catch (Exception e) { + res.setDataError(); + } + }else{ + res.setDataError(); + } + return res.toJson(); + } + + @RequestMapping(value="/basestation/update" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object basestationUpdate() throws Exception{ + PageData pd = this.getPageData(); + ResponseGson res = new ResponseGson(); + String id = pd.getString("ID"); + if(id != null && !"".equals(id)){ + try { + basestationService.edit(pd); + } catch (Exception e) { + res.setDataError(); + } + }else{ + res.setDataError(); + } + return res.toJson(); + } + @RequestMapping(value="/keypad/list" ,produces="application/json;charset=UTF-8") @ResponseBody public Object keypad() throws Exception{ PageData pd = this.getPageData(); - String id = pd.getString("id"); + String id = pd.getString("ID"); if(id != null && !"".equals(id)){ - pd.put("KEYPAD_ID", pd.getString("id")); PageData ret = keypadService.findById(pd); ResponseGson res = new ResponseGson(); res.setData(ret); @@ -134,6 +189,55 @@ public class ApiServer extends BaseController { res.setData(ret); return res.toJson(); } - } + + @RequestMapping(value="/keypad/add" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object keypadAdd() throws Exception { + PageData pd = this.getPageData(); + ResponseGson res = new ResponseGson(); + try { + keypadService.save(pd); + } catch (Exception ex) { + res.setDataError(); + } + return res.toJson(); + } + + @RequestMapping(value="/keypad/delete" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object keypadDelete() throws Exception{ + PageData pd = this.getPageData(); + ResponseGson res = new ResponseGson(); + String id = pd.getString("ID"); + if(id != null && !"".equals(id)){ + try { + keypadService.delete(pd); + } catch (Exception e) { + res.setDataError(); + } + }else{ + res.setDataError(); + } + return res.toJson(); + } + + @RequestMapping(value="/keypad/update" ,produces="application/json;charset=UTF-8") + @ResponseBody + public Object keypadUpdate() throws Exception{ + PageData pd = this.getPageData(); + ResponseGson res = new ResponseGson(); + String id = pd.getString("ID"); + if(id != null && !"".equals(id)){ + try{ + keypadService.edit(pd); + }catch(Exception ex){ + res.setDataError(); + } + }else{ + res.setDataError(); + } + return res.toJson(); + } + } diff --git a/src/com/fh/controller/api/ResponseGson.java b/src/com/fh/controller/api/ResponseGson.java new file mode 100644 index 0000000..df605a7 --- /dev/null +++ b/src/com/fh/controller/api/ResponseGson.java @@ -0,0 +1,63 @@ +package com.fh.controller.api; + +import com.google.gson.Gson; + +public class ResponseGson { + + private String code = "0"; + + private String message = "success"; + + private T data; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public T getData() { + return data; + } + + public void setData(T data) { + this.data = data; + } + + public String toJson(){ + Gson gson = new Gson(); + return gson.toJson(this); + } + + @Override + public String toString() { + return "ResponseGson [code=" + code + ", message=" + message + + ", data=" + data + "]"; + } + + + public void setSuccess(){ + code = "0" ; + message = "success" ; + } + + public void setNetError(){ + code = "-1" ; + message = "net error" ; + } + + public void setDataError(){ + code = "-2" ; + message = "Data error" ; + } +} diff --git a/src/com/fh/controller/sunvote/keypad/KeypadController.java b/src/com/fh/controller/sunvote/keypad/KeypadController.java new file mode 100644 index 0000000..bbecef1 --- /dev/null +++ b/src/com/fh/controller/sunvote/keypad/KeypadController.java @@ -0,0 +1,213 @@ +package com.fh.controller.sunvote.keypad; + +import java.io.PrintWriter; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.annotation.Resource; +import org.springframework.beans.propertyeditors.CustomDateEditor; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; +import com.fh.controller.base.BaseController; +import com.fh.entity.Page; +import com.fh.util.AppUtil; +import com.fh.util.ObjectExcelView; +import com.fh.util.PageData; +import com.fh.util.Jurisdiction; +import com.fh.util.Tools; +import com.fh.service.sunvote.keypad.KeypadManager; + +/** + * 说明：键盘管理 + * 创建人：Elvis + * 创建时间：2018-04-19 + */ +@Controller +@RequestMapping(value="/keypad") +public class KeypadController extends BaseController { + + String menuUrl = "keypad/list.do"; //菜单地址(权限用) + @Resource(name="keypadService") + private KeypadManager keypadService; + + /**保存 + * @param + * @throws Exception + */ + @RequestMapping(value="/save") + public ModelAndView save() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"新增Keypad"); + if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限 + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("KEYPAD_ID", this.get32UUID()); //主键 + keypadService.save(pd); + mv.addObject("msg","success"); + mv.setViewName("save_result"); + return mv; + } + + /**删除 + * @param out + * @throws Exception + */ + @RequestMapping(value="/delete") + public void delete(PrintWriter out) throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"删除Keypad"); + if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限 + PageData pd = new PageData(); + pd = this.getPageData(); + keypadService.delete(pd); + out.write("success"); + out.close(); + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/edit") + public ModelAndView edit() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"修改Keypad"); + if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限 + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + keypadService.edit(pd); + mv.addObject("msg","success"); + mv.setViewName("save_result"); + return mv; + } + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + public ModelAndView list(Page page) throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"列表Keypad"); + //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码) + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + String keywords = pd.getString("keywords"); //关键词检索条件 + if(null != keywords && !"".equals(keywords)){ + pd.put("keywords", keywords.trim()); + } + page.setPd(pd); + List varList = keypadService.list(page); //列出Keypad列表 + mv.setViewName("sunvote/keypad/keypad_list"); + mv.addObject("varList", varList); + mv.addObject("pd", pd); + mv.addObject("QX",Jurisdiction.getHC()); //按钮权限 + return mv; + } + + /**去新增页面 + * @param + * @throws Exception + */ + @RequestMapping(value="/goAdd") + public ModelAndView goAdd()throws Exception{ + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + mv.setViewName("sunvote/keypad/keypad_edit"); + mv.addObject("msg", "save"); + mv.addObject("pd", pd); + return mv; + } + + /**去修改页面 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit") + public ModelAndView goEdit()throws Exception{ + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + pd = keypadService.findById(pd); //根据ID读取 + mv.setViewName("sunvote/keypad/keypad_edit"); + mv.addObject("msg", "edit"); + mv.addObject("pd", pd); + return mv; + } + + /**批量删除 + * @param + * @throws Exception + */ + @RequestMapping(value="/deleteAll") + @ResponseBody + public Object deleteAll() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"批量删除Keypad"); + if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限 + PageData pd = new PageData(); + Map map = new HashMap(); + pd = this.getPageData(); + List pdList = new ArrayList(); + String DATA_IDS = pd.getString("DATA_IDS"); + if(null != DATA_IDS && !"".equals(DATA_IDS)){ + String ArrayDATA_IDS[] = DATA_IDS.split(","); + keypadService.deleteAll(ArrayDATA_IDS); + pd.put("msg", "ok"); + }else{ + pd.put("msg", "no"); + } + pdList.add(pd); + map.put("list", pdList); + return AppUtil.returnObject(pd, map); + } + + /**导出到excel + * @param + * @throws Exception + */ + @RequestMapping(value="/excel") + public ModelAndView exportExcel() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"导出Keypad到excel"); + if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} + ModelAndView mv = new ModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + Map dataMap = new HashMap(); + List titles = new ArrayList(); + titles.add("编号"); //1 + titles.add("SN号"); //2 + titles.add("是否正常"); //3 + titles.add("工作模式"); //4 + titles.add("生产时间"); //5 + dataMap.put("titles", titles); + List varOList = keypadService.listAll(pd); + List varList = new ArrayList(); + for(int i=0;i fieldList = new ArrayList(); //属性集合 ========参数4 for(int i=0; i< zindex; i++){ - fieldList.add(pd.getString("field"+i).split(",fh,")); //属性放到集合里面 + fieldList.add(pd.getString("FIELD"+i).split(",fh,")); //属性放到集合里面 } Map root = new HashMap(); //创建数据模型 root.put("fieldList", fieldList); @@ -175,9 +175,9 @@ public class CreateCodeController extends BaseController { * @throws Exception */ public void save(PageData pd) throws Exception{ - pd.put("PACKAGENAME", pd.getString("packageName")); //包名 - pd.put("OBJECTNAME", pd.getString("objectName")); //类名 - pd.put("TABLENAME", pd.getString("tabletop")+",fh,"+pd.getString("objectName").toUpperCase()); //表名 + pd.put("PACKAGENAME", pd.getString("PACKAGENAME")); //包名 + pd.put("OBJECTNAME", pd.getString("OBJECTNAME")); //类名 + pd.put("TABLENAME", pd.getString("TABLETOP")+",fh,"+pd.getString("OBJECTNAME").toUpperCase()); //表名 pd.put("FIELDLIST", pd.getString("FIELDLIST")); //属性集合 pd.put("CREATETIME", DateUtil.getTime()); //创建时间 pd.put("TITLE", pd.getString("TITLE")); //说明 diff --git a/src/com/fh/plugin/PagePlugin.java b/src/com/fh/plugin/PagePlugin.java index e338d38..75813a8 100644 --- a/src/com/fh/plugin/PagePlugin.java +++ b/src/com/fh/plugin/PagePlugin.java @@ -40,7 +40,7 @@ import com.fh.util.Tools; * 类描述： * @author FH * 作者单位： -* 联系方式：qq313596790 +* 联系方式： * 修改时间：2016年2月1日 * @version 1.0 */ diff --git a/src/com/fh/service/sunvote/keypad/KeypadManager.java b/src/com/fh/service/sunvote/keypad/KeypadManager.java new file mode 100644 index 0000000..c44a9fe --- /dev/null +++ b/src/com/fh/service/sunvote/keypad/KeypadManager.java @@ -0,0 +1,58 @@ +package com.fh.service.sunvote.keypad; + +import java.util.List; +import com.fh.entity.Page; +import com.fh.util.PageData; + +/** + * 说明： 键盘管理接口 + * 创建人：Elvis + * 创建时间：2018-04-19 + * @version + */ +public interface KeypadManager{ + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + +} + diff --git a/src/com/fh/service/sunvote/keypad/impl/KeypadService.java b/src/com/fh/service/sunvote/keypad/impl/KeypadService.java new file mode 100644 index 0000000..dc10992 --- /dev/null +++ b/src/com/fh/service/sunvote/keypad/impl/KeypadService.java @@ -0,0 +1,82 @@ +package com.fh.service.sunvote.keypad.impl; + +import java.util.List; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; +import com.fh.dao.DaoSupport; +import com.fh.entity.Page; +import com.fh.util.PageData; +import com.fh.service.sunvote.keypad.KeypadManager; + +/** + * 说明： 键盘管理 + * 创建人：Elvis + * 创建时间：2018-04-19 + * @version + */ +@Service("keypadService") +public class KeypadService implements KeypadManager{ + + @Resource(name = "daoSupport") + private DaoSupport dao; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + dao.save("KeypadMapper.save", pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + dao.delete("KeypadMapper.delete", pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + dao.update("KeypadMapper.edit", pd); + } + + /**列表 + * @param page + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List list(Page page)throws Exception{ + return (List)dao.findForList("KeypadMapper.datalistPage", page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + @SuppressWarnings("unchecked") + public List listAll(PageData pd)throws Exception{ + return (List)dao.findForList("KeypadMapper.listAll", pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findById(PageData pd)throws Exception{ + return (PageData)dao.findForObject("KeypadMapper.findById", pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + dao.delete("KeypadMapper.deleteAll", ArrayDATA_IDS); + } + +} + diff --git a/src/com/fh/service/sunvote/school/SchoolManager.java b/src/com/fh/service/sunvote/school/SchoolManager.java index 0495545..ae2a2ab 100644 --- a/src/com/fh/service/sunvote/school/SchoolManager.java +++ b/src/com/fh/service/sunvote/school/SchoolManager.java @@ -16,7 +16,7 @@ public interface SchoolManager{ * @param pd * @throws Exception */ - public void save(PageData pd)throws Exception; + public Integer save(PageData pd)throws Exception; /**删除 * @param pd diff --git a/src/com/fh/service/sunvote/school/impl/SchoolService.java b/src/com/fh/service/sunvote/school/impl/SchoolService.java index b2eeaa1..95a2670 100644 --- a/src/com/fh/service/sunvote/school/impl/SchoolService.java +++ b/src/com/fh/service/sunvote/school/impl/SchoolService.java @@ -24,8 +24,8 @@ public class SchoolService implements SchoolManager{ * @param pd * @throws Exception */ - public void save(PageData pd)throws Exception{ - dao.save("SchoolMapper.save", pd); + public Integer save(PageData pd)throws Exception{ + return (Integer)dao.save("SchoolMapper.save", pd); } /**删除 diff --git a/src/com/fh/util/Freemarker.java b/src/com/fh/util/Freemarker.java index 4ecc3e0..ea25110 100644 --- a/src/com/fh/util/Freemarker.java +++ b/src/com/fh/util/Freemarker.java @@ -45,20 +45,24 @@ public class Freemarker { * @param filePath 输出前的文件上部路径 */ public static void printFile(String ftlName, Map root, String outFile, String filePath, String ftlPath) throws Exception{ + Writer out = null; try { File file = new File(PathUtil.getClasspath() + filePath + outFile); if(!file.getParentFile().exists()){ //判断有没有父路径，就是判断文件整个路径是否存在 file.getParentFile().mkdirs(); //不存在就全部创建 } - Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "utf-8")); + out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "utf-8")); Template template = getTemplate(ftlName, ftlPath); template.process(root, out); //模版输出 out.flush(); - out.close(); } catch (TemplateException e) { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); + }finally{ + if(out != null){ + out.close(); + } } } diff --git a/src/com/fh/util/PageData.java b/src/com/fh/util/PageData.java index 1b28043..5082f11 100644 --- a/src/com/fh/util/PageData.java +++ b/src/com/fh/util/PageData.java @@ -46,7 +46,7 @@ public class PageData extends HashMap implements Map{ }else{ value = valueObj.toString(); } - returnMap.put(name, value); + returnMap.put(name.toUpperCase(), value); } map = returnMap; }