Home Explore Help
Sign In
guozi_sys
/
daxt
Watch 2
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

卷内目录新增、修改异常处理

hanzhen 3 years ago
parent
35b94c2d70
commit
3ce762eef4
5 changed files with 184 additions and 21 deletions
Unified View Show Diff Stats
  1. 7 13
      src/main/java/com/gz/controller/archive/SecondaryArchiveController.java
  2. 2 1
      src/main/java/com/gz/service/archive/SecondaryArchiveService.java
  3. 4 3
      src/main/java/com/gz/service/archive/impl/SecondaryArchiveServiceImpl.java
  4. 167 0
      src/main/resources/static/page/archive/editSecondaryNew.html
  5. 4 4
      src/main/resources/static/page/archive/secondaryList.html

+ 7 - 13
src/main/java/com/gz/controller/archive/SecondaryArchiveController.java
View File 

@@ -8,6 +8,7 @@ import com.gz.vo.PageVO;
 
 import com.gz.vo.archive.SecondaryArchiveInsertVO;
 
 import com.gz.vo.archive.SecondaryArchiveInsertVO;
 
 import com.gz.vo.archive.SecondaryArchiveVO;
 
 import com.gz.vo.archive.SecondaryArchiveVO;
 
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.*;
 
+import org.springframework.web.multipart.MultipartFile;
 
 
 
 import javax.annotation.Resource;
 
 import javax.annotation.Resource;
 
 import java.util.List;
 
 import java.util.List;
 
