孙向锦 / SunvoteEducation

Commit b980d59db036bbecbfc45ce81c519fb47762a317

Authored by 孙向锦
1 parent cb39a12d

修改模板

Inline Side-by-side
Showing 41 changed files with 1310 additions and 140 deletions
WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp 0 → 100644
  View file @b980d59
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
  5 +<%
  6 + String path = request.getContextPath();
  7 + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
  8 +%>
  9 +<!DOCTYPE html>
  10 +<html lang="en">
  11 + <head>
  12 + <base href="<%=basePath%>">
  13 + <!-- 下拉框 -->
  14 + <link rel="stylesheet" href="static/ace/css/chosen.css" />
  15 + <!-- jsp文件头和头部 -->
  16 + <%@ include file="../../system/index/top.jsp"%>
  17 + <!-- 日期框 -->
  18 + <link rel="stylesheet" href="static/ace/css/datepicker.css" />
  19 +</head>
  20 +<body class="no-skin">
  21 +<!-- /section:basics/navbar.layout -->
  22 +<div class="main-container" id="main-container">
  23 + <!-- /section:basics/sidebar -->
  24 + <div class="main-content">
  25 + <div class="main-content-inner">
  26 + <div class="page-content">
  27 + <div class="row">
  28 + <div class="col-xs-12">
  29 +
  30 + <form action="keypad/${msg }.do" name="Form" id="Form" method="post">
  31 + <input type="hidden" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}"/>
  32 + <div id="zhongxin" style="padding-top: 13px;">
  33 + <table id="table_report" class="table table-striped table-bordered table-hover">
  34 + <tr>
  35 + <td style="width:75px;text-align: right;padding-top: 13px;">编号:</td>
  36 + <td><input type="text" name="NO" id="NO" value="${pd.NO}" maxlength="255" placeholder="这里输入编号" title="编号" style="width:98%;"/></td>
  37 + </tr>
  38 + <tr>
  39 + <td style="width:75px;text-align: right;padding-top: 13px;">SN号:</td>
  40 + <td><input type="text" name="SN" id="SN" value="${pd.SN}" maxlength="255" placeholder="这里输入SN号" title="SN号" style="width:98%;"/></td>
  41 + </tr>
  42 + <tr>
  43 + <td style="width:75px;text-align: right;padding-top: 13px;">是否正常:</td>
  44 + <td><input type="number" name="IS_OK" id="IS_OK" value="${pd.IS_OK}" maxlength="32" placeholder="这里输入是否正常" title="是否正常" style="width:98%;"/></td>
  45 + </tr>
  46 + <tr>
  47 + <td style="width:75px;text-align: right;padding-top: 13px;">工作模式:</td>
  48 + <td><input type="number" name="WORK_MODE" id="WORK_MODE" value="${pd.WORK_MODE}" maxlength="32" placeholder="这里输入工作模式" title="工作模式" style="width:98%;"/></td>
  49 + </tr>
  50 + <tr>
  51 + <td style="width:75px;text-align: right;padding-top: 13px;">生产时间:</td>
  52 + <td><input class="span10 date-picker" name="PRODUCT_DATE" id="PRODUCT_DATE" value="${pd.PRODUCT_DATE}" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" placeholder="生产时间" title="生产时间" style="width:98%;"/></td>
  53 + </tr>
  54 + <tr>
  55 + <td style="text-align: center;" colspan="10">
  56 + <a class="btn btn-mini btn-primary" onclick="save();">保存</a>
  57 + <a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>
  58 + </td>
  59 + </tr>
  60 + </table>
  61 + </div>
  62 + <div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
  63 + </form>
  64 + </div>
  65 + <!-- /.col -->
  66 + </div>
  67 + <!-- /.row -->
  68 + </div>
  69 + <!-- /.page-content -->
  70 + </div>
  71 + </div>
  72 + <!-- /.main-content -->
  73 +</div>
  74 +<!-- /.main-container -->
  75 +
  76 +
  77 + <!-- 页面底部js¨ -->
  78 + <%@ include file="../../system/index/foot.jsp"%>
  79 + <!-- 下拉框 -->
  80 + <script src="static/ace/js/chosen.jquery.js"></script>
  81 + <!-- 日期框 -->
  82 + <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
  83 + <!--提示框-->
  84 + <script type="text/javascript" src="static/js/jquery.tips.js"></script>
  85 + <script type="text/javascript">
  86 + $(top.hangge());
  87 + //保存
  88 + function save(){
  89 + if($("#NO").val()==""){
  90 + $("#NO").tips({
  91 + side:3,
  92 + msg:'请输入编号',
  93 + bg:'#AE81FF',
  94 + time:2
  95 + });
  96 + $("#NO").focus();
  97 + return false;
  98 + }
  99 + if($("#SN").val()==""){
  100 + $("#SN").tips({
  101 + side:3,
  102 + msg:'请输入SN号',
  103 + bg:'#AE81FF',
  104 + time:2
  105 + });
  106 + $("#SN").focus();
  107 + return false;
  108 + }
  109 + if($("#IS_OK").val()==""){
  110 + $("#IS_OK").tips({
  111 + side:3,
  112 + msg:'请输入是否正常',
  113 + bg:'#AE81FF',
  114 + time:2
  115 + });
  116 + $("#IS_OK").focus();
  117 + return false;
  118 + }
  119 + if($("#WORK_MODE").val()==""){
  120 + $("#WORK_MODE").tips({
  121 + side:3,
  122 + msg:'请输入工作模式',
  123 + bg:'#AE81FF',
  124 + time:2
  125 + });
  126 + $("#WORK_MODE").focus();
  127 + return false;
  128 + }
  129 + if($("#PRODUCT_DATE").val()==""){
  130 + $("#PRODUCT_DATE").tips({
  131 + side:3,
  132 + msg:'请输入生产时间',
  133 + bg:'#AE81FF',
  134 + time:2
  135 + });
  136 + $("#PRODUCT_DATE").focus();
  137 + return false;
  138 + }
  139 + $("#Form").submit();
  140 + $("#zhongxin").hide();
  141 + $("#zhongxin2").show();
  142 + }
  143 +
  144 + $(function() {
  145 + //日期框
  146 + $('.date-picker').datepicker({autoclose: true,todayHighlight: true});
  147 + });
  148 + </script>
  149 +</body>
  150 +</html>