@@ -28,9 +29,12 @@ public class SecondaryArchiveController {
 
      * @author LiuChangLan
 
      * @author LiuChangLan
 
      * @since 2020/9/4 14:46
 
      * @since 2020/9/4 14:46
 
      */
 
      */
 
-    @PostMapping("insert")
 
-    Integer insert(SecondaryArchiveInsertVO dto) throws Exception {
 
-        return service.insert(dto);
 
+    @PostMapping("save")
 
+    Integer insert(SecondaryArchiveDTO dto,@RequestParam("uploadFile") MultipartFile uploadFile) throws Exception {
 
+        if(null != dto.getId()){
 
+            return service.update(dto);
 
+        }
 
+        return service.insert(dto,uploadFile);
 
     }
 
     }
 
 
 
     /**
 
     /**
 
@@ -44,16 +48,6 @@ public class SecondaryArchiveController {
 
     }
 
     }
 
 
 
     /**
 
     /**
 
-     * @description 改
 
-     * @author LiuChangLan
 
-     * @since 2020/9/4 14:46
 
-     */
 
-    @PostMapping("update")
 
-    Integer update(@RequestBody SecondaryArchiveDTO dto) {
 
-        return service.update(dto);
 
-    }
 
-
 
-    /**
 
      * @description 分页查询
 
      * @description 分页查询
 
      * @author LiuChangLan
 
      * @author LiuChangLan
 
      * @since 2020/9/4 14:46
 
      * @since 2020/9/4 14:46

+ 2 - 1
src/main/java/com/gz/service/archive/SecondaryArchiveService.java
View File 

@@ -7,6 +7,7 @@ import com.gz.vo.PageVO;
 
 import com.gz.vo.archive.SecondaryArchiveInsertVO;
 
 import com.gz.vo.archive.SecondaryArchiveInsertVO;
 
 import com.gz.vo.archive.SecondaryArchiveVO;
 
 import com.gz.vo.archive.SecondaryArchiveVO;
 
 import com.sun.javafx.image.IntPixelGetter;
 
 import com.sun.javafx.image.IntPixelGetter;
 
+import org.springframework.web.multipart.MultipartFile;
 
 
 
 import java.util.List;
 
 import java.util.List;
 
 
 
@@ -16,7 +17,7 @@ public interface SecondaryArchiveService {
 
      * @author LiuChangLan
 
      * @author LiuChangLan
 
      * @since 2020/9/4 14:46
 
      * @since 2020/9/4 14:46
 
      */
 
      */
 
-    Integer insert(SecondaryArchiveInsertVO dto) throws Exception;
 
+    Integer insert(SecondaryArchiveDTO dto, MultipartFile uploadFile) throws Exception;
 
 
 
     /**
 
     /**
 
      * @description 删
 
      * @description 删

+ 4 - 3
src/main/java/com/gz/service/archive/impl/SecondaryArchiveServiceImpl.java
View File 

@@ -16,6 +16,7 @@ import com.gz.vo.archive.SecondaryArchiveVO;
 
 import org.apache.catalina.webresources.JarWarResource;
 
 import org.apache.catalina.webresources.JarWarResource;
 
 import org.springframework.stereotype.Service;
 
 import org.springframework.stereotype.Service;
 
 import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.transaction.annotation.Transactional;
 
+import org.springframework.web.multipart.MultipartFile;
 
 
 
 import javax.annotation.Resource;
 
 import javax.annotation.Resource;
 
 import java.util.List;
 
 import java.util.List;
 
@@ -35,13 +36,13 @@ public class SecondaryArchiveServiceImpl implements SecondaryArchiveService {
 
 
 
     @Override
 
     @Override
 
     @Transactional
 
     @Transactional
 
-    public Integer insert(SecondaryArchiveInsertVO dto) throws Exception {
 
+    public Integer insert(SecondaryArchiveDTO dto,MultipartFile uploadFile) throws Exception {
 
         dto.setCreated(JwtUtils.getCurrentUserJwtPayload().getId());
 
         dto.setCreated(JwtUtils.getCurrentUserJwtPayload().getId());
 
         // 插入
 
         // 插入
 
         Integer i = secondaryArchiveMapper.insertSelective(dto);
 
         Integer i = secondaryArchiveMapper.insertSelective(dto);
 
         // 上传附件
 
         // 上传附件
 
-        if (dto.getFile() != null){
 
-            archiveFileService.upload(dto.getFile(),dto.getArchiveId(),0,dto.getArchiveId());
 
+        if (uploadFile != null){
 
+            archiveFileService.upload(uploadFile,dto.getArchiveId(),0,dto.getArchiveId());
 
         }
 
         }
 
         return i;
 
         return i;
 
     }
 
     }

+ 167 - 0
src/main/resources/static/page/archive/editSecondaryNew.html
View File 

@@ -0,0 +1,167 @@
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+    <meta charset="utf-8">
 
+    <title>layui</title>
 
+    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
 
+    <link rel="stylesheet" href="../../css/public.css" media="all">
 
+    <link rel="stylesheet" href="../../lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
 
+    <style>
 
+        body { background-color: #ffffff;}
 
+        .layui-form-label { padding-left: 0;}
 
+        .layui-form-item {  text-align: center;}
 
+    </style>
 
+</head>
 
+<body>
 
+<form class="layui-form layuimini-form" lay-filter="saveSecondary" id="saveSecondaryId" style="text-aglin:center">
 
+    <div class="layui-form-item">
 
+        <label class="layui-form-label required">顺序号：</label>
 
+        <div class="layui-input-block" >
 
+            <input id="id" name="id" type="hidden">
 
+            <input id="archiveId" name="archiveId" type="hidden">
 
+            <input type="text" class="layui-input" placeholder="请输入顺序号" name="sxh" id="sxh" lay-filter="sxh"
 
+                   lay-verify="required" lay-reqtext="顺序号不能为空">
 
+        </div>
 
+    </div>
 
+
 
+    <div class="layui-form-item">
 
+        <label class="layui-form-label required">题名：</label>
 
+        <div class="layui-input-block">
 
+            <input type="text" class="layui-input" placeholder="请输入题名" name="tm" id="tm" lay-filter="tm"
 
+                   lay-verify="required" lay-reqtext="题名不能为空">
 
+        </div>
 
+    </div>
 
+
 
+    <div class="layui-form-item">
 
+        <label class="layui-form-label required">日期：</label>
 
+        <div class="layui-input-block">
 
+            <input type="text" class="layui-input" placeholder="请选择日期" name="rq" id="rq" lay-filter="rq"
 
+                   lay-verify="required" lay-reqtext="日期不能为空">
 
+        </div>
 
+    </div>
 
+
 
+    <div class="layui-form-item">
 
+        <label class="layui-form-label required">页号：</label>
 
+        <div class="layui-input-block">
 
+            <input type="number" class="layui-input" placeholder="请输入页号" value="1" name="yh" id="yh"
 
+                   lay-filter="yh" lay-verify="required" lay-reqtext="页号不能为空">
 
+        </div>
 
+    </div>
 
+
 
+    <div class="layui-form-item">
 
+        <label class="layui-form-label required">文号：</label>
 
+        <div class="layui-input-block">
 
+            <input type="text" class="layui-input" placeholder="请输入文号" name="wh" id="wh"
 
+                   lay-filter="wh" lay-verify="required" lay-reqtext="文号不能为空">
 
+        </div>
 
+    </div>
 
+
 
+    <div class="layui-form-item">
 
+        <label class="layui-form-label required">责任者：</label>
 
+        <div class="layui-input-block">
 
+            <input type="text" class="layui-input" placeholder="请输入责任者" name="zrz" id="zrz"
 
+                   lay-filter="zrz" lay-verify="required" lay-reqtext="责任者不能为空">
 
+        </div>
 
+    </div>
 
+
 
+    <div class="layui-form-item">
 
+        <label class="layui-form-label required">文件：</label>
 
+        <div class="layui-input-block">
 
+            <div class="layui-input-inline" >
 
+                <input type="file" id="uploadFile" name="uploadFile"/>
 
+            </div>
 
+        </div>
 
+    </div>
 
+
 
+    <div class="layui-form-item">
 
+        <label class="layui-form-label">备注：</label>
 
+        <div class="layui-input-block" >
 
+            <textarea class="layui-textarea" name="bz" placeholder="请输入备注"></textarea>
 
+        </div>
 
+    </div>
 
+    <div class="layui-form-item">
 
+        <button class="layui-btn layui-btn"  id="cancel" style="background-color: white;color:#1E9FFF;border: 1px solid #1E9FFF">取消</button>
 
+        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">保存</button>
 
+    </div>
 
+</form>
 
+<script src="../../lib/layui-v2.5.5/layui.js" charset="utf-8"></script>
 
+<script src="../../js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 
+<script>
 
+    function RequestParameter(){
 
+        let url = window.location.search; //获取url中"?"符后的字串
 
+        let theRequest = new Object();
 
+        if (url.indexOf("?") != -1) {
 
+            var str = url.substr(1);
 
+            var strs = str.split("&");
 
+            for(var i = 0; i < strs.length; i ++) {
 
+                theRequest[strs[i].split("=")[0]]=(strs[i].split("=")[1]);
 
+            }
 
+        }
 
+        return theRequest
 
+    }
 
+    layui.use(['form', 'http', 'laydate', 'upload', 'url'], function () {
 
+        var form = layui.form,
 
+            layer = layui.layer,
 
+            http = layui.http,
 
+            $ = layui.$,
 
+            laydate = layui.laydate
 
+        const urlParam = layui.url()
 
+
 
+        /** 初始化日期控件*/
 
+        let initDate = function () {
 
+            laydate.render({
 
+                elem: '#rq',
 
+                type: 'date',
 
+                trigger: 'click',
 
+            });
 
+        }
 
+        // 保存方法
 
+        let save = function (data, method) {
 
+            let formData = new FormData($('#saveSecondaryId')[0]);
 
+            http.post('secondary/archive/save', formData, true, function (res) {
 
+                if (res.code == 200) {
 
+                    let index = layer.alert('保存成功!', {
 
+                        title: urlParam.id == '' ? '添加' : '修改' + '信息'
 
+                    }, function () {
 
+                        if (method == 'save') {
 
+                            // 关闭弹出层
 
+                            let iframeIndex = parent.layer.getFrameIndex(window.name);
 
+                            parent.layer.close(iframeIndex);
 
+                        }
 
+                        layer.close(index);
 
+                    });
 
+                }
 
+            })
 
+        }
 
+        // 加载数据
 
+        let initData = function () {
 
+            var id = RequestParameter()["id"];
 
+            var archiveId = RequestParameter()["archiveId"];
 
+            console.log("id="+id,"archiveId="+archiveId);
 
+            $("#id").val(id);
 
+            $("#archiveId").val(archiveId);
 
+            let adata = ''
 
+            if (urlParam.id != '') {
 
+                http.get('secondary/archive/selectByPrimaryKey', {
 
+                    id: urlParam.id
 
+                }, false, function (res) {
 
+                    adata = res.data
 
+                    form.val("saveSecondary", res.data);
 
+                    form.render();
 
+                })
 
+            }
 
+        }
 
+        initDate()
 
+        initData()
 
+        //监听提交
 
+        form.on('submit(saveBtn)', function (data) {
 
+            save(data.field, 'save')
 
+        });
 
+        layui.$('#cancel').on('click', function () {
 
+            let index = parent.layer.getFrameIndex(window.name);
 
+            parent.layer.close(index);//关闭当前页
 
+        });
 
+    });
 