0 151 \ No newline at end of file
... ...
WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp 0 → 100644
  View file @b980d59
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%
  5 + String path = request.getContextPath();
  6 + String basePath = request.getScheme() + "://"
  7 + + request.getServerName() + ":" + request.getServerPort()
  8 + + path + "/";
  9 +%>
  10 +<!DOCTYPE html>
  11 +<html lang="en">
  12 +<head>
  13 +<base href="<%=basePath%>">
  14 +<!-- 下拉框 -->
  15 +<link rel="stylesheet" href="static/ace/css/chosen.css" />
  16 +<!-- jsp文件头和头部 -->
  17 +<%@ include file="../../system/index/top.jsp"%>
  18 +<!-- 日期框 -->
  19 +<link rel="stylesheet" href="static/ace/css/datepicker.css" />
  20 +</head>
  21 +<body class="no-skin">
  22 +
  23 + <!-- /section:basics/navbar.layout -->
  24 + <div class="main-container" id="main-container">
  25 + <!-- /section:basics/sidebar -->
  26 + <div class="main-content">
  27 + <div class="main-content-inner">
  28 + <div class="page-content">
  29 + <div class="row">
  30 + <div class="col-xs-12">
  31 +
  32 + <!-- 检索 -->
  33 + <form action="keypad/list.do" method="post" name="Form" id="Form">
  34 + <table style="margin-top:5px;">
  35 + <tr>
  36 + <td>
  37 + <div class="nav-search">
  38 + <span class="input-icon">
  39 + <input type="text" placeholder="这里输入关键词" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" placeholder="这里输入关键词"/>
  40 + <i class="ace-icon fa fa-search nav-search-icon"></i>
  41 + </span>
  42 + </div>
  43 + </td>
  44 + <td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart" value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="开始日期" title="开始日期"/></td>
  45 + <td style="padding-left:2px;"><input class="span10 date-picker" name="lastEnd" name="lastEnd" value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
  46 + <td style="vertical-align:top;padding-left:2px;">
  47 + <select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
  48 + <option value=""></option>
  49 + <option value="">全部</option>
  50 + <option value="">1</option>
  51 + <option value="">2</option>
  52 + </select>
  53 + </td>
  54 + <c:if test="${QX.cha == 1 }">
  55 + <td style="vertical-align:top;padding-left:2px"><a class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i id="nav-search-icon" class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
  56 + </c:if>
  57 + <c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
  58 + </tr>
  59 + </table>
  60 + <!-- 检索 -->
  61 +
  62 + <table id="simple-table" class="table table-striped table-bordered table-hover" style="margin-top:5px;">
  63 + <thead>
  64 + <tr>
  65 + <th class="center" style="width:35px;">
  66 + <label class="pos-rel"><input type="checkbox" class="ace" id="zcheckbox" /><span class="lbl"></span></label>
  67 + </th>
  68 + <th class="center" style="width:50px;">序号</th>
  69 + <th class="center">编号</th>
  70 + <th class="center">SN号</th>
  71 + <th class="center">是否正常</th>
  72 + <th class="center">工作模式</th>
  73 + <th class="center">生产时间</th>
  74 + <th class="center">操作</th>
  75 + </tr>
  76 + </thead>
  77 +
  78 + <tbody>
  79 + <!-- 开始循环 -->
  80 + <c:choose>
  81 + <c:when test="${not empty varList}">
  82 + <c:if test="${QX.cha == 1 }">
  83 + <c:forEach items="${varList}" var="var" varStatus="vs">
  84 + <tr>
  85 + <td class='center'>
  86 + <label class="pos-rel"><input type='checkbox' name='ids' value="${var.KEYPAD_ID}" class="ace" /><span class="lbl"></span></label>
  87 + </td>
  88 + <td class='center' style="width: 30px;">${vs.index+1}</td>
  89 + <td class='center'>${var.NO}</td>
  90 + <td class='center'>${var.SN}</td>
  91 + <td class='center'>${var.IS_OK}</td>
  92 + <td class='center'>${var.WORK_MODE}</td>
  93 + <td class='center'>${var.PRODUCT_DATE}</td>
  94 + <td class="center">
  95 + <c:if test="${QX.edit != 1 && QX.del != 1 }">
  96 + <span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
  97 + </c:if>
  98 + <div class="hidden-sm hidden-xs btn-group">
  99 + <c:if test="${QX.edit == 1 }">
  100 + <a class="btn btn-xs btn-success" title="编辑" onclick="edit('${var.KEYPAD_ID}');">
  101 + <i class="ace-icon fa fa-pencil-square-o bigger-120" title="编辑"></i>
  102 + </a>
  103 + </c:if>
  104 + <c:if test="${QX.del == 1 }">
  105 + <a class="btn btn-xs btn-danger" onclick="del('${var.KEYPAD_ID}');">
  106 + <i class="ace-icon fa fa-trash-o bigger-120" title="删除"></i>
  107 + </a>
  108 + </c:if>
  109 + </div>
  110 + <div class="hidden-md hidden-lg">
  111 + <div class="inline pos-rel">
  112 + <button class="btn btn-minier btn-primary dropdown-toggle" data-toggle="dropdown" data-position="auto">
  113 + <i class="ace-icon fa fa-cog icon-only bigger-110"></i>
  114 + </button>
  115 +
  116 + <ul class="dropdown-menu dropdown-only-icon dropdown-yellow dropdown-menu-right dropdown-caret dropdown-close">
  117 + <c:if test="${QX.edit == 1 }">
  118 + <li>
  119 + <a style="cursor:pointer;" onclick="edit('${var.KEYPAD_ID}');" class="tooltip-success" data-rel="tooltip" title="修改">
  120 + <span class="green">
  121 + <i class="ace-icon fa fa-pencil-square-o bigger-120"></i>
  122 + </span>
  123 + </a>
  124 + </li>
  125 + </c:if>
  126 + <c:if test="${QX.del == 1 }">
  127 + <li>
  128 + <a style="cursor:pointer;" onclick="del('${var.KEYPAD_ID}');" class="tooltip-error" data-rel="tooltip" title="删除">
  129 + <span class="red">
  130 + <i class="ace-icon fa fa-trash-o bigger-120"></i>
  131 + </span>
  132 + </a>
  133 + </li>
  134 + </c:if>
  135 + </ul>
  136 + </div>
  137 + </div>
  138 + </td>
  139 + </tr>
  140 +
  141 + </c:forEach>
  142 + </c:if>
  143 + <c:if test="${QX.cha == 0 }">
  144 + <tr>
  145 + <td colspan="100" class="center">您无权查看</td>
  146 + </tr>
  147 + </c:if>
  148 + </c:when>
  149 + <c:otherwise>
  150 + <tr class="main_info">
  151 + <td colspan="100" class="center" >没有相关数据</td>
  152 + </tr>
  153 + </c:otherwise>
  154 + </c:choose>
  155 + </tbody>
  156 + </table>
  157 + <div class="page-header position-relative">
  158 + <table style="width:100%;">
  159 + <tr>
  160 + <td style="vertical-align:top;">
  161 + <c:if test="${QX.add == 1 }">
  162 + <a class="btn btn-mini btn-success" onclick="add();">新增</a>
  163 + </c:if>
  164 + <c:if test="${QX.del == 1 }">
  165 + <a class="btn btn-mini btn-danger" onclick="makeAll('确定要删除选中的数据吗?');" title="批量删除" ><i class='ace-icon fa fa-trash-o bigger-120'></i></a>
  166 + </c:if>
  167 + </td>
  168 + <td style="vertical-align:top;"><div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div></td>
  169 + </tr>
  170 + </table>
  171 + </div>
  172 + </form>
  173 +
  174 + </div>
  175 + <!-- /.col -->
  176 + </div>
  177 + <!-- /.row -->
  178 + </div>
  179 + <!-- /.page-content -->
  180 + </div>
  181 + </div>
  182 + <!-- /.main-content -->
  183 +
  184 + <!-- 返回顶部 -->
  185 + <a href="#" id="btn-scroll-up" class="btn-scroll-up btn btn-sm btn-inverse">
  186 + <i class="ace-icon fa fa-angle-double-up icon-only bigger-110"></i>
  187 + </a>
  188 +
  189 + </div>
  190 + <!-- /.main-container -->
  191 +
  192 + <!-- basic scripts -->
  193 + <!-- 页面底部js¨ -->
  194 + <%@ include file="../../system/index/foot.jsp"%>
  195 + <!-- 删除时确认窗口 -->
  196 + <script src="static/ace/js/bootbox.js"></script>
  197 + <!-- ace scripts -->
  198 + <script src="static/ace/js/ace/ace.js"></script>
  199 + <!-- 下拉框 -->
  200 + <script src="static/ace/js/chosen.jquery.js"></script>
  201 + <!-- 日期框 -->
  202 + <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
  203 + <!--提示框-->
  204 + <script type="text/javascript" src="static/js/jquery.tips.js"></script>
  205 + <script type="text/javascript">
  206 + $(top.hangge());//关闭加载状态
  207 + //检索
  208 + function tosearch(){
  209 + top.jzts();
  210 + $("#Form").submit();
  211 + }
  212 + $(function() {
  213 +
  214 + //日期框
  215 + $('.date-picker').datepicker({
  216 + autoclose: true,
  217 + todayHighlight: true
  218 + });
  219 +
  220 + //下拉框
  221 + if(!ace.vars['touch']) {
  222 + $('.chosen-select').chosen({allow_single_deselect:true});
  223 + $(window)
  224 + .off('resize.chosen')
  225 + .on('resize.chosen', function() {
  226 + $('.chosen-select').each(function() {
  227 + var $this = $(this);
  228 + $this.next().css({'width': $this.parent().width()});
  229 + });
  230 + }).trigger('resize.chosen');
  231 + $(document).on('settings.ace.chosen', function(e, event_name, event_val) {
  232 + if(event_name != 'sidebar_collapsed') return;
  233 + $('.chosen-select').each(function() {
  234 + var $this = $(this);
  235 + $this.next().css({'width': $this.parent().width()});
  236 + });
  237 + });
  238 + $('#chosen-multiple-style .btn').on('click', function(e){
  239 + var target = $(this).find('input[type=radio]');
  240 + var which = parseInt(target.val());
  241 + if(which == 2) $('#form-field-select-4').addClass('tag-input-style');
  242 + else $('#form-field-select-4').removeClass('tag-input-style');
  243 + });
  244 + }
  245 +
  246 +
  247 + //复选框全选控制
  248 + var active_class = 'active';
  249 + $('#simple-table > thead > tr > th input[type=checkbox]').eq(0).on('click', function(){
  250 + var th_checked = this.checked;//checkbox inside "TH" table header
  251 + $(this).closest('table').find('tbody > tr').each(function(){
  252 + var row = this;
  253 + if(th_checked) $(row).addClass(active_class).find('input[type=checkbox]').eq(0).prop('checked', true);
  254 + else $(row).removeClass(active_class).find('input[type=checkbox]').eq(0).prop('checked', false);
  255 + });
  256 + });
  257 + });
  258 +
  259 + //新增
  260 + function add(){
  261 + top.jzts();
  262 + var diag = new top.Dialog();
  263 + diag.Drag=true;
  264 + diag.Title ="新增";
  265 + diag.URL = '<%=basePath%>keypad/goAdd.do';
  266 + diag.Width = 450;
  267 + diag.Height = 355;
  268 + diag.Modal = true; //有无遮罩窗口
  269 + diag. ShowMaxButton = true; //最大化按钮
  270 + diag.ShowMinButton = true; //最小化按钮
  271 + diag.CancelEvent = function(){ //关闭事件
  272 + if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){
  273 + if('${page.currentPage}' == '0'){
  274 + tosearch();
  275 + }else{
  276 + tosearch();
  277 + }
  278 + }
  279 + diag.close();
  280 + };
  281 + diag.show();
  282 + }
  283 +
  284 + //删除
  285 + function del(Id){
  286 + bootbox.confirm("确定要删除吗?", function(result) {
  287 + if(result) {
  288 + top.jzts();
  289 + var url = "<%=basePath%>keypad/delete.do?KEYPAD_ID="+Id+"&tm="+new Date().getTime();
  290 + $.get(url,function(data){
  291 + tosearch();
  292 + });
  293 + }
  294 + });
  295 + }
  296 +
  297 + //修改
  298 + function edit(Id){
  299 + top.jzts();
  300 + var diag = new top.Dialog();
  301 + diag.Drag=true;
  302 + diag.Title ="编辑";
  303 + diag.URL = '<%=basePath%>keypad/goEdit.do?KEYPAD_ID='+Id;
  304 + diag.Width = 450;
  305 + diag.Height = 355;
  306 + diag.Modal = true; //有无遮罩窗口
  307 + diag. ShowMaxButton = true; //最大化按钮
  308 + diag.ShowMinButton = true; //最小化按钮
  309 + diag.CancelEvent = function(){ //关闭事件
  310 + if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){
  311 + tosearch();
  312 + }
  313 + diag.close();
  314 + };
  315 + diag.show();
  316 + }
  317 +
  318 + //批量操作
  319 + function makeAll(msg){
  320 + bootbox.confirm(msg, function(result) {
  321 + if(result) {
  322 + var str = '';
  323 + for(var i=0;i < document.getElementsByName('ids').length;i++){
  324 + if(document.getElementsByName('ids')[i].checked){
  325 + if(str=='') str += document.getElementsByName('ids')[i].value;
  326 + else str += ',' + document.getElementsByName('ids')[i].value;
  327 + }
  328 + }
  329 + if(str==''){
  330 + bootbox.dialog({
  331 + message: "<span class='bigger-110'>您没有选择任何内容!</span>",
  332 + buttons:
  333 + { "button":{ "label":"确定", "className":"btn-sm btn-success"}}
  334 + });
  335 + $("#zcheckbox").tips({
  336 + side:1,
  337 + msg:'点这里全选',
  338 + bg:'#AE81FF',
  339 + time:8
  340 + });
  341 + return;
  342 + }else{
  343 + if(msg == '确定要删除选中的数据吗?'){
  344 + top.jzts();
  345 + $.ajax({
  346 + type: "POST",
  347 + url: '<%=basePath%>keypad/deleteAll.do?tm='+new Date().getTime(),
  348 + data: {DATA_IDS:str},
  349 + dataType:'json',
  350 + //beforeSend: validateData,
  351 + cache: false,
  352 + success: function(data){
  353 + $.each(data.list, function(i, list){
  354 + tosearch();
  355 + });
  356 + }
  357 + });
  358 + }
  359 + }
  360 + }
  361 + });
  362 + };
  363 +
  364 + //导出excel
  365 + function toExcel(){
  366 + window.location.href='<%=basePath%>keypad/excel.do';
  367 + }
  368 + </script>
  369 +
  370 +
  371 +</body>
  372 +</html>
0 373 \ No newline at end of file
... ...
resources/ftl/createCode/controllerTemplate.ftl
  View file @b980d59