+</script>
 
+</body>
 
+</html>

+ 4 - 4
src/main/resources/static/page/archive/secondaryList.html
View File 

@@ -121,6 +121,7 @@
 
         }
 
         }
 
 
 
         let add = function () {
 
         let add = function () {
 
+            console.log('&add archiveId=' + archive_id);
 
             var index = layer.open({
 
             var index = layer.open({
 
                 title: '添加卷内目录',
 
                 title: '添加卷内目录',
 
                 type: 2,
 
                 type: 2,
 
@@ -128,7 +129,7 @@
 
                 maxmin: true,
 
                 maxmin: true,
 
                 shadeClose: true,
 
                 shadeClose: true,
 
                 area: ['600px', '600px'],
 
                 area: ['600px', '600px'],
 
-                content: './editSecondary.html?archive_id=' + archive_id,
 
+                content: './editSecondaryNew.html?archiveId=' + archive_id,
 
                 success: function (layero, index) {
 
                 success: function (layero, index) {
 
                 },
 
                 },
 
                 end: function () {
 
                 end: function () {
 
@@ -136,9 +137,8 @@
 
                 }
 
                 }
 
             });
 
             });
 
         }
 
         }
 
-
 
-
 
         let update = function (data) {
 
         let update = function (data) {
 
+            console.log('&update archiveId=' + archive_id);
 
             var index = layer.open({
 
             var index = layer.open({
 
                 title: '修改卷内目录',
 
                 title: '修改卷内目录',
 
                 type: 2,
 
                 type: 2,
 
@@ -146,7 +146,7 @@
 
                 maxmin: true,
 
                 maxmin: true,
 
                 shadeClose: true,
 
                 shadeClose: true,
 
                 area: ['600px', '600px'],
 
                 area: ['600px', '600px'],
 
-                content: './editSecondary.html?id=' + data.id + '&archive_id=' + archive_id,
 
+                content: './editSecondaryNew.html?id=' + data.id + '&archiveId=' + archive_id,
 
                 success: function (layero, index) {
 
                 success: function (layero, index) {
 
                 },
 
                 },
 
                 end: function () {
 
                 end: function () {