... ... @@ -49,7 +49,6 @@ public class ${objectName}Controller extends BaseController {
49 49 ModelAndView mv = this.getModelAndView();
50 50 PageData pd = new PageData();
51 51 pd = this.getPageData();
52   - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键
53 52 <#list fieldList as var>
54 53 <#if var[3] == "否">
55 54 <#if var[1] == 'Date'>
... ...
resources/ftl/createCode/mapperMysqlTemplate.ftl
  View file @b980d59
... ... @@ -12,7 +12,7 @@
12 12 <#list fieldList as var>
13 13 ${var[0]},
14 14 </#list>
15   - ${objectNameUpper}_ID
  15 + $ID
16 16 </sql>
17 17  
18 18 <!-- 字段值 -->
... ... @@ -20,7 +20,7 @@
20 20 <#list fieldList as var>
21 21 ${r"#{"}${var[0]}${r"}"},
22 22 </#list>
23   - ${r"#{"}${objectNameUpper}_ID${r"}"}
  23 + ${r"#{"}$ID${r"}"}
24 24 </sql>
25 25  
26 26 <!-- 新增-->
... ... @@ -39,7 +39,7 @@
39 39 delete from
40 40 <include refid="tableName"></include>
41 41 where
42   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  42 + $ID = ${r"#{"}$ID${r"}"}
43 43 </delete>
44 44  
45 45 <!-- 修改 -->
... ... @@ -52,9 +52,9 @@
52 52 ${var[0]} = ${r"#{"}${var[0]}${r"}"},
53 53 </#if>
54 54 </#list>
55   - ${objectNameUpper}_ID = ${objectNameUpper}_ID
  55 + $ID = $ID
56 56 where
57   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  57 + $ID = ${r"#{"}$ID${r"}"}
58 58 </update>
59 59  
60 60 <!-- 通过ID获取数据 -->
... ... @@ -64,7 +64,7 @@
64 64 from
65 65 <include refid="tableName"></include>
66 66 where
67   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  67 + $ID = ${r"#{"}$ID${r"}"}
68 68 </select>
69 69  
70 70 <!-- 列表 -->
... ... @@ -99,7 +99,7 @@
99 99 delete from
100 100 <include refid="tableName"></include>
101 101 where
102   - ${objectNameUpper}_ID in
  102 + $ID in
103 103 <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
104 104 ${r"#{item}"}
105 105 </foreach>
... ...
resources/ftl/createCode/mysql_SQL_Template.ftl
  View file @b980d59
... ... @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0;
6 6 -- ----------------------------
7 7 DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`;
8 8 CREATE TABLE `${tabletop}${objectNameUpper}` (
9   - `${objectNameUpper}_ID` varchar(100) NOT NULL,
  9 + `$ID` int(100) NOT NULL AUTO_INCREMENT,
10 10 <#list fieldList as var>
11 11 <#if var[1] == 'Integer'>
12 12 `${var[0]}` int(${var[5]}) NOT NULL COMMENT '${var[2]}',
... ... @@ -16,5 +16,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` (
16 16 `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}',
17 17 </#if>
18 18 </#list>
19   - PRIMARY KEY (`${objectNameUpper}_ID`)
  19 + PRIMARY KEY (`$ID`)
20 20 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
... ...
resources/ftl/createFaCode/controllerTemplate.ftl
  View file @b980d59
... ... @@ -53,7 +53,6 @@ public class ${objectName}Controller extends BaseController {
53 53 ModelAndView mv = this.getModelAndView();
54 54 PageData pd = new PageData();
55 55 pd = this.getPageData();
56   - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键
57 56 <#list fieldList as var>
58 57 <#if var[3] == "否">
59 58 <#if var[1] == 'Date'>
... ...
resources/ftl/createFaCode/mapperMysqlTemplate.ftl
  View file @b980d59
... ... @@ -12,7 +12,7 @@
12 12 <#list fieldList as var>
13 13 ${var[0]},
14 14 </#list>
15   - ${objectNameUpper}_ID
  15 + $ID
16 16 </sql>
17 17  
18 18 <!-- 字段值 -->
... ... @@ -20,7 +20,7 @@
20 20 <#list fieldList as var>
21 21 ${r"#{"}${var[0]}${r"}"},
22 22 </#list>
23   - ${r"#{"}${objectNameUpper}_ID${r"}"}
  23 + ${r"#{"}$ID${r"}"}
24 24 </sql>
25 25  
26 26 <!-- 新增-->
... ... @@ -39,7 +39,7 @@
39 39 delete from
40 40 <include refid="tableName"></include>
41 41 where
42   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  42 + $ID = ${r"#{"}$ID${r"}"}
43 43 </delete>
44 44  
45 45 <!-- 修改 -->
... ... @@ -52,9 +52,9 @@
52 52 ${var[0]} = ${r"#{"}${var[0]}${r"}"},
53 53 </#if>
54 54 </#list>
55   - ${objectNameUpper}_ID = ${objectNameUpper}_ID
  55 + $ID = $ID
56 56 where
57   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  57 + $ID = ${r"#{"}$ID${r"}"}
58 58 </update>
59 59  
60 60 <!-- 通过ID获取数据 -->
... ... @@ -64,7 +64,7 @@
64 64 from
65 65 <include refid="tableName"></include>
66 66 where
67   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  67 + $ID = ${r"#{"}$ID${r"}"}
68 68 </select>
69 69  
70 70 <!-- 列表 -->
... ... @@ -99,7 +99,7 @@
99 99 delete from
100 100 <include refid="tableName"></include>
101 101 where
102   - ${objectNameUpper}_ID in
  102 + $ID in
103 103 <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
104 104 ${r"#{item}"}
105 105 </foreach>
... ...
resources/ftl/createFaCode/mysql_SQL_Template.ftl
  View file @b980d59
... ... @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0;
6 6 -- ----------------------------
7 7 DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`;
8 8 CREATE TABLE `${tabletop}${objectNameUpper}` (
9   - `${objectNameUpper}_ID` varchar(100) NOT NULL,
  9 + `$ID` int(100) NOT NULL AUTO_INCREMENT,
10 10 <#list fieldList as var>
11 11 <#if var[1] == 'Integer'>
12 12 `${var[0]}` int(${var[5]}) NOT NULL COMMENT '${var[2]}',
... ... @@ -16,5 +16,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` (
16 16 `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}',
17 17 </#if>
18 18 </#list>
19   - PRIMARY KEY (`${objectNameUpper}_ID`)
  19 + PRIMARY KEY (`$ID`)
20 20 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
... ...
resources/ftl/createSoCode/controllerTemplate.ftl
  View file @b980d59
... ... @@ -49,7 +49,6 @@ public class ${objectName}Controller extends BaseController {
49 49 ModelAndView mv = this.getModelAndView();
50 50 PageData pd = new PageData();
51 51 pd = this.getPageData();
52   - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键
53 52 <#list fieldList as var>
54 53 <#if var[3] == "否">
55 54 <#if var[1] == 'Date'>
... ...
resources/ftl/createSoCode/mapperMysqlTemplate.ftl
  View file @b980d59
... ... @@ -12,7 +12,7 @@
12 12 <#list fieldList as var>
13 13 ${var[0]},
14 14 </#list>
15   - ${objectNameUpper}_ID,
  15 + $ID,
16 16 ${faobject}_ID
17 17 </sql>
18 18  
... ... @@ -21,7 +21,7 @@
21 21 <#list fieldList as var>
22 22 ${r"#{"}${var[0]}${r"}"},
23 23 </#list>
24   - ${r"#{"}${objectNameUpper}_ID${r"}"},
  24 + ${r"#{"}$ID${r"}"},
25 25 ${r"#{"}${faobject}_ID${r"}"}
26 26 </sql>
27 27  
... ... @@ -41,7 +41,7 @@
41 41 delete from
42 42 <include refid="tableName"></include>
43 43 where
44   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  44 + $ID = ${r"#{"}$ID${r"}"}
45 45 </delete>
46 46  
47 47 <!-- 修改 -->
... ... @@ -54,9 +54,9 @@
54 54 ${var[0]} = ${r"#{"}${var[0]}${r"}"},
55 55 </#if>
56 56 </#list>
57   - ${objectNameUpper}_ID = ${objectNameUpper}_ID
  57 + $ID = $ID
58 58 where
59   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  59 + $ID = ${r"#{"}$ID${r"}"}
60 60 </update>
61 61  
62 62 <!-- 通过ID获取数据 -->
... ... @@ -66,7 +66,7 @@
66 66 from
67 67 <include refid="tableName"></include>
68 68 where
69   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  69 + $ID = ${r"#{"}$ID${r"}"}
70 70 </select>
71 71  
72 72 <!-- 列表 -->
... ... @@ -102,7 +102,7 @@
102 102 delete from
103 103 <include refid="tableName"></include>
104 104 where
105   - ${objectNameUpper}_ID in
  105 + $ID in
106 106 <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
107 107 ${r"#{item}"}
108 108 </foreach>
... ...
resources/ftl/createSoCode/mysql_SQL_Template.ftl
  View file @b980d59
... ... @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0;
6 6 -- ----------------------------
7 7 DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`;
8 8 CREATE TABLE `${tabletop}${objectNameUpper}` (
9   - `${objectNameUpper}_ID` varchar(100) NOT NULL,
  9 + `$ID` int(100) NOT NULL AUTO_INCREMENT,
10 10 `${faobject}_ID` varchar(100) NOT NULL,
11 11 <#list fieldList as var>
12 12 <#if var[1] == 'Integer'>
... ... @@ -17,5 +17,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` (
17 17 `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}',
18 18 </#if>
19 19 </#list>
20   - PRIMARY KEY (`${objectNameUpper}_ID`)
  20 + PRIMARY KEY (`$ID`)
21 21 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
... ...
resources/ftl/createTreeCode/controllerTemplate.ftl
  View file @b980d59
... ... @@ -51,7 +51,6 @@ public class ${objectName}Controller extends BaseController {
51 51 ModelAndView mv = this.getModelAndView();
52 52 PageData pd = new PageData();
53 53 pd = this.getPageData();
54   - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键
55 54 <#list fieldList as var>
56 55 <#if var[3] == "否">
57 56 <#if var[1] == 'Date'>
... ...
resources/ftl/createTreeCode/mapperMysqlTemplate.ftl
  View file @b980d59
... ... @@ -3,7 +3,7 @@
3 3 <mapper namespace="${objectName}Mapper">
4 4  
5 5 <resultMap type="${objectName}" id="${objectNameLower}ResultMap">
6   - <id column="${objectNameUpper}_ID" property="${objectNameUpper}_ID"/>
  6 + <id column="$ID" property="$ID"/>
7 7 <result column="NAME" property="NAME"/>
8 8 <result column="PARENT_ID" property="PARENT_ID"/>
9 9 </resultMap>
... ... @@ -18,7 +18,7 @@
18 18 <#list fieldList as var>
19 19 ${var[0]},
20 20 </#list>
21   - ${objectNameUpper}_ID,
  21 + $ID,
22 22 PARENT_ID,
23 23 NAME
24 24 </sql>
... ... @@ -28,7 +28,7 @@
28 28 <#list fieldList as var>
29 29 ${r"#{"}${var[0]}${r"}"},
30 30 </#list>
31   - ${r"#{"}${objectNameUpper}_ID${r"}"},
  31 + ${r"#{"}$ID${r"}"},
32 32 ${r"#{"}PARENT_ID${r"}"},
33 33 ${r"#{"}NAME${r"}"}
34 34 </sql>
... ... @@ -49,7 +49,7 @@
49 49 delete from
50 50 <include refid="tableName"></include>
51 51 where
52   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  52 + $ID = ${r"#{"}$ID${r"}"}
53 53 </delete>
54 54  
55 55 <!-- 修改 -->
... ... @@ -63,9 +63,9 @@
63 63 </#if>
64 64 </#list>
65 65 NAME = ${r"#{"}NAME${r"}"},
66   - ${objectNameUpper}_ID = ${objectNameUpper}_ID
  66 + $ID = $ID
67 67 where
68   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  68 + $ID = ${r"#{"}$ID${r"}"}
69 69 </update>
70 70  
71 71 <!-- 通过ID获取数据 -->
... ... @@ -75,7 +75,7 @@
75 75 from
76 76 <include refid="tableName"></include>
77 77 where
78   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  78 + $ID = ${r"#{"}$ID${r"}"}
79 79 </select>
80 80  
81 81 <!-- 列表 -->
... ... @@ -85,8 +85,8 @@
85 85 from
86 86 <include refid="tableName"></include>
87 87 where 1=1
88   - <if test="pd.${objectNameUpper}_ID!= null and pd.${objectNameUpper}_ID != ''"><!-- 检索 -->
89   - and PARENT_ID = ${r"#{"}pd.${objectNameUpper}_ID${r"}"}
  88 + <if test="pd.$ID!= null and pd.$ID != ''"><!-- 检索 -->
  89 + and PARENT_ID = ${r"#{"}pd.$ID${r"}"}
90 90 </if>
91 91 <if test="pd.keywords!= null and pd.keywords != ''"><!-- 关键词检索 -->
92 92 and
... ...
resources/ftl/createTreeCode/mysql_SQL_Template.ftl
  View file @b980d59
... ... @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0;
6 6 -- ----------------------------
7 7 DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`;
8 8 CREATE TABLE `${tabletop}${objectNameUpper}` (
9   - `${objectNameUpper}_ID` varchar(100) NOT NULL,
  9 + `$ID` int(100) NOT NULL AUTO_INCREMENT,
10 10 `PARENT_ID` varchar(100) NOT NULL,
11 11 `NAME` varchar(100) NOT NULL,
12 12 <#list fieldList as var>
... ... @@ -18,5 +18,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` (
18 18 `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}',
19 19 </#if>
20 20 </#list>
21   - PRIMARY KEY (`${objectNameUpper}_ID`)
  21 + PRIMARY KEY (`$ID`)
22 22 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
... ...
resources/ftl_backups/createCode/controllerTemplate.ftl
  View file @b980d59
... ... @@ -49,7 +49,6 @@ public class ${objectName}Controller extends BaseController {
49 49 ModelAndView mv = this.getModelAndView();
50 50 PageData pd = new PageData();
51 51 pd = this.getPageData();
52   - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键
53 52 <#list fieldList as var>
54 53 <#if var[3] == "否">
55 54 <#if var[1] == 'Date'>
... ...
resources/ftl_backups/createCode/mapperMysqlTemplate.ftl
  View file @b980d59
... ... @@ -12,7 +12,7 @@
12 12 <#list fieldList as var>
13 13 ${var[0]},
14 14 </#list>
15   - ${objectNameUpper}_ID
  15 + $ID
16 16 </sql>
17 17  
18 18 <!-- 字段值 -->
... ... @@ -20,7 +20,7 @@
20 20 <#list fieldList as var>
21 21 ${r"#{"}${var[0]}${r"}"},
22 22 </#list>
23   - ${r"#{"}${objectNameUpper}_ID${r"}"}
  23 + ${r"#{"}$ID${r"}"}
24 24 </sql>
25 25  
26 26 <!-- 新增-->
... ... @@ -39,7 +39,7 @@
39 39 delete from
40 40 <include refid="tableName"></include>
41 41 where
42   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  42 + $ID = ${r"#{"}$ID${r"}"}
43 43 </delete>
44 44  
45 45 <!-- 修改 -->
... ... @@ -52,9 +52,9 @@
52 52 ${var[0]} = ${r"#{"}${var[0]}${r"}"},
53 53 </#if>
54 54 </#list>
55   - ${objectNameUpper}_ID = ${objectNameUpper}_ID
  55 + $ID = $ID
56 56 where
57   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  57 + $ID = ${r"#{"}$ID${r"}"}
58 58 </update>
59 59  
60 60 <!-- 通过ID获取数据 -->
... ... @@ -64,7 +64,7 @@
64 64 from
65 65 <include refid="tableName"></include>
66 66 where
67   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  67 + $ID = ${r"#{"}$ID${r"}"}
68 68 </select>
69 69  
70 70 <!-- 列表 -->
... ... @@ -99,7 +99,7 @@
99 99 delete from
100 100 <include refid="tableName"></include>
101 101 where
102   - ${objectNameUpper}_ID in
  102 + $ID in
103 103 <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
104 104 ${r"#{item}"}
105 105 </foreach>
... ...
resources/ftl_backups/createCode/mysql_SQL_Template.ftl
  View file @b980d59
... ... @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0;
6 6 -- ----------------------------
7 7 DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`;
8 8 CREATE TABLE `${tabletop}${objectNameUpper}` (
9   - `${objectNameUpper}_ID` varchar(100) NOT NULL,
  9 + `$ID` int(100) NOT NULL AUTO_INCREMENT,
10 10 <#list fieldList as var>
11 11 <#if var[1] == 'Integer'>
12 12 `${var[0]}` int(${var[5]}) NOT NULL COMMENT '${var[2]}',
... ... @@ -16,5 +16,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` (
16 16 `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}',
17 17 </#if>
18 18 </#list>
19   - PRIMARY KEY (`${objectNameUpper}_ID`)
  19 + PRIMARY KEY (`$ID`)
20 20 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
... ...
resources/ftl_backups/createFaCode/controllerTemplate.ftl
  View file @b980d59
... ... @@ -53,7 +53,6 @@ public class ${objectName}Controller extends BaseController {
53 53 ModelAndView mv = this.getModelAndView();
54 54 PageData pd = new PageData();
55 55 pd = this.getPageData();
56   - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键
57 56 <#list fieldList as var>
58 57 <#if var[3] == "否">
59 58 <#if var[1] == 'Date'>
... ...
resources/ftl_backups/createFaCode/mapperMysqlTemplate.ftl
  View file @b980d59
... ... @@ -12,7 +12,7 @@
12 12 <#list fieldList as var>
13 13 ${var[0]},
14 14 </#list>
15   - ${objectNameUpper}_ID
  15 + $ID
16 16 </sql>
17 17  
18 18 <!-- 字段值 -->
... ... @@ -20,7 +20,7 @@
20 20 <#list fieldList as var>
21 21 ${r"#{"}${var[0]}${r"}"},
22 22 </#list>
23   - ${r"#{"}${objectNameUpper}_ID${r"}"}
  23 + ${r"#{"}$ID${r"}"}
24 24 </sql>
25 25  
26 26 <!-- 新增-->
... ... @@ -39,7 +39,7 @@
39 39 delete from
40 40 <include refid="tableName"></include>
41 41 where
42   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  42 + $ID = ${r"#{"}$ID${r"}"}
43 43 </delete>
44 44  
45 45 <!-- 修改 -->
... ... @@ -52,9 +52,9 @@
52 52 ${var[0]} = ${r"#{"}${var[0]}${r"}"},
53 53 </#if>
54 54 </#list>
55   - ${objectNameUpper}_ID = ${objectNameUpper}_ID
  55 + $ID = $ID
56 56 where
57   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  57 + $ID = ${r"#{"}$ID${r"}"}
58 58 </update>
59 59  
60 60 <!-- 通过ID获取数据 -->
... ... @@ -64,7 +64,7 @@
64 64 from
65 65 <include refid="tableName"></include>
66 66 where
67   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  67 + $ID = ${r"#{"}$ID${r"}"}
68 68 </select>
69 69  
70 70 <!-- 列表 -->
... ... @@ -99,7 +99,7 @@
99 99 delete from
100 100 <include refid="tableName"></include>
101 101 where
102   - ${objectNameUpper}_ID in
  102 + $ID in
103 103 <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
104 104 ${r"#{item}"}
105 105 </foreach>
... ...
resources/ftl_backups/createFaCode/mysql_SQL_Template.ftl
  View file @b980d59
... ... @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0;
6 6 -- ----------------------------
7 7 DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`;
8 8 CREATE TABLE `${tabletop}${objectNameUpper}` (
9   - `${objectNameUpper}_ID` varchar(100) NOT NULL,
  9 + `$ID` int(100) NOT NULL AUTO_INCREMENT,
10 10 <#list fieldList as var>
11 11 <#if var[1] == 'Integer'>
12 12 `${var[0]}` int(${var[5]}) NOT NULL COMMENT '${var[2]}',
... ... @@ -16,5 +16,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` (
16 16 `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}',
17 17 </#if>
18 18 </#list>
19   - PRIMARY KEY (`${objectNameUpper}_ID`)
  19 + PRIMARY KEY (`$ID`)
20 20 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
... ...
resources/ftl_backups/createSoCode/controllerTemplate.ftl
  View file @b980d59
... ... @@ -49,7 +49,6 @@ public class ${objectName}Controller extends BaseController {
49 49 ModelAndView mv = this.getModelAndView();
50 50 PageData pd = new PageData();
51 51 pd = this.getPageData();
52   - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键
53 52 <#list fieldList as var>
54 53 <#if var[3] == "否">
55 54 <#if var[1] == 'Date'>
... ...
resources/ftl_backups/createSoCode/mapperMysqlTemplate.ftl
  View file @b980d59
... ... @@ -12,7 +12,7 @@
12 12 <#list fieldList as var>
13 13 ${var[0]},
14 14 </#list>
15   - ${objectNameUpper}_ID,
  15 + $ID,
16 16 ${faobject}_ID
17 17 </sql>
18 18  
... ... @@ -21,7 +21,7 @@
21 21 <#list fieldList as var>
22 22 ${r"#{"}${var[0]}${r"}"},
23 23 </#list>
24   - ${r"#{"}${objectNameUpper}_ID${r"}"},
  24 + ${r"#{"}$ID${r"}"},
25 25 ${r"#{"}${faobject}_ID${r"}"}
26 26 </sql>
27 27  
... ... @@ -41,7 +41,7 @@
41 41 delete from
42 42 <include refid="tableName"></include>
43 43 where
44   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  44 + $ID = ${r"#{"}$ID${r"}"}
45 45 </delete>
46 46  
47 47 <!-- 修改 -->
... ... @@ -54,9 +54,9 @@
54 54 ${var[0]} = ${r"#{"}${var[0]}${r"}"},
55 55 </#if>
56 56 </#list>
57   - ${objectNameUpper}_ID = ${objectNameUpper}_ID
  57 + $ID = $ID
58 58 where
59   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  59 + $ID = ${r"#{"}$ID${r"}"}
60 60 </update>
61 61  
62 62 <!-- 通过ID获取数据 -->
... ... @@ -66,7 +66,7 @@
66 66 from
67 67 <include refid="tableName"></include>
68 68 where
69   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  69 + $ID = ${r"#{"}$ID${r"}"}
70 70 </select>
71 71  
72 72 <!-- 列表 -->
... ... @@ -102,7 +102,7 @@
102 102 delete from
103 103 <include refid="tableName"></include>
104 104 where
105   - ${objectNameUpper}_ID in
  105 + $ID in
106 106 <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
107 107 ${r"#{item}"}
108 108 </foreach>
... ...
resources/ftl_backups/createSoCode/mysql_SQL_Template.ftl
  View file @b980d59
... ... @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0;
6 6 -- ----------------------------
7 7 DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`;
8 8 CREATE TABLE `${tabletop}${objectNameUpper}` (
9   - `${objectNameUpper}_ID` varchar(100) NOT NULL,
  9 + `$ID` int(100) NOT NULL AUTO_INCREMENT,
10 10 `${faobject}_ID` varchar(100) NOT NULL,
11 11 <#list fieldList as var>
12 12 <#if var[1] == 'Integer'>
... ... @@ -17,5 +17,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` (
17 17 `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}',
18 18 </#if>
19 19 </#list>
20   - PRIMARY KEY (`${objectNameUpper}_ID`)
  20 + PRIMARY KEY (`$ID`)
21 21 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
... ...
resources/ftl_backups/createTreeCode/controllerTemplate.ftl
  View file @b980d59
... ... @@ -51,7 +51,6 @@ public class ${objectName}Controller extends BaseController {
51 51 ModelAndView mv = this.getModelAndView();
52 52 PageData pd = new PageData();
53 53 pd = this.getPageData();
54   - pd.put("${objectNameUpper}_ID", this.get32UUID()); //主键
55 54 <#list fieldList as var>
56 55 <#if var[3] == "否">
57 56 <#if var[1] == 'Date'>
... ...
resources/ftl_backups/createTreeCode/mapperMysqlTemplate.ftl
  View file @b980d59
... ... @@ -3,7 +3,7 @@
3 3 <mapper namespace="${objectName}Mapper">
4 4  
5 5 <resultMap type="${objectName}" id="${objectNameLower}ResultMap">
6   - <id column="${objectNameUpper}_ID" property="${objectNameUpper}_ID"/>
  6 + <id column="$ID" property="$ID"/>
7 7 <result column="NAME" property="NAME"/>
8 8 <result column="PARENT_ID" property="PARENT_ID"/>
9 9 </resultMap>
... ... @@ -18,7 +18,7 @@
18 18 <#list fieldList as var>
19 19 ${var[0]},
20 20 </#list>
21   - ${objectNameUpper}_ID,
  21 + $ID,
22 22 PARENT_ID,
23 23 NAME
24 24 </sql>
... ... @@ -28,7 +28,7 @@
28 28 <#list fieldList as var>
29 29 ${r"#{"}${var[0]}${r"}"},
30 30 </#list>
31   - ${r"#{"}${objectNameUpper}_ID${r"}"},
  31 + ${r"#{"}$ID${r"}"},
32 32 ${r"#{"}PARENT_ID${r"}"},
33 33 ${r"#{"}NAME${r"}"}
34 34 </sql>
... ... @@ -49,7 +49,7 @@
49 49 delete from
50 50 <include refid="tableName"></include>
51 51 where
52   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  52 + $ID = ${r"#{"}$ID${r"}"}
53 53 </delete>
54 54  
55 55 <!-- 修改 -->
... ... @@ -63,9 +63,9 @@
63 63 </#if>
64 64 </#list>
65 65 NAME = ${r"#{"}NAME${r"}"},
66   - ${objectNameUpper}_ID = ${objectNameUpper}_ID
  66 + $ID = $ID
67 67 where
68   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  68 + $ID = ${r"#{"}$ID${r"}"}
69 69 </update>
70 70  
71 71 <!-- 通过ID获取数据 -->
... ... @@ -75,7 +75,7 @@
75 75 from
76 76 <include refid="tableName"></include>
77 77 where
78   - ${objectNameUpper}_ID = ${r"#{"}${objectNameUpper}_ID${r"}"}
  78 + $ID = ${r"#{"}$ID${r"}"}
79 79 </select>
80 80  
81 81 <!-- 列表 -->
... ... @@ -85,8 +85,8 @@
85 85 from
86 86 <include refid="tableName"></include>
87 87 where 1=1
88   - <if test="pd.${objectNameUpper}_ID!= null and pd.${objectNameUpper}_ID != ''"><!-- 检索 -->
89   - and PARENT_ID = ${r"#{"}pd.${objectNameUpper}_ID${r"}"}
  88 + <if test="pd.$ID!= null and pd.$ID != ''"><!-- 检索 -->
  89 + and PARENT_ID = ${r"#{"}pd.$ID${r"}"}
90 90 </if>
91 91 <if test="pd.keywords!= null and pd.keywords != ''"><!-- 关键词检索 -->
92 92 and
... ...
resources/ftl_backups/createTreeCode/mysql_SQL_Template.ftl
  View file @b980d59
... ... @@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS=0;
6 6 -- ----------------------------
7 7 DROP TABLE IF EXISTS `${tabletop}${objectNameUpper}`;
8 8 CREATE TABLE `${tabletop}${objectNameUpper}` (
9   - `${objectNameUpper}_ID` varchar(100) NOT NULL,
  9 + `$ID` int(100) NOT NULL AUTO_INCREMENT,
10 10 `PARENT_ID` varchar(100) NOT NULL,
11 11 `NAME` varchar(100) NOT NULL,
12 12 <#list fieldList as var>
... ... @@ -18,5 +18,5 @@ CREATE TABLE `${tabletop}${objectNameUpper}` (
18 18 `${var[0]}` varchar(${var[5]}) DEFAULT NULL COMMENT '${var[2]}',
19 19 </#if>
20 20 </#list>
21   - PRIMARY KEY (`${objectNameUpper}_ID`)
  21 + PRIMARY KEY (`$ID`)
22 22 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
... ...
resources/mybatis1/sunvote/BasestationMapper.xml
  View file @b980d59
... ... @@ -17,7 +17,7 @@
17 17 PRODUCTION_TIME,
18 18 IS_OK,
19 19 REMARK,
20   - BASESTATION_ID
  20 + ID
21 21 </sql>
22 22  
23 23 <!-- 字段值 -->
... ... @@ -30,11 +30,15 @@
30 30 #{PRODUCTION_TIME},
31 31 #{IS_OK},
32 32 #{REMARK},
33   - #{BASESTATION_ID}
  33 + #{ID}
34 34 </sql>
35 35  
36 36 <!-- 新增-->
37 37 <insert id="save" parameterType="pd">
  38 + <selectKey keyProperty="ID" order="AFTER" resultType="pd">
  39 + <!-- SELECT LAST_INSERT_ID()：得到刚insert到数据表中的记录的主键值，只适用于自增主键 -->
  40 + SELECT LAST_INSERT_ID()
  41 + </selectKey>
38 42 insert into
39 43 <include refid="tableName"></include>
40 44 (
... ... @@ -63,7 +67,7 @@
63 67 delete from
64 68 <include refid="tableName"></include>
65 69 where
66   - BASESTATION_ID = #{BASESTATION_ID}
  70 + ID = #{ID}
67 71 </delete>
68 72  
69 73 <!-- 修改 -->
... ... @@ -79,9 +83,9 @@
79 83 PRODUCTION_TIME = #{PRODUCTION_TIME},
80 84 IS_OK = #{IS_OK},
81 85 REMARK = #{REMARK},
82   - BASESTATION_ID = BASESTATION_ID
  86 + ID = ID
83 87 where
84   - BASESTATION_ID = #{BASESTATION_ID}
  88 + ID = #{ID}
85 89 </update>
86 90  
87 91 <!-- 通过ID获取数据 -->
... ... @@ -91,7 +95,7 @@
91 95 from
92 96 <include refid="tableName"></include>
93 97 where
94   - BASESTATION_ID = #{BASESTATION_ID}
  98 + ID = #{ID}
95 99 </select>
96 100  
97 101 <!-- 列表 -->
... ... @@ -126,11 +130,10 @@
126 130 delete from
127 131 <include refid="tableName"></include>
128 132 where
129   - BASESTATION_ID in
  133 + ID in
130 134 <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
131 135 #{item}
132 136 </foreach>
133 137 </delete>
134 138  
135   - <!-- fh313596790qq(青苔) -->
136 139 </mapper>
137 140 \ No newline at end of file
... ...
resources/mybatis1/sunvote/KeypadMapper.xml 0 → 100644
  View file @b980d59
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="KeypadMapper">
  4 +
  5 + <!--表名 -->
  6 + <sql id="tableName">
  7 + SV_KEYPAD
  8 + </sql>
  9 +
  10 + <!-- 字段 -->
  11 + <sql id="Field">
  12 + NO,
  13 + SN,
  14 + IS_OK,
  15 + WORK_MODE,
  16 + PRODUCT_DATE,
  17 + ID
  18 + </sql>
  19 +
  20 + <!-- 字段值 -->
  21 + <sql id="FieldValue">
  22 + #{NO},
  23 + #{SN},
  24 + #{IS_OK},
  25 + #{WORK_MODE},
  26 + #{PRODUCT_DATE},
  27 + #{ID}
  28 + </sql>
  29 +
  30 + <!-- 新增-->
  31 + <insert id="save" parameterType="pd">
  32 + insert into
  33 + <include refid="tableName"></include>
  34 + (
  35 + NO,
  36 + SN,
  37 + IS_OK,
  38 + WORK_MODE,
  39 + PRODUCT_DATE
  40 + ) values (
  41 + #{NO},
  42 + #{SN},
  43 + #{IS_OK},
  44 + #{WORK_MODE},
  45 + #{PRODUCT_DATE}
  46 + )
  47 + </insert>
  48 +
  49 + <!-- 删除-->
  50 + <delete id="delete" parameterType="pd">
  51 + delete from
  52 + <include refid="tableName"></include>
  53 + where
  54 + ID = #{ID}
  55 + </delete>
  56 +
  57 + <!-- 修改 -->
  58 + <update id="edit" parameterType="pd">
  59 + update
  60 + <include refid="tableName"></include>
  61 + set
  62 + NO = #{NO},
  63 + SN = #{SN},
  64 + IS_OK = #{IS_OK},
  65 + WORK_MODE = #{WORK_MODE},
  66 + PRODUCT_DATE = #{PRODUCT_DATE},
  67 + ID = ID
  68 + where
  69 + ID = #{ID}
  70 + </update>
  71 +
  72 + <!-- 通过ID获取数据 -->
  73 + <select id="findById" parameterType="pd" resultType="pd">
  74 + select
  75 + <include refid="Field"></include>
  76 + from
  77 + <include refid="tableName"></include>
  78 + where
  79 + ID = #{ID}
  80 + </select>
  81 +
  82 + <!-- 列表 -->
  83 + <select id="datalistPage" parameterType="page" resultType="pd">
  84 + select
  85 + <include refid="Field"></include>
  86 + from
  87 + <include refid="tableName"></include>
  88 + where 1=1
  89 + <if test="pd.keywords!= null and pd.keywords != ''"><!-- 关键词检索 -->
  90 + and
  91 + (
  92 + <!-- 根据需求自己加检索条件
  93 + 字段1 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
  94 + or
  95 + 字段2 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
  96 + -->
  97 + )
  98 + </if>
  99 + </select>
  100 +
  101 + <!-- 列表(全部) -->
  102 + <select id="listAll" parameterType="pd" resultType="pd">
  103 + select
  104 + <include refid="Field"></include>
  105 + from
  106 + <include refid="tableName"></include>
  107 + </select>
  108 +
  109 + <!-- 批量删除 -->
  110 + <delete id="deleteAll" parameterType="String">
  111 + delete from
  112 + <include refid="tableName"></include>
  113 + where
  114 + ID in
  115 + <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
  116 + #{item}
  117 + </foreach>
  118 + </delete>
  119 +
  120 + <!-- fh313596790qq(青苔) -->
  121 +</mapper>
0 122 \ No newline at end of file
... ...
resources/mybatis1/sunvote/SchoolMapper.xml
  View file @b980d59
... ... @@ -14,7 +14,7 @@
14 14 PRESIDENT,
15 15 PHONE,
16 16 REMARK,
17   - SCHOOL_ID
  17 + ID
18 18 </sql>
19 19  
20 20 <!-- 字段值 -->
... ... @@ -24,7 +24,7 @@
24 24 #{PRESIDENT},
25 25 #{PHONE},
26 26 #{REMARK},
27   - #{SCHOOL_ID}
  27 + #{ID}
28 28 </sql>
29 29  
30 30 <!-- 新增-->
... ... @@ -51,7 +51,7 @@
51 51 delete from
52 52 <include refid="tableName"></include>
53 53 where
54   - SCHOOL_ID = #{SCHOOL_ID}
  54 + ID = #{ID}
55 55 </delete>
56 56  
57 57 <!-- 修改 -->
... ... @@ -64,9 +64,9 @@
64 64 PRESIDENT = #{PRESIDENT},
65 65 PHONE = #{PHONE},
66 66 REMARK = #{REMARK},
67   - SCHOOL_ID = SCHOOL_ID
  67 + ID = ID
68 68 where
69   - SCHOOL_ID = #{SCHOOL_ID}
  69 + ID = #{ID}
70 70 </update>
71 71  
72 72 <!-- 通过ID获取数据 -->
... ... @@ -76,7 +76,7 @@
76 76 from
77 77 <include refid="tableName"></include>
78 78 where
79   - SCHOOL_ID = #{SCHOOL_ID}
  79 + ID = #{ID}
80 80 </select>
81 81  
82 82 <!-- 列表 -->
... ... @@ -111,11 +111,19 @@
111 111 delete from
112 112 <include refid="tableName"></include>
113 113 where
114   - SCHOOL_ID in
  114 + ID in
115 115 <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
116 116 #{item}
117 117 </foreach>
118 118 </delete>
119 119  
  120 + <!-- max(id) -->
  121 + <select id="maxID" parameterType="pd" resultType="pd">
  122 + select
  123 + max(ID) as ID
  124 + from
  125 + <include refid="tableName"></include>
  126 + </select>
  127 +
120 128 <!-- fh313596790qq(青苔) -->
121 129 </mapper>
122 130 \ No newline at end of file
... ...
resources/mybatis1/sunvote/TeachingMaterialMapper.xml
  View file @b980d59
... ... @@ -14,7 +14,7 @@
14 14 GRADE_ID,
15 15 VERSION_CODE,
16 16 VERSION_NAME,
17   - TEACHINGMATERIAL_ID
  17 + ID
18 18 </sql>
19 19  
20 20 <!-- 字段值 -->
... ... @@ -24,7 +24,7 @@
24 24 #{GRADE_ID},
25 25 #{VERSION_CODE},
26 26 #{VERSION_NAME},
27   - #{TEACHINGMATERIAL_ID}
  27 + #{ID}
28 28 </sql>
29 29  
30 30 <!-- 新增-->
... ... @@ -43,7 +43,7 @@
43 43 delete from
44 44 <include refid="tableName"></include>
45 45 where
46   - TEACHINGMATERIAL_ID = #{TEACHINGMATERIAL_ID}
  46 + ID = #{ID}
47 47 </delete>
48 48  
49 49 <!-- 修改 -->
... ... @@ -56,9 +56,9 @@
56 56 GRADE_ID = #{GRADE_ID},
57 57 VERSION_CODE = #{VERSION_CODE},
58 58 VERSION_NAME = #{VERSION_NAME},
59   - TEACHINGMATERIAL_ID = TEACHINGMATERIAL_ID
  59 + ID = ID
60 60 where
61   - TEACHINGMATERIAL_ID = #{TEACHINGMATERIAL_ID}
  61 + ID = #{ID}
62 62 </update>
63 63  
64 64 <!-- 通过ID获取数据 -->
... ... @@ -68,7 +68,7 @@
68 68 from
69 69 <include refid="tableName"></include>
70 70 where
71   - TEACHINGMATERIAL_ID = #{TEACHINGMATERIAL_ID}
  71 + ID = #{ID}
72 72 </select>
73 73  
74 74 <!-- 列表 -->
... ... @@ -103,7 +103,7 @@
103 103 delete from
104 104 <include refid="tableName"></include>
105 105 where
106   - TEACHINGMATERIAL_ID in
  106 + ID in
107 107 <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
108 108 #{item}
109 109 </foreach>
... ...
src/com/fh/controller/api/ApiServer.java
  View file @b980d59
... ... @@ -32,9 +32,8 @@ public class ApiServer extends BaseController {
32 32 @ResponseBody
33 33 public Object schoolList() throws Exception{
34 34 PageData pd = this.getPageData();
35   - String id = pd.getString("id");
  35 + String id = pd.getString("ID");
36 36 if(id != null && !"".equals(id)){
37   - pd.put("SCHOOL_ID", pd.getString("id"));
38 37 PageData ret = schoolService.findById(pd);
39 38 ResponseGson<PageData> res = new ResponseGson();
40 39 res.setData(ret);
... ... @@ -50,11 +49,11 @@ public class ApiServer extends BaseController {
50 49 @ResponseBody
51 50 public Object schoolAdd() throws Exception{
52 51 PageData pd = this.getPageData();
53   - ResponseGson<PageData> res = new ResponseGson();
  52 + ResponseGson<Integer> res = new ResponseGson();
54 53 try {
55   - if (pd.get("name") != null) {
56   - schoolService.save(pd);
57   - res.setData(pd);
  54 + if (pd.get("NAME") != null) {
  55 + Integer id = schoolService.save(pd);
  56 + res.setData(id);
58 57 } else {
59 58 res.setDataError();
60 59 }
... ... @@ -69,11 +68,13 @@ public class ApiServer extends BaseController {
69 68 public Object schoolDelete() throws Exception{
70 69 ResponseGson<PageData> res = new ResponseGson();
71 70 PageData pd = this.getPageData();
72   - String id = pd.getString("id");
  71 + String id = pd.getString("ID");
73 72 if(id != null && !"".equals(id)){
74   - pd.put("SCHOOL_ID", pd.getString("id"));
75   - schoolService.delete(pd);
76   - res.setData(pd);
  73 + try {
  74 + schoolService.delete(pd);
  75 + } catch (Exception e) {
  76 + res.setDataError();
  77 + }
77 78 }else{
78 79 res.setDataError();
79 80 }
... ... @@ -85,11 +86,13 @@ public class ApiServer extends BaseController {
85 86 public Object schoolUpdate() throws Exception{
86 87 ResponseGson<PageData> res = new ResponseGson();
87 88 PageData pd = this.getPageData();
88   - String id = pd.getString("id");
  89 + String id = pd.getString("ID");
89 90 if(id != null && !"".equals(id)){
90   - pd.put("SCHOOL_ID", pd.getString("id"));
91   - schoolService.edit(pd);
92   - res.setData(pd);
  91 + try {
  92 + schoolService.edit(pd);
  93 + } catch (Exception e) {
  94 + res.setDataError();
  95 + }
93 96 }else{
94 97 res.setDataError();
95 98 }
... ... @@ -101,7 +104,7 @@ public class ApiServer extends BaseController {
101 104 @ResponseBody
102 105 public Object basestation() throws Exception{
103 106 PageData pd = this.getPageData();
104   - String id = pd.getString("id");
  107 + String id = pd.getString("ID");
105 108 if(id != null && !"".equals(id)){
106 109 pd.put("BASESTATION_ID", pd.getString("id"));
107 110 PageData ret = basestationService.findById(pd);
... ... @@ -117,13 +120,65 @@ public class ApiServer extends BaseController {
117 120  
118 121 }
119 122  
  123 + @RequestMapping(value="/basestation/add" ,produces="application/json;charset=UTF-8")
  124 + @ResponseBody
  125 + public Object basestationAdd() throws Exception {
  126 + ResponseGson<PageData> res = new ResponseGson();
  127 + PageData pd = this.getPageData();
  128 + if (pd.getString("NAME") != null) {
  129 + try {
  130 + basestationService.edit(pd);
  131 + } catch (Exception ex) {
  132 + res.setDataError();
  133 + }
  134 + }else{
  135 + res.setDataError();
  136 + }
  137 + return res.toJson();
  138 + }
  139 +
  140 + @RequestMapping(value="/basestation/delete" ,produces="application/json;charset=UTF-8")
  141 + @ResponseBody
  142 + public Object basestationDelete() throws Exception{
  143 + PageData pd = this.getPageData();
  144 + ResponseGson<PageData> res = new ResponseGson();
  145 + String id = pd.getString("ID");
  146 + if(id != null && !"".equals(id)){
  147 + try {
  148 + basestationService.delete(pd);
  149 + } catch (Exception e) {
  150 + res.setDataError();
  151 + }
  152 + }else{
  153 + res.setDataError();
  154 + }
  155 + return res.toJson();
  156 + }
  157 +
  158 + @RequestMapping(value="/basestation/update" ,produces="application/json;charset=UTF-8")
  159 + @ResponseBody
  160 + public Object basestationUpdate() throws Exception{
  161 + PageData pd = this.getPageData();
  162 + ResponseGson<PageData> res = new ResponseGson();
  163 + String id = pd.getString("ID");
  164 + if(id != null && !"".equals(id)){
  165 + try {
  166 + basestationService.edit(pd);
  167 + } catch (Exception e) {
  168 + res.setDataError();
  169 + }
  170 + }else{
  171 + res.setDataError();
  172 + }
  173 + return res.toJson();
  174 + }
  175 +
120 176 @RequestMapping(value="/keypad/list" ,produces="application/json;charset=UTF-8")
121 177 @ResponseBody
122 178 public Object keypad() throws Exception{
123 179 PageData pd = this.getPageData();
124   - String id = pd.getString("id");
  180 + String id = pd.getString("ID");
125 181 if(id != null && !"".equals(id)){
126   - pd.put("KEYPAD_ID", pd.getString("id"));
127 182 PageData ret = keypadService.findById(pd);
128 183 ResponseGson<PageData> res = new ResponseGson();
129 184 res.setData(ret);
... ... @@ -134,6 +189,55 @@ public class ApiServer extends BaseController {
134 189 res.setData(ret);
135 190 return res.toJson();
136 191 }
137   -
138 192 }
  193 +
  194 + @RequestMapping(value="/keypad/add" ,produces="application/json;charset=UTF-8")
  195 + @ResponseBody
  196 + public Object keypadAdd() throws Exception {
  197 + PageData pd = this.getPageData();
  198 + ResponseGson<PageData> res = new ResponseGson();
  199 + try {
  200 + keypadService.save(pd);
  201 + } catch (Exception ex) {
  202 + res.setDataError();
  203 + }
  204 + return res.toJson();
  205 + }
  206 +
  207 + @RequestMapping(value="/keypad/delete" ,produces="application/json;charset=UTF-8")
  208 + @ResponseBody
  209 + public Object keypadDelete() throws Exception{
  210 + PageData pd = this.getPageData();
  211 + ResponseGson<PageData> res = new ResponseGson();
  212 + String id = pd.getString("ID");
  213 + if(id != null && !"".equals(id)){
  214 + try {
  215 + keypadService.delete(pd);
  216 + } catch (Exception e) {
  217 + res.setDataError();
  218 + }
  219 + }else{
  220 + res.setDataError();
  221 + }
  222 + return res.toJson();
  223 + }
  224 +
  225 + @RequestMapping(value="/keypad/update" ,produces="application/json;charset=UTF-8")
  226 + @ResponseBody
  227 + public Object keypadUpdate() throws Exception{
  228 + PageData pd = this.getPageData();
  229 + ResponseGson<PageData> res = new ResponseGson();
  230 + String id = pd.getString("ID");
  231 + if(id != null && !"".equals(id)){
  232 + try{
  233 + keypadService.edit(pd);
  234 + }catch(Exception ex){
  235 + res.setDataError();
  236 + }
  237 + }else{
  238 + res.setDataError();
  239 + }
  240 + return res.toJson();
  241 + }
  242 +
139 243 }
... ...
src/com/fh/controller/api/ResponseGson.java 0 → 100644
  View file @b980d59
  1 +package com.fh.controller.api;
  2 +
  3 +import com.google.gson.Gson;
  4 +
  5 +public class ResponseGson<T> {
  6 +
  7 + private String code = "0";
  8 +
  9 + private String message = "success";
  10 +
  11 + private T data;
  12 +
  13 + public String getCode() {
  14 + return code;
  15 + }
  16 +
  17 + public void setCode(String code) {
  18 + this.code = code;
  19 + }
  20 +
  21 + public String getMessage() {
  22 + return message;
  23 + }
  24 +
  25 + public void setMessage(String message) {
  26 + this.message = message;
  27 + }
  28 +
  29 + public T getData() {
  30 + return data;
  31 + }
  32 +
  33 + public void setData(T data) {
  34 + this.data = data;
  35 + }
  36 +
  37 + public String toJson(){
  38 + Gson gson = new Gson();
  39 + return gson.toJson(this);
  40 + }
  41 +
  42 + @Override
  43 + public String toString() {
  44 + return "ResponseGson [code=" + code + ", message=" + message
  45 + + ", data=" + data + "]";
  46 + }
  47 +
  48 +
  49 + public void setSuccess(){
  50 + code = "0" ;
  51 + message = "success" ;
  52 + }
  53 +
  54 + public void setNetError(){
  55 + code = "-1" ;
  56 + message = "net error" ;
  57 + }
  58 +
  59 + public void setDataError(){
  60 + code = "-2" ;
  61 + message = "Data error" ;
  62 + }
  63 +}
... ...
src/com/fh/controller/sunvote/keypad/KeypadController.java 0 → 100644
  View file @b980d59
  1 +package com.fh.controller.sunvote.keypad;
  2 +
  3 +import java.io.PrintWriter;
  4 +import java.text.DateFormat;
  5 +import java.text.SimpleDateFormat;
  6 +import java.util.ArrayList;
  7 +import java.util.Date;
  8 +import java.util.HashMap;
  9 +import java.util.List;
  10 +import java.util.Map;
  11 +import javax.annotation.Resource;
  12 +import org.springframework.beans.propertyeditors.CustomDateEditor;
  13 +import org.springframework.stereotype.Controller;
  14 +import org.springframework.web.bind.WebDataBinder;
  15 +import org.springframework.web.bind.annotation.InitBinder;
  16 +import org.springframework.web.bind.annotation.RequestMapping;
  17 +import org.springframework.web.bind.annotation.ResponseBody;
  18 +import org.springframework.web.servlet.ModelAndView;
  19 +import com.fh.controller.base.BaseController;
  20 +import com.fh.entity.Page;
  21 +import com.fh.util.AppUtil;
  22 +import com.fh.util.ObjectExcelView;
  23 +import com.fh.util.PageData;
  24 +import com.fh.util.Jurisdiction;
  25 +import com.fh.util.Tools;
  26 +import com.fh.service.sunvote.keypad.KeypadManager;
  27 +
  28 +/**
  29 + * 说明：键盘管理
  30 + * 创建人：Elvis
  31 + * 创建时间：2018-04-19
  32 + */
  33 +@Controller
  34 +@RequestMapping(value="/keypad")
  35 +public class KeypadController extends BaseController {
  36 +
  37 + String menuUrl = "keypad/list.do"; //菜单地址(权限用)
  38 + @Resource(name="keypadService")
  39 + private KeypadManager keypadService;
  40 +
  41 + /**保存
  42 + * @param
  43 + * @throws Exception
  44 + */
  45 + @RequestMapping(value="/save")
  46 + public ModelAndView save() throws Exception{
  47 + logBefore(logger, Jurisdiction.getUsername()+"新增Keypad");
  48 + if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
  49 + ModelAndView mv = this.getModelAndView();
  50 + PageData pd = new PageData();
  51 + pd = this.getPageData();
  52 + pd.put("KEYPAD_ID", this.get32UUID()); //主键
  53 + keypadService.save(pd);
  54 + mv.addObject("msg","success");
  55 + mv.setViewName("save_result");
  56 + return mv;
  57 + }
  58 +
  59 + /**删除
  60 + * @param out
  61 + * @throws Exception
  62 + */
  63 + @RequestMapping(value="/delete")
  64 + public void delete(PrintWriter out) throws Exception{
  65 + logBefore(logger, Jurisdiction.getUsername()+"删除Keypad");
  66 + if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
  67 + PageData pd = new PageData();
  68 + pd = this.getPageData();
  69 + keypadService.delete(pd);
  70 + out.write("success");
  71 + out.close();
  72 + }
  73 +
  74 + /**修改
  75 + * @param
  76 + * @throws Exception
  77 + */
  78 + @RequestMapping(value="/edit")
  79 + public ModelAndView edit() throws Exception{
  80 + logBefore(logger, Jurisdiction.getUsername()+"修改Keypad");
  81 + if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
  82 + ModelAndView mv = this.getModelAndView();
  83 + PageData pd = new PageData();
  84 + pd = this.getPageData();
  85 + keypadService.edit(pd);
  86 + mv.addObject("msg","success");
  87 + mv.setViewName("save_result");
  88 + return mv;
  89 + }
  90 +
  91 + /**列表
  92 + * @param page
  93 + * @throws Exception
  94 + */
  95 + @RequestMapping(value="/list")
  96 + public ModelAndView list(Page page) throws Exception{
  97 + logBefore(logger, Jurisdiction.getUsername()+"列表Keypad");
  98 + //if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
  99 + ModelAndView mv = this.getModelAndView();
  100 + PageData pd = new PageData();
  101 + pd = this.getPageData();
  102 + String keywords = pd.getString("keywords"); //关键词检索条件
  103 + if(null != keywords && !"".equals(keywords)){
  104 + pd.put("keywords", keywords.trim());
  105 + }
  106 + page.setPd(pd);
  107 + List<PageData> varList = keypadService.list(page); //列出Keypad列表
  108 + mv.setViewName("sunvote/keypad/keypad_list");
  109 + mv.addObject("varList", varList);
  110 + mv.addObject("pd", pd);
  111 + mv.addObject("QX",Jurisdiction.getHC()); //按钮权限
  112 + return mv;
  113 + }
  114 +
  115 + /**去新增页面
  116 + * @param
  117 + * @throws Exception
  118 + */
  119 + @RequestMapping(value="/goAdd")
  120 + public ModelAndView goAdd()throws Exception{
  121 + ModelAndView mv = this.getModelAndView();
  122 + PageData pd = new PageData();
  123 + pd = this.getPageData();
  124 + mv.setViewName("sunvote/keypad/keypad_edit");
  125 + mv.addObject("msg", "save");
  126 + mv.addObject("pd", pd);
  127 + return mv;
  128 + }
  129 +
  130 + /**去修改页面
  131 + * @param
  132 + * @throws Exception
  133 + */
  134 + @RequestMapping(value="/goEdit")
  135 + public ModelAndView goEdit()throws Exception{
  136 + ModelAndView mv = this.getModelAndView();
  137 + PageData pd = new PageData();
  138 + pd = this.getPageData();
  139 + pd = keypadService.findById(pd); //根据ID读取
  140 + mv.setViewName("sunvote/keypad/keypad_edit");
  141 + mv.addObject("msg", "edit");
  142 + mv.addObject("pd", pd);
  143 + return mv;
  144 + }
  145 +
  146 + /**批量删除
  147 + * @param
  148 + * @throws Exception
  149 + */
  150 + @RequestMapping(value="/deleteAll")
  151 + @ResponseBody
  152 + public Object deleteAll() throws Exception{
  153 + logBefore(logger, Jurisdiction.getUsername()+"批量删除Keypad");
  154 + if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
  155 + PageData pd = new PageData();
  156 + Map<String,Object> map = new HashMap<String,Object>();
  157 + pd = this.getPageData();
  158 + List<PageData> pdList = new ArrayList<PageData>();
  159 + String DATA_IDS = pd.getString("DATA_IDS");
  160 + if(null != DATA_IDS && !"".equals(DATA_IDS)){
  161 + String ArrayDATA_IDS[] = DATA_IDS.split(",");
  162 + keypadService.deleteAll(ArrayDATA_IDS);
  163 + pd.put("msg", "ok");
  164 + }else{
  165 + pd.put("msg", "no");
  166 + }
  167 + pdList.add(pd);
  168 + map.put("list", pdList);
  169 + return AppUtil.returnObject(pd, map);
  170 + }
  171 +
  172 + /**导出到excel
  173 + * @param
  174 + * @throws Exception
  175 + */
  176 + @RequestMapping(value="/excel")
  177 + public ModelAndView exportExcel() throws Exception{
  178 + logBefore(logger, Jurisdiction.getUsername()+"导出Keypad到excel");
  179 + if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
  180 + ModelAndView mv = new ModelAndView();
  181 + PageData pd = new PageData();
  182 + pd = this.getPageData();
  183 + Map<String,Object> dataMap = new HashMap<String,Object>();
  184 + List<String> titles = new ArrayList<String>();
  185 + titles.add("编号"); //1
  186 + titles.add("SN号"); //2
  187 + titles.add("是否正常"); //3
  188 + titles.add("工作模式"); //4
  189 + titles.add("生产时间"); //5
  190 + dataMap.put("titles", titles);
  191 + List<PageData> varOList = keypadService.listAll(pd);
  192 + List<PageData> varList = new ArrayList<PageData>();
  193 + for(int i=0;i<varOList.size();i++){
  194 + PageData vpd = new PageData();
  195 + vpd.put("var1", varOList.get(i).getString("NO")); //1
  196 + vpd.put("var2", varOList.get(i).getString("SN")); //2
  197 + vpd.put("var3", varOList.get(i).get("IS_OK").toString()); //3
  198 + vpd.put("var4", varOList.get(i).get("WORK_MODE").toString()); //4
  199 + vpd.put("var5", varOList.get(i).getString("PRODUCT_DATE")); //5
  200 + varList.add(vpd);
  201 + }
  202 + dataMap.put("varList", varList);
  203 + ObjectExcelView erv = new ObjectExcelView();
  204 + mv = new ModelAndView(erv,dataMap);
  205 + return mv;
  206 + }
  207 +
  208 + @InitBinder
  209 + public void initBinder(WebDataBinder binder){
  210 + DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
  211 + binder.registerCustomEditor(Date.class, new CustomDateEditor(format,true));
  212 + }
  213 +}
... ...
src/com/fh/controller/system/createcode/CreateCodeController.java
  View file @b980d59
... ... @@ -102,21 +102,21 @@ public class CreateCodeController extends BaseController {
102 102 pd = this.getPageData();
103 103 save(pd); //保存到数据库
104 104 /* ============================================================================================= */
105   - String faobject = pd.getString("faobject"); //主表名 ========参数0-1 主附结构用
  105 + String faobject = pd.getString("FAOBJECT"); //主表名 ========参数0-1 主附结构用
106 106 String FHTYPE = pd.getString("FHTYPE"); //模块类型 ========参数0-2 类型，单表、树形结构、主表明细表
107 107 String TITLE = pd.getString("TITLE"); //说明 ========参数0
108   - String packageName = pd.getString("packageName"); //包名 ========参数1
109   - String objectName = pd.getString("objectName"); //类名 ========参数2
110   - String tabletop = pd.getString("tabletop"); //表前缀 ========参数3
  108 + String packageName = pd.getString("PACKAGENAME"); //包名 ========参数1
  109 + String objectName = pd.getString("OBJECTNAME"); //类名 ========参数2
  110 + String tabletop = pd.getString("TABLETOP"); //表前缀 ========参数3
111 111 tabletop = null == tabletop?"":tabletop.toUpperCase(); //表前缀转大写
112   - String zindext = pd.getString("zindex"); //属性总数
  112 + String zindext = pd.getString("ZINDEX"); //属性总数
113 113 int zindex = 0;
114 114 if(null != zindext && !"".equals(zindext)){
115 115 zindex = Integer.parseInt(zindext);
116 116 }
117 117 List<String[]> fieldList = new ArrayList<String[]>(); //属性集合 ========参数4
118 118 for(int i=0; i< zindex; i++){
119   - fieldList.add(pd.getString("field"+i).split(",fh,")); //属性放到集合里面
  119 + fieldList.add(pd.getString("FIELD"+i).split(",fh,")); //属性放到集合里面
120 120 }
121 121 Map<String,Object> root = new HashMap<String,Object>(); //创建数据模型
122 122 root.put("fieldList", fieldList);
... ... @@ -175,9 +175,9 @@ public class CreateCodeController extends BaseController {
175 175 * @throws Exception
176 176 */
177 177 public void save(PageData pd) throws Exception{
178   - pd.put("PACKAGENAME", pd.getString("packageName")); //包名
179   - pd.put("OBJECTNAME", pd.getString("objectName")); //类名
180   - pd.put("TABLENAME", pd.getString("tabletop")+",fh,"+pd.getString("objectName").toUpperCase()); //表名
  178 + pd.put("PACKAGENAME", pd.getString("PACKAGENAME")); //包名
  179 + pd.put("OBJECTNAME", pd.getString("OBJECTNAME")); //类名
  180 + pd.put("TABLENAME", pd.getString("TABLETOP")+",fh,"+pd.getString("OBJECTNAME").toUpperCase()); //表名
181 181 pd.put("FIELDLIST", pd.getString("FIELDLIST")); //属性集合
182 182 pd.put("CREATETIME", DateUtil.getTime()); //创建时间
183 183 pd.put("TITLE", pd.getString("TITLE")); //说明
... ...
src/com/fh/plugin/PagePlugin.java
  View file @b980d59
... ... @@ -40,7 +40,7 @@ import com.fh.util.Tools;
40 40 * 类描述：
41 41 * @author FH
42 42 * 作者单位：
43   -* 联系方式：qq313596790
  43 +* 联系方式：
44 44 * 修改时间：2016年2月1日
45 45 * @version 1.0
46 46 */
... ...
src/com/fh/service/sunvote/keypad/KeypadManager.java 0 → 100644
  View file @b980d59
  1 +package com.fh.service.sunvote.keypad;
  2 +
  3 +import java.util.List;
  4 +import com.fh.entity.Page;
  5 +import com.fh.util.PageData;
  6 +
  7 +/**
  8 + * 说明： 键盘管理接口
  9 + * 创建人：Elvis
  10 + * 创建时间：2018-04-19
  11 + * @version
  12 + */
  13 +public interface KeypadManager{
  14 +
  15 + /**新增
  16 + * @param pd
  17 + * @throws Exception
  18 + */
  19 + public void save(PageData pd)throws Exception;
  20 +
  21 + /**删除
  22 + * @param pd
  23 + * @throws Exception
  24 + */
  25 + public void delete(PageData pd)throws Exception;
  26 +
  27 + /**修改
  28 + * @param pd
  29 + * @throws Exception
  30 + */
  31 + public void edit(PageData pd)throws Exception;
  32 +
  33 + /**列表
  34 + * @param page
  35 + * @throws Exception
  36 + */
  37 + public List<PageData> list(Page page)throws Exception;
  38 +
  39 + /**列表(全部)
  40 + * @param pd
  41 + * @throws Exception
  42 + */
  43 + public List<PageData> listAll(PageData pd)throws Exception;
  44 +
  45 + /**通过id获取数据
  46 + * @param pd
  47 + * @throws Exception
  48 + */
  49 + public PageData findById(PageData pd)throws Exception;
  50 +
  51 + /**批量删除
  52 + * @param ArrayDATA_IDS
  53 + * @throws Exception
  54 + */
  55 + public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
  56 +
  57 +}
  58 +
... ...
src/com/fh/service/sunvote/keypad/impl/KeypadService.java 0 → 100644
  View file @b980d59
  1 +package com.fh.service.sunvote.keypad.impl;
  2 +
  3 +import java.util.List;
  4 +import javax.annotation.Resource;
  5 +import org.springframework.stereotype.Service;
  6 +import com.fh.dao.DaoSupport;
  7 +import com.fh.entity.Page;
  8 +import com.fh.util.PageData;
  9 +import com.fh.service.sunvote.keypad.KeypadManager;
  10 +
  11 +/**
  12 + * 说明： 键盘管理
  13 + * 创建人：Elvis
  14 + * 创建时间：2018-04-19
  15 + * @version
  16 + */
  17 +@Service("keypadService")
  18 +public class KeypadService implements KeypadManager{
  19 +
  20 + @Resource(name = "daoSupport")
  21 + private DaoSupport dao;
  22 +
  23 + /**新增
  24 + * @param pd
  25 + * @throws Exception
  26 + */
  27 + public void save(PageData pd)throws Exception{
  28 + dao.save("KeypadMapper.save", pd);
  29 + }
  30 +
  31 + /**删除
  32 + * @param pd
  33 + * @throws Exception
  34 + */
  35 + public void delete(PageData pd)throws Exception{
  36 + dao.delete("KeypadMapper.delete", pd);
  37 + }
  38 +
  39 + /**修改
  40 + * @param pd
  41 + * @throws Exception
  42 + */
  43 + public void edit(PageData pd)throws Exception{
  44 + dao.update("KeypadMapper.edit", pd);
  45 + }
  46 +
  47 + /**列表
  48 + * @param page
  49 + * @throws Exception
  50 + */
  51 + @SuppressWarnings("unchecked")
  52 + public List<PageData> list(Page page)throws Exception{
  53 + return (List<PageData>)dao.findForList("KeypadMapper.datalistPage", page);
  54 + }
  55 +
  56 + /**列表(全部)
  57 + * @param pd
  58 + * @throws Exception
  59 + */
  60 + @SuppressWarnings("unchecked")
  61 + public List<PageData> listAll(PageData pd)throws Exception{
  62 + return (List<PageData>)dao.findForList("KeypadMapper.listAll", pd);
  63 + }
  64 +
  65 + /**通过id获取数据
  66 + * @param pd
  67 + * @throws Exception
  68 + */
  69 + public PageData findById(PageData pd)throws Exception{
  70 + return (PageData)dao.findForObject("KeypadMapper.findById", pd);
  71 + }
  72 +
  73 + /**批量删除
  74 + * @param ArrayDATA_IDS
  75 + * @throws Exception
  76 + */
  77 + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
  78 + dao.delete("KeypadMapper.deleteAll", ArrayDATA_IDS);
  79 + }
  80 +
  81 +}
  82 +
... ...
src/com/fh/service/sunvote/school/SchoolManager.java
  View file @b980d59
... ... @@ -16,7 +16,7 @@ public interface SchoolManager{
16 16 * @param pd
17 17 * @throws Exception
18 18 */
19   - public void save(PageData pd)throws Exception;
  19 + public Integer save(PageData pd)throws Exception;
20 20  
21 21 /**删除
22 22 * @param pd
... ...
src/com/fh/service/sunvote/school/impl/SchoolService.java
  View file @b980d59
... ... @@ -24,8 +24,8 @@ public class SchoolService implements SchoolManager{
24 24 * @param pd
25 25 * @throws Exception
26 26 */
27   - public void save(PageData pd)throws Exception{
28   - dao.save("SchoolMapper.save", pd);
  27 + public Integer save(PageData pd)throws Exception{
  28 + return (Integer)dao.save("SchoolMapper.save", pd);
29 29 }
30 30  
31 31 /**删除
... ...
src/com/fh/util/Freemarker.java
  View file @b980d59
... ... @@ -45,20 +45,24 @@ public class Freemarker {
45 45 * @param filePath 输出前的文件上部路径
46 46 */
47 47 public static void printFile(String ftlName, Map<String,Object> root, String outFile, String filePath, String ftlPath) throws Exception{
  48 + Writer out = null;
48 49 try {
49 50 File file = new File(PathUtil.getClasspath() + filePath + outFile);
50 51 if(!file.getParentFile().exists()){ //判断有没有父路径，就是判断文件整个路径是否存在
51 52 file.getParentFile().mkdirs(); //不存在就全部创建
52 53 }
53   - Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "utf-8"));
  54 + out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "utf-8"));
54 55 Template template = getTemplate(ftlName, ftlPath);
55 56 template.process(root, out); //模版输出
56 57 out.flush();
57   - out.close();
58 58 } catch (TemplateException e) {
59 59 e.printStackTrace();
60 60 } catch (IOException e) {
61 61 e.printStackTrace();
  62 + }finally{
  63 + if(out != null){
  64 + out.close();
  65 + }
62 66 }
63 67 }
64 68  
... ...
src/com/fh/util/PageData.java
  View file @b980d59
... ... @@ -46,7 +46,7 @@ public class PageData extends HashMap implements Map{
46 46 }else{
47 47 value = valueObj.toString();
48 48 }
49   - returnMap.put(name, value);
  49 + returnMap.put(name.toUpperCase(), value);
50 50 }
51 51 map = returnMap;
52 52 }
... ...