新增websocket 保持用户在线

档案树完成
各个功能完善

pom.xml

@@ -105,6 +105,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <!-- webSocket-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
         <!--        单元测试模块-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/gz/config/WebSocketConfig.java

@@ -0,0 +1,26 @@
+package com.gz.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * @author LiuchangLan
+ * @date 2020/8/7 9:50
+ */
+@Slf4j
+@Configuration
+public class WebSocketConfig {
+
+    /**
+     * ServerEndpointExporter 作用
+     * 这个Bean会自动注册使用@ServerEndpoint注解声明的websocket endpoint
+     * @return
+     */
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        log.info("加载ServerEndpoint扫描");
+        return new ServerEndpointExporter();
+    }
+}

src/main/java/com/gz/controller/archive/ArchiveController.java

@@ -0,0 +1,16 @@
+package com.gz.controller.archive;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 档案管理控制器
+ * @author LiuchangLan
+ * @date 2021/2/23 18:13
+ */
+@RestController
+@RequestMapping("archive/archive")
+public class ArchiveController {
+
+
+}

src/main/java/com/gz/controller/system/ArchivesTreeController.java

@@ -0,0 +1,68 @@
+package com.gz.controller.system;
+
+import cn.hutool.core.lang.tree.Tree;
+import com.gz.core.annotation.TraceLog;
+import com.gz.dto.system.ArchivesTreeDTO;
+import com.gz.service.system.ArchivesTreeService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 档案树控制器
+ *
+ * @author LiuchangLan
+ * @date 2021/2/23 16:10
+ */
+@RestController
+@RequestMapping("system/archivesTree")
+public class ArchivesTreeController {
+    @Resource
+    private ArchivesTreeService service;
+
+    @PostMapping("insert")
+    Integer insert(@RequestBody ArchivesTreeDTO dto) {
+        return service.insert(dto);
+    }
+
+    @DeleteMapping("delete")
+    Integer delete(Integer id) {
+        return service.delete(id);
+    }
+
+    @PostMapping("update")
+    Integer update(@RequestBody ArchivesTreeDTO dto) {
+        return service.update(dto);
+    }
+
+    @GetMapping("selectAll")
+    List<ArchivesTreeDTO> selectAll() {
+        return service.selectAll();
+    }
+
+    @GetMapping("selectByPrimaryKey")
+    ArchivesTreeDTO selectByPrimaryKey(Integer id) {
+        return service.selectByPrimaryKey(id);
+    }
+
+    @GetMapping("selectByOrder")
+    List<ArchivesTreeDTO> selectByOrder(){
+        return service.selectByOrder();
+    }
+
+    @GetMapping("selectTree")
+    List<Tree<String>> selectTree(){
+        return service.selectTree();
+    }
+
+    @GetMapping("upMove")
+    void upMove(Integer id){
+        service.upMove(id);
+    }
+
+    @GetMapping("downMove")
+    void upDown(Integer id){
+        service.downMove(id);
+    }
+}

src/main/java/com/gz/controller/system/AuthController.java

@@ -1,6 +1,7 @@
 package com.gz.controller.system;
 
 import com.gz.core.exception.BusinessException;
+import com.gz.dto.system.MenuDTO;
 import com.gz.jwt.JwtPayload;
 import com.gz.rvo.system.InitialHomeRVO;
 import com.gz.rvo.system.LoginRVO;
@@ -11,6 +12,7 @@ import com.gz.vo.system.UpdatePasswordVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 登录授权控制器
@@ -30,9 +32,9 @@ public class AuthController {
         return authService.login(loginVO);
     }
 
-    @PostMapping("refreshToken")
-    public LoginRVO refreshToken(String accessToken){
-        return authService.refreshToken(accessToken);
+    @GetMapping("refreshToken")
+    public LoginRVO refreshToken(@RequestParam String refreshToken){
+        return authService.refreshToken(refreshToken);
     }
 
     /**
@@ -53,6 +55,17 @@ public class AuthController {
     @GetMapping("getLoginMenus")
     public InitialHomeRVO getLoginMenus(){ return authService.getLoginMenus(); }
 
+    /**
+     * @description 获取有权限的按钮
+     * @author LiuChangLan
+     * @since 2020/9/25 15:43
+     */
+    @GetMapping("getLoginButtons")
+    public List<MenuDTO> getLoginButtons(Integer menuId){
+        return authService.getLoginButtons(menuId);
+    }
+
+
     @PostMapping("updatePassword")
     public Integer updatePassword(@RequestBody UpdatePasswordVO vo) throws BusinessException {
         return authService.updatePassword(vo);

src/main/java/com/gz/core/BaseDTO.java

@@ -2,6 +2,7 @@ package com.gz.core;
 
 import lombok.Data;
 import tk.mybatis.mapper.annotation.KeySql;
+import tk.mybatis.mapper.annotation.LogicDelete;
 
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
@@ -40,4 +41,13 @@ public class BaseDTO {
      */
     @Column(name = "updated")
     private Integer updated;
+
+    /**
+     * @description 逻辑删除
+     * @author LiuChangLan
+     * @since 2021/2/23 14:49
+     */
+    @Column(name = "deleted")
+    @LogicDelete(notDeletedValue = 0,isDeletedValue = 1)
+    private Integer deleted;
 }

src/main/java/com/gz/core/mybatis/MyMapper.java

@@ -0,0 +1,12 @@
+package com.gz.core.mybatis;
+
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author LiuchangLan
+ * @date 2021/2/23 14:42
+ */
+public interface MyMapper<T> extends Mapper<T> {
+    @Override
+    int deleteByPrimaryKey(Object o);
+}

src/main/java/com/gz/dto/archive/ArchiveDTO.java

@@ -0,0 +1,66 @@
+package com.gz.dto.archive;
+
+import com.gz.core.BaseDTO;
+import lombok.Data;
+
+import javax.persistence.Table;
+
+/**
+ * @author LiuchangLan
+ * @date 2021/2/23 18:09
+ */
+@Data
+@Table(name = "tab_archives")
+public class ArchiveDTO extends BaseDTO {
+    // 档号
+    private String dh;
+
+    // 档案馆代码
+    private String dagdm;
+
+    // 文件编号 字符串，类似于“第[2018]号”
+    private String wjbh;
+
+    // 日期格式，年
+    private String gdnd;
+
+    // 密级 读取字典表
+    private String mj;
+
+    // 载体数量
+    private Integer ztsl;
+
+    // 主办部门
+    private String zbbm;
+
+    // 协办部门
+    private String xbbm;
+
+    // 页数
+    private Integer ys;
+
+    // 题名
+    private String tm;
+
+    // 内容概述
+    private String nrgs;
+
+    // 文件形成时间
+    private String wjxcsj;
+
+    // 文件到期时间
+    private String wjdqsj;
+
+    // 责任者
+    private String zrz;
+
+    // 存放位置描述
+    private String cfwzms;
+
+    // 备注
+    private String bz;
+
+    // 附件
+    private String fj;
+
+}

src/main/java/com/gz/dto/system/ArchivesTreeDTO.java

@@ -0,0 +1,27 @@
+package com.gz.dto.system;
+
+import com.gz.core.BaseDTO;
+import lombok.Data;
+
+import javax.persistence.Table;
+
+/**
+ * 档案树DTO
+ * @author LiuchangLan
+ * @date 2021/2/23 15:48
+ */
+@Data
+@Table(name = "tab_archives_tree")
+public class ArchivesTreeDTO extends BaseDTO {
+    // 档案树名称
+    private String title;
+
+    // 档案树编码
+    private String code;
+
+    // 排序
+    private Integer sort;
+
+    // 父级id
+    private Integer parentId;
+}

src/main/java/com/gz/dto/system/LogDTO.java

@@ -1,6 +1,8 @@
 package com.gz.dto.system;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.Table;
 
@@ -11,6 +13,8 @@ import javax.persistence.Table;
  */
 @Data
 @Table(name = "tab_log")
+@NoArgsConstructor
+@AllArgsConstructor
 public class LogDTO {
     // 日志类型(字典表关联)
     private String logType;

src/main/java/com/gz/jwt/JwtConfig.java

@@ -35,5 +35,6 @@ public class JwtConfig {
     public static Long REFRESH_TOKEN_EXPIRE_TIME = 7 * 24 * 60 * 60L;
 
     /** accessToken有效期 单位秒*/
-    public static final long ACCESS_TOKEN_EFFECTIVE = 30 * 60L;
+//    public static final long ACCESS_TOKEN_EFFECTIVE = 30 * 60L;
+    public static final long ACCESS_TOKEN_EFFECTIVE = 1L;
 }

src/main/java/com/gz/mapper/archive/ArchiveMapper.java

@@ -0,0 +1,12 @@
+package com.gz.mapper.archive;
+
+import com.gz.dto.archive.ArchiveDTO;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @description 档案Mapper
+ * @author LiuChangLan
+ * @since 2021/2/23 18:11
+ */
+public interface ArchiveMapper extends Mapper<ArchiveDTO> {
+}

src/main/java/com/gz/mapper/system/ArchivesTreeMapper.java

@@ -0,0 +1,12 @@
+package com.gz.mapper.system;
+
+import com.gz.dto.system.ArchivesTreeDTO;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @description 档案树Mapper
+ * @author LiuChangLan
+ * @since 2021/2/23 15:49
+ */
+public interface ArchivesTreeMapper extends Mapper<ArchivesTreeDTO> {
+}

src/main/java/com/gz/service/archive/ArchiveService.java

@@ -0,0 +1,52 @@
+package com.gz.service.archive;
+
+import com.github.pagehelper.PageInfo;
+import com.gz.dto.archive.ArchiveDTO;
+import com.gz.vo.PageVO;
+
+import java.util.List;
+
+public interface ArchiveService {
+    /**
+     * @description 增
+     * @author LiuChangLan
+     * @since 2020/9/4 14:46
+     */
+    Integer insert(ArchiveDTO dto);
+
+    /**
+     * @description 删
+     * @author LiuChangLan
+     * @since 2020/9/4 14:46
+     */
+    Integer delete(Integer id);
+
+    /**
+     * @description 改
+     * @author LiuChangLan
+     * @since 2020/9/4 14:46
+     */
+    Integer update(ArchiveDTO dto);
+
+    /**
+     * @description 查
+     * @author LiuChangLan
+     * @since 2020/9/4 14:46
+     */
+    List<ArchiveDTO> selectAll();
+
+    /**
+     * @description 分页查询
+     * @author LiuChangLan
+     * @since 2020/9/4 14:46
+     */
+    PageInfo<ArchiveDTO> selectByPage(PageVO vo);
+
+    /**
+     * @description 根据主键查询
+     * @author LiuChangLan
+     * @since 2020/9/4 16:36
+     */
+    ArchiveDTO selectByPrimaryKey(Integer id);
+
+}

src/main/java/com/gz/service/archive/impl/ArchiveServiceImpl.java

@@ -0,0 +1,57 @@
+package com.gz.service.archive.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.gz.dto.archive.ArchiveDTO;
+import com.gz.mapper.archive.ArchiveMapper;
+import com.gz.service.archive.ArchiveService;
+import com.gz.utils.JwtUtils;
+import com.gz.vo.PageVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author LiuchangLan
+ * @date 2021/2/23 18:12
+ */
+@Service
+public class ArchiveServiceImpl implements ArchiveService {
+
+    @Resource
+    private ArchiveMapper mapper;
+
+    @Override
+    public Integer insert(ArchiveDTO dto) {
+        dto.setCreated(JwtUtils.getCurrentUserJwtPayload().getId());
+        return mapper.insertSelective(dto);
+    }
+
+    @Override
+    public Integer delete(Integer id) {
+        return mapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public Integer update(ArchiveDTO dto) {
+        dto.setUpdated(JwtUtils.getCurrentUserJwtPayload().getId());
+        return mapper.updateByPrimaryKeySelective(dto);
+    }
+
+    @Override
+    public List<ArchiveDTO> selectAll() {
+        return mapper.selectAll();
+    }
+
+    @Override
+    public PageInfo<ArchiveDTO> selectByPage(PageVO vo) {
+        PageHelper.startPage(vo.getPageNum(),vo.getPageSize());
+        return new PageInfo<>(selectAll());
+    }
+
+    @Override
+    public ArchiveDTO selectByPrimaryKey(Integer id) {
+        return mapper.selectByPrimaryKey(id);
+    }
+}

src/main/java/com/gz/service/system/ArchivesTreeService.java

@@ -0,0 +1,78 @@
+package com.gz.service.system;
+
+import cn.hutool.core.lang.tree.Tree;
+import com.github.pagehelper.PageInfo;
+import com.gz.dto.system.ArchivesTreeDTO;
+
+import java.util.List;
+
+/**
+ * @description 档案树Service
+ * @author LiuChangLan
+ * @since 2021/2/23 15:50
+ */
+public interface ArchivesTreeService {
+
+    /**
+     * @description 增
+     * @author LiuChangLan
+     * @since 2020/9/4 14:46
+     */
+    Integer insert(ArchivesTreeDTO dto);
+
+    /**
+     * @description 删
+     * @author LiuChangLan
+     * @since 2020/9/4 14:46
+     */
+    Integer delete(Integer id);
+
+    /**
+     * @description 改
+     * @author LiuChangLan
+     * @since 2020/9/4 14:46
+     */
+    Integer update(ArchivesTreeDTO dto);
+
+    /**
+     * @description 查
+     * @author LiuChangLan
+     * @since 2020/9/4 14:46
+     */
+    List<ArchivesTreeDTO> selectAll();
+
+    /**
+     * @description 根据主键查询
+     * @author LiuChangLan
+     * @since 2020/9/4 16:36
+     */
+    ArchivesTreeDTO selectByPrimaryKey(Integer id);
+
+    /**
+     * @description 查询列表（根据排序）
+     * @author LiuChangLan
+     * @since 2021/2/23 16:18
+     */
+    List<ArchivesTreeDTO> selectByOrder();
+
+    /**
+     * @description 查询树行
+     * @author LiuChangLan
+     * @since 2021/2/23 16:34
+     */
+    List<Tree<String>> selectTree();
+
+    /**
+     * @description 上移
+     * @author LiuChangLan
+     * @since 2020/9/8 10:46
+     */
+    void upMove(Integer id);
+
+    /**
+     * @description 下移
+     * @author LiuChangLan
+     * @since 2020/9/8 11:02
+     */
+    void downMove(Integer id);
+}

src/main/java/com/gz/service/system/impl/ArchivesTreeServiceImpl.java

@@ -0,0 +1,152 @@
+package com.gz.service.system.impl;
+
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNodeConfig;
+import cn.hutool.core.lang.tree.TreeUtil;
+import com.gz.dto.system.ArchivesTreeDTO;
+import com.gz.dto.system.MenuDTO;
+import com.gz.mapper.system.ArchivesTreeMapper;
+import com.gz.service.system.ArchivesTreeService;
+import com.gz.utils.JwtUtils;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+import javax.annotation.Resource;
+import java.beans.ParameterDescriptor;
+import java.util.List;
+
+/**
+ * @author LiuchangLan
+ * @date 2021/2/23 15:50
+ */
+@Service
+public class ArchivesTreeServiceImpl implements ArchivesTreeService {
+
+    @Resource
+    private ArchivesTreeMapper mapper;
+
+    @Override
+    public Integer insert(ArchivesTreeDTO dto) {
+        dto.setCreated(JwtUtils.getCurrentUserJwtPayload().getId());
+        return mapper.insertSelective(dto);
+    }
+
+    @Override
+    public Integer delete(Integer id) {
+        return mapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public Integer update(ArchivesTreeDTO dto) {
+        dto.setUpdated(JwtUtils.getCurrentUserJwtPayload().getId());
+        return mapper.updateByPrimaryKeySelective(dto);
+    }
+
+    @Override
+    public List<ArchivesTreeDTO> selectAll() {
+        return mapper.selectAll();
+    }
+
+    @Override
+    public ArchivesTreeDTO selectByPrimaryKey(Integer id) {
+        return mapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public List<ArchivesTreeDTO> selectByOrder() {
+        Example example = new Example(ArchivesTreeDTO.class);
+        example.setOrderByClause("sort ASC");
+        return mapper.selectByExample(example);
+    }
+
+    @Override
+    public List<Tree<String>> selectTree() {
+        List<ArchivesTreeDTO> menuDTOS = selectByOrder();
+        //配置
+        TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
+        // 自定义属性名 都要默认值的
+        treeNodeConfig.setIdKey("id");
+        // 最大递归深度
+        treeNodeConfig.setDeep(3);
+
+        //转换器
+        List<Tree<String>> treeNodes = TreeUtil.build(menuDTOS, "-1", treeNodeConfig,
+                (treeNode, tree) -> {
+                    tree.setId(treeNode.getId().toString());
+                    tree.setParentId(treeNode.getParentId().toString());
+                    tree.setName(treeNode.getTitle());
+                    tree.putExtra("title", treeNode.getTitle());
+                });
+        return treeNodes;
+    }
+
+    @Override
+    public void upMove(Integer id) {
+        // 获取当前要上移的对象
+        ArchivesTreeDTO archivesTreeDTO = mapper.selectByPrimaryKey(id);
+        // 查询同级对象
+        Example example = new Example(ArchivesTreeDTO.class);
+        example.setOrderByClause("sort ASC");
+        example.createCriteria().andEqualTo("parentId", archivesTreeDTO.getParentId());
+        List<ArchivesTreeDTO> archivesTreeDTOS = mapper.selectByExample(example);
+        for (int i = 0; i < archivesTreeDTOS.size(); i++) {
+            ArchivesTreeDTO curr = archivesTreeDTOS.get(i);
+            // 找到当前对象
+            if (curr.getId().equals(id)) {
+                // 已经是第一个 跳过
+                if (i == 0) {
+                    return;
+                } else {
+                    // 获取上一个
+                    ArchivesTreeDTO prev = archivesTreeDTOS.get(i - 1);
+                    if (curr.getSort().equals(prev)) {
+                        // 两个排序相同 则减一
+                        curr.setSort(curr.getSort() - 1);
+                    } else {
+                        // 不相同则互换
+                        Integer currIndex = curr.getSort();
+                        curr.setSort(prev.getSort());
+                        prev.setSort(currIndex);
+                    }
+                    mapper.updateByPrimaryKey(prev);
+                    mapper.updateByPrimaryKey(curr);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void downMove(Integer id) {
+        // 获取当前要上移的对象
+        ArchivesTreeDTO archivesTreeDTO = mapper.selectByPrimaryKey(id);
+        // 查询同级对象
+        Example example = new Example(ArchivesTreeDTO.class);
+        example.setOrderByClause("sort ASC");
+        example.createCriteria().andEqualTo("parentId", archivesTreeDTO.getParentId());
+        List<ArchivesTreeDTO> archivesTreeDTOS = mapper.selectByExample(example);
+        for (int i = 0; i < archivesTreeDTOS.size(); i++) {
+            ArchivesTreeDTO curr = archivesTreeDTOS.get(i);
+            // 找到当前对象
+            if (curr.getId().equals(id)) {
+                // 已经是最后一个 跳过
+                if (i == archivesTreeDTOS.size() - 1) {
+                    return;
+                } else {
+                    // 获取下一个
+                    ArchivesTreeDTO prev = archivesTreeDTOS.get(i + 1);
+                    if (curr.getSort().equals(prev)) {
+                        // 两个排序相同 则减一
+                        curr.setSort(curr.getSort() + 1);
+                    } else {
+                        // 不相同则互换
+                        Integer currIndex = curr.getSort();
+                        curr.setSort(prev.getSort());
+                        prev.setSort(currIndex);
+                    }
+                    mapper.updateByPrimaryKey(prev);
+                    mapper.updateByPrimaryKey(curr);
+                }
+            }
+        }
+    }
+}

src/main/java/com/gz/service/system/impl/AuthServiceImpl.java

@@ -12,24 +12,29 @@ import com.gz.common.DataGlobalVariable;
 import com.gz.core.exception.BusinessException;
 import com.gz.core.exception.CustomExceptionEnum;
 import com.gz.dto.system.AdminDTO;
+import com.gz.dto.system.LogDTO;
 import com.gz.dto.system.MenuDTO;
 import com.gz.jwt.JwtConfig;
 import com.gz.jwt.JwtPayload;
 import com.gz.mapper.system.AdminMapper;
+import com.gz.mapper.system.LogMapper;
 import com.gz.mapper.system.MenuMapper;
 import com.gz.rvo.system.InitialHomeRVO;
 import com.gz.rvo.system.LoginRVO;
 import com.gz.service.system.AuthService;
 import com.gz.utils.JwtUtils;
 import com.gz.utils.PasswordUtils;
+import com.gz.utils.RequestUtils;
 import com.gz.vo.system.LoginVO;
 import com.gz.vo.system.UpdatePasswordVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
+import sun.net.util.IPAddressUtil;
 
 import javax.annotation.Resource;
+import javax.security.auth.spi.LoginModule;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.List;
@@ -56,6 +61,9 @@ public class AuthServiceImpl implements AuthService {
     @Resource
     private HttpServletRequest request;
 
+    @Resource
+    private LogMapper logMapper;
+
     @Override
     public LoginRVO login(LoginVO vo) {
         // 后台存储的验证码
@@ -96,6 +104,8 @@ public class AuthServiceImpl implements AuthService {
         stringRedisTemplate.opsForHash().put(refreshTokenKey, JwtConfig.REDIS_JWT_PAYLOAD_KEY, JSONObject.toJSONString(jwtPayload));
         // refresh token 设置过期时间
         stringRedisTemplate.expire(refreshTokenKey, JwtConfig.REFRESH_TOKEN_EXPIRE_TIME, TimeUnit.SECONDS);
+        // 记录登录日志
+        logMapper.insertSelective(new LogDTO(DataGlobalVariable.LOGIN_LOG_CODE,"系统管理","登录","com.gz.controller.system.login",null,null, RequestUtils.getIpAddress(request),null,null));
         log.info("账号：{}  密码：{} 登录成功",vo.getAccount(),vo.getPassword());
         return new LoginRVO(token, refreshToken, System.currentTimeMillis());
     }

src/main/java/com/gz/utils/TableUtils.java

@@ -51,6 +51,7 @@ public class TableUtils {
             add("update_time");
             add("created");
             add("updated");
+            add("deleted");
             add("id");
         }};
         Connection connection = DriverManager.getConnection(url, user , password);

src/main/java/com/gz/vo/archive/ArchiveVO.java

@@ -0,0 +1,15 @@
+package com.gz.vo.archive;
+
+import com.gz.vo.PageVO;
+import lombok.Data;
+
+/**
+ * 档案数据查询入参VO
+ * @author LiuchangLan
+ * @date 2021/2/23 18:29
+ */
+@Data
+public class ArchiveVO extends PageVO {
+    // 档案树id
+    private String archivesTreeId;
+}

src/main/java/com/gz/websocket/WebSocketServer.java

@@ -0,0 +1,78 @@
+package com.gz.websocket;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 在线WebSocket
+ * @author LiuchangLan
+ * @date 2020/8/7 10:02
+ */
+@ServerEndpoint("/webSocket/{adminId}")
+@Component
+@Slf4j
+public class WebSocketServer {
+
+    /**
+     * @description 存放所有在线的客户端 static保证线程安全
+     * @author LiuChangLan
+     * @since 2020/8/7 10:03
+     */
+    public static Map<String, Session> clients = new ConcurrentHashMap<>();
+
+    /**
+     * @description 连接
+     * @author LiuChangLan
+     * @since 2020/8/7 10:09
+     */
+    @OnOpen
+    public void onOpen(Session session, @PathParam("adminId")String adminId){
+        clients.put(adminId,session);
+        log.info("客户端{}连接了 当前在线人数：{}",adminId,clients.size());
+    }
+
+    /**
+     * @description 断开连接
+     * @author LiuChangLan
+     * @since 2020/8/7 10:09
+     */
+    @OnClose
+    public void onClose(Session session, @PathParam("adminId")String adminId){
+        clients.remove(adminId);
+        log.info("客户端{}断开了 当前在线人数：{}",adminId,clients.size());
+    }
+
+    /**
+     * @description 发送错误
+     * @author LiuChangLan
+     * @since 2020/8/7 10:09
+     */
+    @OnError
+    public void onError(Throwable throwable){
+        throwable.printStackTrace();
+    }
+
+    /**
+     * @description 接受消息
+     * @author LiuChangLan
+     * @since 2020/8/7 10:09
+     */
+    @OnMessage
+    public void onMessage(@PathParam("adminId")String adminId, String message){
+        log.info("服务端收到客户端{}发来的消息: {}",adminId, message);
+    }
+
+    public void sendMessage(String adminId,String message){
+        Session session = clients.get(adminId);
+        if (session != null){
+            session.getAsyncRemote().sendText(message);
+        }
+    }
+
+}

src/main/resources/application-dev.yml

@@ -49,7 +49,7 @@ spring:
       # 配置 DruidStatViewServlet
       stat-view-servlet:
         # 开启监控页面
-        enabled: true
+        enabled: false
         # 页面地址
         url-pattern: /druid/*
         # IP 白名单，没有配置或者为空，则允许所有访问

src/main/resources/application.yml

@@ -22,5 +22,5 @@ auth:
     # 进行登录验证的地址
     force-urls: /**
     # 跳过验证地址
-    skip-urls: /,/**/*.png,/**/*.jpg,/**/*.html,/**/*.ico,/**/*.css,/**/*.js,/webSocket/**,/**/*.woff2,/system/auth/login,/system/auth/refreshToken,/system/auth/generatePictureCaptcha
+    skip-urls: /,/**/*.png,/**/*.jpg,/**/*.html,/**/*.ico,/**/*.css,/**/*.js,/webSocket/**,/**/*.woff2,/**/*.less,/system/auth/login,/system/auth/refreshToken,/system/auth/generatePictureCaptcha
 

src/main/resources/mapper/dictMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="com.gz.mapper.system.DictMapper">
 
     <select id="selectDictByCode" resultType="com.gz.dto.system.DictDTO">
-        select * from tab_dict where parent_id = (select id from tab_dict where dict_code = #{code})
+        select * from tab_dict where parent_id = (select id from tab_dict where dict_code = #{code} and deleted = 0) and deleted = 0
     </select>
 </mapper>

src/main/resources/mapper/logMapper.xml

@@ -5,12 +5,10 @@
     <select id="selectByTime" resultType="com.gz.rvo.system.LogRVO" parameterType="com.gz.vo.system.LogVO">
         SELECT
         l.*,
-        d.dict_name,
         u.admin_name
         FROM
         `tab_log` l
         LEFT JOIN `tab_admin` u ON l.exec_by = u.id
-        LEFT JOIN `tab_dict` d ON l.log_type = d.dict_code
         <where>
             <if test="logType != null and logType != ''">
                 and l.log_type = #{logType}

src/main/resources/mapper/menuMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gz.mapper.system.MenuMapper">
     <select id="getMenusOrder" resultType="com.gz.dto.system.MenuDTO">
-        select * from tab_menu order by `sort` asc
+        select * from tab_menu where deleted = 0 order by `sort` asc
     </select>
 
     <select id="getRoleMenu" resultType="com.gz.dto.system.MenuDTO">
@@ -12,7 +12,8 @@
             tab_menu m
             LEFT JOIN tab_menu_role mr ON m.id = mr.menu_id
         WHERE
-             mr.role_id = #{roleId}
+             m.deleted = 0
+             AND mr.role_id = #{roleId}
             AND m.type != 2
         order by m.`sort` asc
     </select>
@@ -24,7 +25,8 @@
             tab_menu m
             LEFT JOIN tab_menu_role mr ON m.id = mr.menu_id
         WHERE
-             mr.role_id = #{roleId}
+            m.deleted = 0
+            AND mr.role_id = #{roleId}
             AND m.parent_id = #{menuId}
             AND m.type = 2
         order by m.`sort` asc

src/main/resources/static/index.html

@@ -139,6 +139,7 @@
             miniAdmin = layui.miniAdmin,
             miniTab = layui.miniTab,
             miniMenu = layui.miniMenu,
+            websocket = {},
             http = layui.http;
 
 
@@ -146,7 +147,7 @@
         let getLoginUserName = function () {
             http.get('system/auth/getLoginUserName', null, false, function (res) {
                 $("#account").text(res.data.nickName)
-                websocket = new WebSocket("ws://"+http.requestUrl.substr(7)+"/webSocket/" + res.data.i);
+                websocket = new WebSocket("ws://"+http.host+"/webSocket/" + res.data.id);
             })
         }
 
@@ -164,56 +165,6 @@
         };
         miniAdmin.render(options);
 
-        var module = getParams("module");
-
-        switch (module) {
-            // 廉政档案-廉政事项报告
-            case '2':
-                $("#multi_module_0 li:nth-of-type(1) :first-child").trigger("click");
-            break;
-            // 廉政档案-基本事项报告
-            case '3':
-                $("#multi_module_0 li:nth-of-type(2) :first-child").trigger("click");
-                break;
-            // 廉政档案-个人奖惩情况
-            case '4':
-                $("#multi_module_0 li:nth-of-type(3) :first-child").trigger("click");
-                break;
-            // 廉政档案-廉政回复
-            case '5':
-                $("#multi_module_0 li:nth-of-type(5) :first-child").trigger("click");
-                break;
-            // 廉政档案-其他信息
-            case '6':
-                $("#multi_module_0 li:nth-of-type(6) :first-child").trigger("click");
-                break;
-            // 廉政档案-问题线索
-            case '7':
-                $("#multi_module_0 li:nth-of-type(4) :first-child").trigger("click");
-                break;
-            // 廉政体检-问题线索
-            case '8':
-                $('#multi_module_1HeaderId').trigger("click");
-                $("#multi_module_1 li:nth-of-type(2) :first-child").trigger("click");
-                break;
-            // 廉政体检-个人奖惩情况
-            case '9':
-                $('#multi_module_1HeaderId').trigger("click");
-                $("#multi_module_1 li:nth-of-type(1) :first-child").trigger("click");
-                break;
-            // 廉政体检-廉政回复
-            case '10':
-                $('#multi_module_1HeaderId').trigger("click");
-                $("#multi_module_1 li:nth-of-type(3) :first-child").trigger("click");
-                break;
-            // 廉政体检-被司法机关追责
-            case '11':
-                $('#multi_module_1HeaderId').trigger("click");
-                $("#multi_module_1 li:nth-of-type(4) :first-child").trigger("click");
-                break;
-
-        }
-
         // 退出登录
         $('.login-out').on("click", function () {
             layui.data('accessToken', {

src/main/resources/static/js/lay-module/request/http.js

@@ -4,7 +4,8 @@ layui.define(['jquery', 'layer'], function (exports) {
         // requestUrl = 'http://192.168.157.154:9090/';
         /** war包 如果有项目名后面填写项目名 没有项目名就去除（没有项目名需要保留斜杠）*/
             // requestUrl = window.location.origin + '/archives/';
-        requestUrl = window.location.origin + '/';
+        host = window.location.host,
+        requestUrl = 'http://' + host + '/';
 
     let ajax = function (method, type, data, async, callback) {
         // var loading = layer.load(0, {shade: [0.3, '#000']});
@@ -40,12 +41,12 @@ layui.define(['jquery', 'layer'], function (exports) {
                     }, function () {
                         if (res.code === 302) {
                             // 非法Token 跳转到登录页面
-                            window.location.href = 'login12.html'
+                            window.location.href = 'login.html'
                         } else if (res.code == 1002) {
                             // refreshToken已经过期
                             // 删除过期的token
                             layui.data('auth', null);
-                            window.location.href = 'login12.html'
+                            window.location.href = 'login.html'
                         }
                     });
                 }
@@ -124,7 +125,7 @@ layui.define(['jquery', 'layer'], function (exports) {
         login: function (data) {
             login(data)
         },
-        requestUrl: requestUrl
+        host: host
     };
     //输出接口
     exports('http', http);

src/main/resources/static/page/admin/edit.html

@@ -87,7 +87,7 @@
 
         //保存方法
         let save = function (data) {
-            http.post(id == '' ? 'system/admin/insert': 'system/admin/update',JSON.stringify(data),true,function (res) {
+            http.post(id == '' ? 'system/admin/insert': 'system/admin/update',data,true,function (res) {
                 if (res.code == 200){
                     let index = layer.alert('保存成功!', {
                         title: id == '' ? '添加':'修改' + '信息'

src/main/resources/static/page/object/list.html

@@ -21,7 +21,10 @@
             <div class="layui-form toolbar">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <input type="text" id="name" name="name" lay-filter="name" placeholder="请输入姓名" class="layui-input">
+                        <input type="text" id="name" name="name" lay-filter="name" placeholder="请输入标题" class="layui-input">
+                    </div>
+                    <div class="layui-inline">
+                        <input type="text" id="name" name="name" lay-filter="name" placeholder="请输入档案名称" class="layui-input">
                     </div>
                     <div class="layui-input-inline">
                         <select name="duty" id="duty">
@@ -131,11 +134,9 @@
             })
         }
 
-
-
         // 加载组织架构
         let loadTree = function () {
-            http.get('archives/dept/getDeptTree',{},false,function (res) {
+            http.get('system/archivesTree/selectTree',{},false,function (res) {
                 res.data.unshift({
                     id: '',
                     parentId: "-1",
@@ -204,7 +205,7 @@
                 toolbar: '#toolbar',
                 page: true,
                 request: {
-                    pageName: 'pageNum',
+                    pageName: 'pageIndex',
                     limitName: 'pageSize'
                 },
                 where: {
@@ -382,10 +383,10 @@
         }
         /**事-------------------------------件-------------------------------绑-------------------------------定*/
 
-        initSelect()
-        initUpload()
+        // initSelect()
+        // initUpload()
         loadTree()
-        renderTable()
+        // renderTable()
 
 
         //表格操作栏

src/main/resources/static/page/archives-tree/edit.html

@@ -0,0 +1,160 @@
+<!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;
+        }
+    </style>
+</head>
+<body>
+<div class="layui-form layuimini-form" lay-filter="addDict">
+    <div class="layui-form-item">
+        <label class="layui-form-label required">门类名称</label>
+        <div class="layui-input-block">
+            <input type="hidden" name="id" id="id" class="layui-input">
+            <input type="text" name="title" lay-verify="required" lay-reqtext="门类名称不能为空" placeholder="请输入门类名称" value="" class="layui-input">
+        </div>
+    </div>
+
+
+    <div class="layui-form-item">
+        <label class="layui-form-label required">门类代码</label>
+        <div class="layui-input-block">
+            <input type="text" name="code" placeholder="请输入门类代码" value="" lay-verify="" lay-reqtext="门类代码不能为空" class="layui-input">
+        </div>
+    </div>
+
+
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">父级门类</label>
+        <div class="layui-input-block">
+<!--            <select name="parentId" id="parentId" lay-filter="parentId">-->
+<!--                <option value="-1">请选择父级菜单</option>-->
+<!--            </select>-->
+            <input type="text" id="parentId" name="parentId" lay-filter="parentId" class="layui-input">
+        </div>
+    </div>
+
+    <div class="layui-form-item">
+        <label class="layui-form-label">排序</label>
+        <div class="layui-input-block">
+            <input type="number" name="sort" class="layui-input" lay-verify="" lay-reqtext="排序不能为空">
+        </div>
+    </div>
+
+
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+        </div>
+    </div>
+</div>
+<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>
+
+    layui.use(['form','http','iconPickerFa','treeSelect'], function () {
+        /**变-------------------------------量-------------------------------定-------------------------------义*/
+        var form = layui.form,
+            layer = layui.layer,
+            http = layui.http,
+            $ = layui.$,
+            treeSelect = layui.treeSelect;
+        let id = $('#id').val()
+        let parentId;
+        /**方-------------------------------法-------------------------------定-------------------------------义*/
+        // 保存方法
+        let save = function (data) {
+                var selectedNodes = treeSelect.zTree('parentId').getSelectedNodes();
+                if (selectedNodes.length > 0){
+                    data.parentId = selectedNodes[0].id
+                }else {
+                    data.parentId = -1
+                }
+            http.post(id == '' ? 'system/archivesTree/insert': 'system/archivesTree/update',data,true,function (res) {
+                if (res.code == 200){
+                    let index = layer.alert('保存成功!', {
+                        title: id == '' ? '添加':'修改' + '信息'
+                    }, function () {
+                        // 关闭弹出层
+                        layer.close(index);
+                        let iframeIndex = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(iframeIndex);
+                    });
+                }
+            })
+        }
+
+        // 加载下拉框
+        let loadDictSelect = function () {
+            // http.get('/system/menu/select',null,false,function (res) {
+            //     let html = ''
+            //     for (let index in res.data) {
+            //         html += '<option value="'+res.data[index].id+'">'+res.data[index].title+'</option>'
+            //     }
+            //     $('#parentId').append(html)
+            //     form.render();//菜单渲染 把内容加载进去
+            // })
+            treeSelect.render({
+                // 选择器
+                elem: '#parentId',
+                // 数据
+                data: 'system/archivesTree/selectTree',
+                // 异步加载方式：get/post，默认get
+                type: 'get',
+                // 占位符
+                placeholder: '请选择父节点',
+                // 是否开启搜索功能：true/false，默认false
+                search: true,
+                // 一些可定制的样式
+                style: {
+                    folder: {
+                        enable: true
+                    },
+                    line: {
+                        enable: true
+                    }
+                },
+                success: function (res) {
+                    if(id != '' && parentId != '' && parentId != -1){
+                        treeSelect.checkNode('parentId', parentId);
+                    }
+                }
+            });
+        }
+
+        // 加载数据
+        let initData = function () {
+            if(id != ''){
+                http.get('/system/archivesTree/selectByPrimaryKey',{
+                    id: id
+                },false,function (res) {
+                    form.val("addDict", res.data);
+                    parentId = res.data.parentId
+                    form.render();
+                })
+            }
+        }
+        /**事-------------------------------件-------------------------------绑-------------------------------定*/
+
+        initData()
+        loadDictSelect()
+        //监听提交
+        form.on('submit(saveBtn)', function (data) {
+            let icon = 'fa '
+            icon += data.field.icon
+            data.field.icon = icon
+            save(data.field)
+        });
+
+    });
+</script>
+</body>
+</html>

src/main/resources/static/page/archives-tree/list.html

@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>menu</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>
+        .layui-btn:not(.layui-btn-lg ):not(.layui-btn-sm):not(.layui-btn-xs) {
+            height: 34px;
+            line-height: 34px;
+            padding: 0 8px;
+        }
+    </style>
+</head>
+<body>
+<div class="layuimini-container">
+    <div class="layuimini-main">
+        <div>
+            <table id="dict-table" class="layui-table" lay-filter="dict-table"></table>
+        </div>
+    </div>
+</div>
+<!--  头部工具栏  -->
+<script type="text/html" id="toolbar">
+</script>
+
+<!-- 操作列 -->
+<script type="text/html" id="operating">
+</script>
+
+<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>
+    layui.use(['table', 'treetable','http'], function () {
+        /**变-------------------------------量-------------------------------定-------------------------------义*/
+        let $ = layui.jquery,
+        table = layui.table,
+        http = layui.http,
+        treetable = layui.treetable;
+
+        /**方-------------------------------法-------------------------------定-------------------------------义*/
+        http.getRoleButton(153)
+        // 加载表格数据
+        let renderTable = function () {
+            // 渲染表格
+            layer.load(2);
+            treetable.render({
+                treeColIndex: 1,
+                treeSpid: -1,
+                treeIdName: 'id',
+                treePidName: 'parentId',
+                toolbar: '#toolbar',
+                elem: '#dict-table',
+                url: 'system/archivesTree/selectByOrder',
+                page: false,
+                cols: [[
+                    {type: 'numbers'},
+                    {field: 'title',  title: '门类名称'},
+                    {field: 'code', title: '门类代码'},
+                    {templet: '#operating', width: 300, align: 'center', title: '操作'}
+                ]],
+                done: function () {
+                    $('th').css({'background-color': '#1aa094', 'color': '#fff','font-weight':'bold'})
+                    layer.closeAll('loading');
+                }
+            });
+        }
+
+        // 全部展开
+        let unfoldAll = function () {
+            treetable.expandAll('#dict-table');
+        }
+
+        //全部折叠
+        let foldAll = function () {
+            treetable.foldAll('#dict-table');
+        }
+
+        //添加方法
+        let addDict = function () {
+            var index = layer.open({
+                title: '添加菜单',
+                type: 2,
+                shade: 0.2,
+                maxmin:true,
+                shadeClose: true,
+                area: ['100%', '100%'],
+                content: './edit.html',
+                end: function () {
+                    renderTable()
+                }
+            });
+        }
+
+        //删除方法
+        let deleteDict = function (id) {
+            layer.confirm('真的删除行么', function (index) {
+                http.delete('/system/archivesTree/delete',{id: id},true,function (res) {
+                    if (res.code == 200){
+                        layer.msg('删除成功', {
+                            icon: 1,
+                            time: 2000
+                        })
+                    }else {
+                        layer.msg(res.msg, {
+                            icon: 2,
+                            time: 2000
+                        })
+                    }
+                    renderTable()
+                })
+                layer.close(index);
+            });
+        }
+
+        //修改方法
+        let updateDict = function (id) {
+            layer.open({
+                title: '修改菜单',
+                type: 2,
+                shade: 0.2,
+                maxmin:true,
+                shadeClose: true,
+                area: ['100%', '100%'],
+                content: './edit.html',
+                success: function(layero, index){
+                    // var iframe = window['layui-layer-iframe' + index];
+                    // iframe.setValue(id)
+                    var body=layer.getChildFrame('body',index);
+                    body.find("#id").val(id);
+                },
+                end: function () {
+                    renderTable()
+                }
+            });
+        }
+
+        let up = function(id){
+            http.get('system/archivesTree/upMove',{id:id},true,function (res) {
+                if(res.code == 200){
+                    layer.msg('移动成功',{
+                        icon: 1,
+                        time: 1000
+                    })
+                    renderTable()
+                }
+            })
+        }
+
+        let down = function(id) {
+            http.get('system/archivesTree/downMove',{id:id},true,function (res) {
+                if(res.code == 200){
+                    layer.msg('移动成功',{
+                        icon: 1,
+                        time: 1000
+                    })
+                    renderTable()
+                }
+            })
+        }
+
+        /**事-------------------------------件-------------------------------绑-------------------------------定*/
+        //加载数据
+        renderTable()
+
+        //表格操作栏
+        table.on('tool(dict-table)', function (obj) {
+            let data = obj.data;
+            switch (obj.event) {
+                case 'delete': deleteDict(data.id); break;
+                case 'update': updateDict(data.id); break;
+                case 'up': up(data.id); break;
+                case 'down': down(data.id); break;
+            }
+        });
+
+        //头部工具栏监听
+        table.on('toolbar(dict-table)', function (obj) {
+            switch (obj.event) {
+                case 'unfoldAll': unfoldAll(); break;
+                case 'add': addDict(); break;
+                case 'foldAll': foldAll(); break;
+            }
+        })
+    });
+</script>
+</body>
+</html>

src/main/resources/static/page/dept/addBureaus.html

@@ -65,7 +65,7 @@
         // 保存方法
         let save = function (data) {
             data.parentId = -1
-            http.post(id == '' ? 'archives/dept/insert': 'archives/dept/update',JSON.stringify(data),true,function (res) {
+            http.post(id == '' ? 'archives/dept/insert': 'archives/dept/update',data,true,function (res) {
                 if (res.code == 200){
                     let index = layer.alert('保存成功!', {
                         title: id == '' ? '添加':'修改' + '信息'

src/main/resources/static/page/dept/addDepartment.html

@@ -55,7 +55,7 @@
 
         // 保存方法
         let save = function (data) {
-            http.post(id == '' ? 'archives/dept/insert': 'archives/dept/update',JSON.stringify(data),true,function (res) {
+            http.post(id == '' ? 'archives/dept/insert': 'archives/dept/update',data,true,function (res) {
                 if (res.code == 200){
                     let index = layer.alert('保存成功!', {
                         title: id == '' ? '添加':'修改' + '信息'

src/main/resources/static/page/dict/addDict.html

@@ -65,7 +65,7 @@
             }else {
                 data.parentId = -1
             }
-            http.post(id == '' ? 'system/dict/insert': 'system/dict/update',JSON.stringify(data),true,function (res) {
+            http.post(id == '' ? 'system/dict/insert': 'system/dict/update',data,true,function (res) {
                 if (res.code == 200){
                     let index = layer.alert('保存成功!', {
                         title: id == '' ? '添加':'修改' + '信息'

src/main/resources/static/page/home/welcome.html

@@ -350,18 +350,18 @@
         // })
 
         // 局办
-        http.get('archives/dept/select', {parentId: -1}, false, function (res) {
-            let html = '';
-            for (let i in res.data) {
-                html += '<option value="' + res.data[i].id + '">' + res.data[i].deptName + '</option>'
-            }
-            $("#depa").append(html)
-            form.render();//菜单渲染 把内容加载进去
-        })
+        // http.get('archives/dept/select', {parentId: -1}, false, function (res) {
+        //     let html = '';
+        //     for (let i in res.data) {
+        //         html += '<option value="' + res.data[i].id + '">' + res.data[i].deptName + '</option>'
+        //     }
+        //     $("#depa").append(html)
+        //     form.render();//菜单渲染 把内容加载进去
+        // })
 
-        http.get('analysis/getUserAnalysis',{},true,function (res) {
-            initDeptPersonNum(res.data)
-        })
+        // http.get('analysis/getUserAnalysis',{},true,function (res) {
+        //     initDeptPersonNum(res.data)
+        // })
 
         // 登录情况
         let initLoginInfo = function (data) {

src/main/resources/static/page/log/logsList.html

@@ -15,6 +15,9 @@
                     <div class="layui-inline">
                         <select name="logType" id="logType" lay-reqtext="请选择多选题算分规则">
                             <option value="">日志类型</option>
+                            <option value="OPERATION_LOG">操作日志</option>
+                            <option value="ERROR_LOG">错误日志</option>
+                            <option value="LOGIN_LOG">登录日志</option>
                         </select>
                     </div>
                     <div class="layui-inline">
@@ -36,7 +39,9 @@
                                class="layui-input">
                     </div>
                     <div class="layui-inline">
-                        <button id="btnSearch" lay-submit lay-filter="search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+                        <button id="btnSearch" lay-submit lay-filter="search" class="layui-btn icon-btn"><i
+                                class="layui-icon"></i>搜索
+                        </button>
                     </div>
                 </div>
             </div>
@@ -52,7 +57,7 @@
 <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>
-    layui.use(['table', 'http', 'laydate','form'], function () {
+    layui.use(['table', 'http', 'laydate', 'form'], function () {
         /**变-------------------------------量-------------------------------定-------------------------------义*/
 
         var table = layui.table,
@@ -65,51 +70,60 @@
 
         /**方-------------------------------法-------------------------------定-------------------------------义*/
         http.getRoleButton(25)
-         //数据加载方法
+        //数据加载方法
         let renderTable = function () {
-                // 加载表格数据
-                table.render({
-                    elem: '#user-table',
-                    url: 'system/log/selectByPage',
-                    toolbar: '#toolbar', //开启头部工具栏，并为其绑定左侧模板
-                    defaultToolbar: ['filter', 'exports', 'print'],
-                    title: '日志数据表',
-                    toolbar: '#toolbar',
-                    page: true,
-                    request: {
-                        pageName: 'pageNum',
-                        limitName: 'pageSize'
-                    },
-                    where: searchData,
-                    response: {
-                        statusCode: 200 //重新规定成功的状态码为 200，table 组件默认为 0
-                    },
-                    parseData: function (res) {
-                        return {
-                            "code": res.code,
-                            "msg": res.msg,
-                            "count": res.data.total,
-                            "data": res.data.list
+            // 加载表格数据
+            table.render({
+                elem: '#user-table',
+                url: 'system/log/selectByPage',
+                toolbar: '#toolbar', //开启头部工具栏，并为其绑定左侧模板
+                defaultToolbar: ['filter', 'exports', 'print'],
+                title: '日志数据表',
+                toolbar: '#toolbar',
+                page: true,
+                request: {
+                    pageName: 'pageNum',
+                    limitName: 'pageSize'
+                },
+                where: searchData,
+                response: {
+                    statusCode: 200 //重新规定成功的状态码为 200，table 组件默认为 0
+                },
+                parseData: function (res) {
+                    return {
+                        "code": res.code,
+                        "msg": res.msg,
+                        "count": res.data.total,
+                        "data": res.data.list
+                    }
+                },
+                done: function (res, curr, count) {
+                    $('th').css({'background-color': '#1aa094', 'color': '#fff', 'font-weight': 'bold'})
+                },
+                cols: [[
+                    {type: 'numbers'},
+                    {field: 'adminName', title: '用户名'},
+                    {
+                        field: 'dictName', title: '日志类型',
+                        templet: function (rv) {
+                            switch (rv.logType){
+                                case 'OPERATION_LOG': return '操作日志'
+                                case 'ERROR_LOG': return '错误日志'
+                                case 'LOGIN_LOG': return '登录日志'
+                            }
                         }
                     },
-                    done: function(res, curr, count) {
-                        $('th').css({'background-color': '#1aa094', 'color': '#fff','font-weight':'bold'})
-                    },
-                    cols: [[
-                        {type: 'numbers'},
-                        {field: 'adminName', title: '用户名'},
-                        {field: 'dictName', title: '日志类型'},
-                        {field: 'module', title: '操作模块'},
-                        {field: 'business', title: '具体操作'},
-                        {field: 'paramsJson', title: '参数'},
-                        {field: 'execMethod', title: '操作方法'},
-                        {field: 'execTime', title: '操作时间'},
-                        {field: 'execIp', title: 'ip'},
-                        {field: 'errorMsg', title: '错误信息'}
-                    ]]
-                });
+                    {field: 'module', title: '操作模块'},
+                    {field: 'business', title: '具体操作'},
+                    {field: 'paramsJson', title: '参数'},
+                    {field: 'execMethod', title: '操作方法'},
+                    {field: 'execTime', title: '操作时间'},
+                    {field: 'execIp', title: 'ip'},
+                    {field: 'errorMsg', title: '错误信息'}
+                ]]
+            });
 
-            }
+        }
 
         //初始化日期控件
         let initDate = function () {
@@ -122,25 +136,25 @@
                 type: 'datetime'
             });
         }
-
-        //加载日志类型
-        let loadLogType = function () {
-            http.get('system/dict/selectDictByCode',{code: 'RIZHILEIXING'},true,function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="'+res.data[i].dictCode+'">'+res.data[i].dictName+'</option>'
-                }
-                $("#logType").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-        }
+        //
+        // //加载日志类型
+        // let loadLogType = function () {
+        //     http.get('system/dict/selectDictByCode',{code: 'RIZHILEIXING'},true,function (res) {
+        //         let html = '';
+        //         for (let i in res.data) {
+        //             html += '<option value="'+res.data[i].dictCode+'">'+res.data[i].dictName+'</option>'
+        //         }
+        //         $("#logType").append(html)
+        //         form.render();//菜单渲染 把内容加载进去
+        //     })
+        // }
 
         //加载操作模块
         let loadModule = function () {
-            http.get('system/log/selectLogModule',{},true,function (res) {
+            http.get('system/log/selectLogModule', {}, true, function (res) {
                 let html = '';
                 for (let i in res.data) {
-                    html += '<option value="'+res.data[i]+'">'+res.data[i]+'</option>'
+                    html += '<option value="' + res.data[i] + '">' + res.data[i] + '</option>'
                 }
                 $("#module").append(html)
                 form.render();//菜单渲染 把内容加载进去
@@ -150,13 +164,13 @@
         //清除三十天
         let clearThirtyOut = function () {
             layer.confirm('真的删除行么', function (index) {
-                http.get('system/log/clearThirtyOut',{},true,function (res) {
-                    if (res.code == 200){
+                http.get('system/log/clearThirtyOut', {}, true, function (res) {
+                    if (res.code == 200) {
                         layer.msg('清除成功', {
                             icon: 1,
                             time: 2000
                         })
-                    }else {
+                    } else {
                         layer.msg(res.msg, {
                             icon: 2,
                             time: 2000
@@ -172,13 +186,13 @@
         //清除全部
         let clearAll = function () {
             layer.confirm('真的删除行么', function (index) {
-                http.get('system/log/clearAll',{},true,function (res) {
-                    if (res.code == 200){
+                http.get('system/log/clearAll', {}, true, function (res) {
+                    if (res.code == 200) {
                         layer.msg('清除成功', {
                             icon: 1,
                             time: 2000
                         })
-                    }else {
+                    } else {
                         layer.msg(res.msg, {
                             icon: 2,
                             time: 2000
@@ -195,18 +209,18 @@
         loadModule()
         renderTable()
         initDate()
-        loadLogType()
+        // loadLogType()
 
-        form.on('submit(search)', function(data){
+        form.on('submit(search)', function (data) {
             searchData = data.field
             renderTable()
         })
 
         form.on('select(module)', function (data) {
-            http.get('system/log/selectLogBusiness',{module: data.value},true,function (res) {
+            http.get('system/log/selectLogBusiness', {module: data.value}, true, function (res) {
                 let html = '';
                 for (let i in res.data) {
-                    html += '<option value="'+res.data[i]+'">'+res.data[i]+'</option>'
+                    html += '<option value="' + res.data[i] + '">' + res.data[i] + '</option>'
                 }
                 $("#business").append(html)
                 form.render();//菜单渲染 把内容加载进去
@@ -217,8 +231,12 @@
         table.on('toolbar(user-table)', function (obj) {
             console.log(obj)
             switch (obj.event) {
-                case 'clearThirtyOut': clearThirtyOut(); break;
-                case 'clearAll': clearAll(); break;
+                case 'clearThirtyOut':
+                    clearThirtyOut();
+                    break;
+                case 'clearAll':
+                    clearAll();
+                    break;
             }
         })
     });

src/main/resources/static/page/menu/addMenu.html

@@ -95,7 +95,7 @@
                 }else {
                     data.parentId = -1
                 }
-            http.post(id == '' ? 'system/menu/insert': 'system/menu/update',JSON.stringify(data),true,function (res) {
+            http.post(id == '' ? 'system/menu/insert': 'system/menu/update',data,true,function (res) {
                 if (res.code == 200){
                     let index = layer.alert('保存成功!', {
                         title: id == '' ? '添加':'修改' + '信息'

src/main/resources/static/page/object/addCar.html

@@ -1,157 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../css/public.css" media="all">
-</head>
-<body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
-        <div class="layui-form layuimini-form" lay-filter="info">
-            <div class="layui-form-item">
-                <label class="layui-form-label required">姓名</label>
-                <div class="layui-input-inline">
-                    <input type="hidden" name="id" id="id" class="layui-input">
-                    <input type="hidden" name="show" id="show" class="layui-input">
-                    <input type="text" name="name" id="name" lay-verify="required" placeholder="请输入姓名"
-                           class="layui-input" readonly>
-                </div>
-                <label class="layui-form-label required">身份证号</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="idCard" id="idCard" lay-verify="required" placeholder="请输入身份证号"
-                           class="layui-input" readonly>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">购买车型</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="buyCarType" id="buyCarType" lay-verify="required" placeholder="请输入购买车型"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">购买时间</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="buyDate" id="buyDate" lay-verify="required" placeholder="请输入购买时间"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">购买价格(万元)</label>
-                <div class="layui-input-inline">
-                    <input type="number" name="buyPrice" id="buyPrice" lay-verify="required|number" placeholder="请输入购买价格"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">车辆牌号</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="carCard" id="carCard" lay-verify="required"  placeholder="请输入车辆牌号"
-                           class="layui-input">
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label required">产权人</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="propertyOwner" id="propertyOwner" lay-verify="required" placeholder="请输入产权人"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <div class="layui-input-block">
-                    <button class="layui-btn layui-btn-normal" id="save" lay-submit lay-filter="saveBtn">确认保存</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<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>
-    layui.use(['form','laydate','http'], function () {
-        /**变-------------------------------量-------------------------------定-------------------------------义*/
-        var form = layui.form,
-            layer = layui.layer,
-            laydate = layui.laydate,
-            http = layui.http
-            $ = layui.$,
-            userId = $('#id',parent.document).val(),
-            id = $('#id').val();
-            show = $('#show').val()
-
-
-        /**方-------------------------------法-------------------------------定-------------------------------义*/
-        // 初始化日期控件
-        let initDate = function () {
-            laydate.render({
-                elem: '#buyDate',
-                type: 'date',
-                trigger: 'click'
-            });
-        }
-
-
-        // 加载数据
-        let initData = function () {
-            // 加载姓名身份证
-            if (userId != '') {
-                http.get('archives/user/selectByPrimaryKey', {
-                    id: userId
-                }, true, function (res) {
-                    res.data.id = id
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-
-            if (id != ''){
-                http.get('archives/car/selectByPrimaryKey', {
-                    id: id
-                }, true, function (res) {
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-            if (show){
-                $('.layui-form').find('input,textarea,select').attr('disabled',true);
-                $('#save').hide()
-                form.render();
-            }
-
-        }
-
-        let save = function (data) {
-            data.userId = userId
-            http.post(id == '' ? 'archives/car/insert' : 'archives/car/update', JSON.stringify(data), true, function (res) {
-                if (res.code == 200) {
-                    let index = layer.alert('保存成功!', {
-                        title: id == '' ? '添加' : '修改' + '信息'
-                    }, function () {
-                        // 关闭弹出层
-                        layer.close(index);
-                        let iframeIndex = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(iframeIndex);
-                    });
-                }
-            })
-        }
-
-
-        /**事-------------------------------件-------------------------------绑-------------------------------定*/
-        initDate()
-        initData()
-
-
-
-        //监听提交
-        form.on('submit(saveBtn)', function (data) {
-            save(data.field)
-        });
-
-
-    });
-</script>
-</body>
-</html>

src/main/resources/static/page/object/addChildren.html

@@ -1,207 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../css/public.css" media="all">
-</head>
-<body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
-        <div class="layui-form layuimini-form" lay-filter="info">
-            <div class="layui-form-item">
-                <label class="layui-form-label required">姓名</label>
-                <div class="layui-input-inline">
-                    <input type="hidden" name="id" id="id" class="layui-input">
-                    <input type="hidden" name="show" id="show" class="layui-input">
-                    <input type="text" name="name" id="name" lay-verify="required" placeholder="请输入姓名"
-                           class="layui-input" readonly>
-                </div>
-                <label class="layui-form-label required">身份证号</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="idCard" id="idCard" lay-verify="required" placeholder="请输入身份证号"
-                           class="layui-input" readonly>
-                </div>
-            </div>
-
-            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-                <legend>配偶从业、就学情况</legend>
-            </fieldset>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">产权人</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="propertyOwner" id="propertyOwner" lay-verify="required" placeholder="请输入产权人"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">住房面积</label>
-                <div class="layui-input-inline">
-                    <input type="number" name="houseArea" id="houseArea" lay-verify="required|number" placeholder="请输入住房面积"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">房产来源</label>
-                <div class="layui-input-inline">
-                    <select name="houseSource" id="houseSource" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label required">房产去向</label>
-                <div class="layui-input-inline">
-                    <select name="houseTo" id="houseTo" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label required">产权性质和功能类型</label>
-                <div class="layui-input-inline">
-                    <select name="functionType" id="functionType" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label required">交易时间</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="businessDate" id="businessDate" lay-verify="required" readonly placeholder="请选择交易时间"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">交易价格(万元)</label>
-                <div class="layui-input-inline">
-                    <input type="number" name="businessPrice" id="businessPrice" lay-verify="required|number" placeholder="请输入交易价格"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">具体地址</label>
-                <div class="layui-input-inline">
-                    <textarea name="houseAddress" id="houseAddress" class="layui-textarea"></textarea>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <div class="layui-input-block">
-                    <button class="layui-btn layui-btn-normal" id="save" lay-submit lay-filter="saveBtn">确认保存</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<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>
-    layui.use(['form','laydate','http'], function () {
-        /**变-------------------------------量-------------------------------定-------------------------------义*/
-        var form = layui.form,
-            layer = layui.layer,
-            laydate = layui.laydate,
-            http = layui.http
-            $ = layui.$,
-            userId = $('#id',parent.document).val(),
-            id = $('#id').val();
-            show = $('#show').val()
-
-
-        /**方-------------------------------法-------------------------------定-------------------------------义*/
-        // 初始化日期控件
-        let initDate = function () {
-            laydate.render({
-                elem: '#businessDate',
-                type: 'date',
-                trigger: 'click'
-            });
-        }
-
-
-        // 加载数据
-        let initData = function () {
-            // 加载姓名身份证
-            if (userId != '') {
-                http.get('archives/user/selectByPrimaryKey', {
-                    id: userId
-                }, true, function (res) {
-                    res.data.id = id
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-
-            if (id != ''){
-                http.get('archives/house/selectByPrimaryKey', {
-                    id: id
-                }, true, function (res) {
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-            if (show){
-                $('.layui-form').find('input,textarea,select').attr('disabled',true);
-                $('#save').hide()
-                form.render();
-            }
-        }
-
-        let initSelected = function () {
-            http.get('system/dict/selectDictByCode', {code: 'FANGCHANLAIYUAN'}, true, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#houseSource").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-
-            http.get('system/dict/selectDictByCode', {code: 'FANGCHANQUXIANG'}, true, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#houseTo").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-
-            http.get('system/dict/selectDictByCode', {code: 'CHANQUANXINGZHIHEGONGNENLEIXING'}, true, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#functionType").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-        }
-
-        let save = function (data) {
-            data.userId = userId
-            http.post(id == '' ? 'archives/house/insert' : 'archives/house/update', JSON.stringify(data), true, function (res) {
-                if (res.code == 200) {
-                    let index = layer.alert('保存成功!', {
-                        title: id == '' ? '添加' : '修改' + '信息'
-                    }, function () {
-                        // 关闭弹出层
-                        layer.close(index);
-                        let iframeIndex = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(iframeIndex);
-                    });
-                }
-            })
-        }
-
-
-        /**事-------------------------------件-------------------------------绑-------------------------------定*/
-        initDate()
-        initData()
-        initSelected()
-
-
-        //监听提交
-        form.on('submit(saveBtn)', function (data) {
-            save(data.field)
-        });
-    });
-</script>
-</body>
-</html>

src/main/resources/static/page/object/addCriminalResponsibility.html

@@ -1,167 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../css/public.css" media="all">
-</head>
-<body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
-        <div class="layui-form layuimini-form" lay-filter="info">
-            <div class="layui-form-item">
-                <label class="layui-form-label required">姓名</label>
-                <div class="layui-input-inline">
-                    <input type="hidden" name="id" id="id" class="layui-input">
-                    <input type="hidden" name="show" id="show" class="layui-input">
-                    <input type="text" name="name" id="name" lay-verify="required" placeholder="请输入姓名"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">与本人关系</label>
-                <div class="layui-input-inline">
-                    <select name="relationship" id="relationship" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">被追究时间</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="investigatedDate" id="investigatedDate" lay-verify="required" readonly placeholder="请选择被追究时间"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">被追究原因</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="investigatedReason" id="investigatedReason" lay-verify="required" placeholder="请输入被追究原因"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">处理阶段</label>
-                <div class="layui-input-inline">
-                    <select name="treatmentStage" id="treatmentStage" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label required">处理结果</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="treatmentResult" id="treatmentResult" lay-verify="required" placeholder="请输入被追究原因"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <div class="layui-input-block">
-                    <button class="layui-btn layui-btn-normal" id="save" lay-submit lay-filter="saveBtn">确认保存</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<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>
-    layui.use(['form','laydate','http'], function () {
-        /**变-------------------------------量-------------------------------定-------------------------------义*/
-        var form = layui.form,
-            layer = layui.layer,
-            laydate = layui.laydate,
-            http = layui.http
-            $ = layui.$,
-            userId = $('#id',parent.document).val(),
-            id = $('#id').val();
-            show = $('#show').val()
-
-
-        /**方-------------------------------法-------------------------------定-------------------------------义*/
-        // 初始化日期控件
-        let initDate = function () {
-            laydate.render({
-                elem: '#investigatedDate',
-                type: 'date',
-                trigger: 'click'
-            });
-        }
-
-        // 加载数据
-        let initData = function () {
-            // // 加载姓名身份证
-            // if (userId != '') {
-            //     http.get('archives/user/selectByPrimaryKey', {
-            //         id: userId
-            //     }, true, function (res) {
-            //         res.data.id = id
-            //         form.val("info", res.data);
-            //         form.render();
-            //     })
-            // }
-
-            if (id != ''){
-                http.get('archives/criminalResponsibility/selectByPrimaryKey', {
-                    id: id
-                }, true, function (res) {
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-            if (show){
-                $('.layui-form').find('input,textarea,select').attr('disabled',true);
-                $('#save').hide()
-                form.render();
-            }
-        }
-        let initSelected = function () {
-            http.get('system/dict/selectDictByCode', {code: 'YUBENRENGUANXI'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#relationship").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-
-            http.get('system/dict/selectDictByCode', {code: 'CHULIJIEDUAN'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#treatmentStage").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-        }
-
-        let save = function (data) {
-            data.userId = userId
-            http.post(id == '' ? 'archives/criminalResponsibility/insert' : 'archives/criminalResponsibility/update', JSON.stringify(data), true, function (res) {
-                if (res.code == 200) {
-                    let index = layer.alert('保存成功!', {
-                        title: id == '' ? '添加' : '修改' + '信息'
-                    }, function () {
-                        // 关闭弹出层
-                        layer.close(index);
-                        let iframeIndex = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(iframeIndex);
-                    });
-                }
-            })
-        }
-
-
-        /**事-------------------------------件-------------------------------绑-------------------------------定*/
-        initDate()
-        initData()
-        initSelected()
-
-
-        //监听提交
-        form.on('submit(saveBtn)', function (data) {
-            save(data.field)
-        });
-    });
-</script>
-</body>
-</html>

src/main/resources/static/page/object/addCy.html

@@ -1,512 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../css/public.css" media="all">
-</head>
-<body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
-        <div class="layui-form layuimini-form" lay-filter="info">
-            <div class="layui-form-item">
-                <label class="layui-form-label required">姓名</label>
-                <div class="layui-input-inline">
-                    <input type="hidden" name="id" id="id" class="layui-input">
-                    <input type="hidden" name="show" id="show" class="layui-input">
-                    <input type="text" name="name" id="name" lay-verify="required" placeholder="请输入姓名"
-                           class="layui-input" readonly>
-                </div>
-                <label class="layui-form-label required">身份证号</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="idCard" id="idCard" lay-verify="required" placeholder="请输入身份证号"
-                           class="layui-input" readonly>
-                </div>
-            </div>
-            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-                <legend>配偶从业、就学情况</legend>
-            </fieldset>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">配偶</label>
-                <div class="layui-input-inline">
-                    <select name="spouseRelationship" id="spouseRelationship" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label required">配偶姓名</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="spouseName" id="spouseName" lay-verify="required" placeholder="请输入配偶姓名"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">工作（学习）单位</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="spouseCompany" id="spouseCompany" lay-verify="required"
-                           placeholder="请输入工作（学习）单位"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">现任职务</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="spouseDutyRank" id="spouseDutyRank" lay-verify="required"
-                           placeholder="请输入现任职务"
-                           class="layui-input">
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label required">单位性质</label>
-                <div class="layui-input-inline">
-                    <select name="spouseUnitNature" id="spouseUnitNature" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label required">证件名称</label>
-                <div class="layui-input-inline">
-                    <select name="spouseCardName" id="spouseCardName" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">证件号码</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="spouseIdCard" id="spouseIdCard" lay-verify="required" placeholder="请输入证件号码"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-                <legend>子女及其配偶从业、就学情况1</legend>
-            </fieldset>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">子女</label>
-                <div class="layui-input-inline">
-                    <select name="childrenRelationship1" id="childrenRelationship1">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">子女姓名</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenName1" id="childrenName1" placeholder="请输入子女姓名"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">工作（学习）单位</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenCompany1" id="childrenCompany1" placeholder="请输入工作（学习）单位"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label">单位性质</label>
-                <div class="layui-input-inline">
-                    <select name="childrenUnitNature1" id="childrenUnitNature1">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">证件名称</label>
-                <div class="layui-input-inline">
-                    <select name="childrenCardName1" id="childrenCardName1">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">证件号码</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenIdCard1" id="childrenIdCard1" placeholder="请输入证件号码"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">子女配偶姓名</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenSpouseName1" id="childrenSpouseName1" placeholder="请输入子女姓名"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label">工作（学习）单位</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenSpouseCompany1" id="childrenSpouseCompany1"
-                           placeholder="请输入工作（学习）单位" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">单位性质</label>
-                <div class="layui-input-inline">
-                    <select name="childrenSpouseUnitNature1" id="childrenSpouseUnitNature1">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">证件名称</label>
-                <div class="layui-input-inline">
-                    <select name="childrenSpouseCardName1" id="childrenSpouseCardName1">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">证件号码</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenSpouseIdCard1" id="childrenSpouseIdCard1" placeholder="请输入证件号码"
-                           class="layui-input">
-                </div>
-            </div>
-
-
-            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
-                <legend>子女及其配偶从业、就学情况2</legend>
-            </fieldset>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">子女</label>
-                <div class="layui-input-inline">
-                    <select name="childrenRelationship2" id="childrenRelationship2">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">子女姓名</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenName2" id="childrenName2" placeholder="请输入子女姓名"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">工作（学习）单位</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenCompany2" id="childrenCompany2" placeholder="请输入工作（学习）单位"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label">单位性质</label>
-                <div class="layui-input-inline">
-                    <select name="childrenUnitNature2" id="childrenUnitNature2">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">证件名称</label>
-                <div class="layui-input-inline">
-                    <select name="childrenCardName2" id="childrenCardName2">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">证件号码</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenIdCard2" id="childrenIdCard2" placeholder="请输入证件号码"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">子女配偶姓名</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenSpouseName2" id="childrenSpouseName2" placeholder="请输入子女姓名"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label">工作（学习）单位</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenSpouseCompany2" id="childrenSpouseCompany2"
-                           placeholder="请输入工作（学习）单位" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">单位性质</label>
-                <div class="layui-input-inline">
-                    <select name="childrenSpouseUnitNature2" id="childrenSpouseUnitNature2">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">证件名称</label>
-                <div class="layui-input-inline">
-                    <select name="childrenSpouseCardName2" id="childrenSpouseCardName2">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">证件号码</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenSpouseIdCard2" id="childrenSpouseIdCard2" placeholder="请输入证件号码"
-                           class="layui-input">
-                </div>
-            </div>
-
-
-            <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
-                <legend>子女及其配偶从业、就学情况3</legend>
-            </fieldset>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">子女</label>
-                <div class="layui-input-inline">
-                    <select name="childrenRelationship3" id="childrenRelationship3">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">子女姓名</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenName3" id="childrenName3" placeholder="请输入子女姓名"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">工作（学习）单位</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenCompany3" id="childrenCompany3" placeholder="请输入工作（学习）单位"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label">单位性质</label>
-                <div class="layui-input-inline">
-                    <select name="childrenUnitNature3" id="childrenUnitNature3">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">证件名称</label>
-                <div class="layui-input-inline">
-                    <select name="childrenCardName3" id="childrenCardName3">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">证件号码</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenIdCard3" id="childrenIdCard3" placeholder="请输入证件号码"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">子女配偶姓名</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenSpouseName3" id="childrenSpouseName3" placeholder="请输入子女姓名"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label">工作（学习）单位</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenSpouseCompany3" id="childrenSpouseCompany3"
-                           placeholder="请输入工作（学习）单位" class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">单位性质</label>
-                <div class="layui-input-inline">
-                    <select name="childrenSpouseUnitNature3" id="childrenSpouseUnitNature3">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">证件名称</label>
-                <div class="layui-input-inline">
-                    <select name="childrenSpouseCardName3" id="childrenSpouseCardName3">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">证件号码</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="childrenSpouseIdCard3" id="childrenSpouseIdCard3" placeholder="请输入证件号码"
-                           class="layui-input">
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
-                <div class="layui-input-block">
-                    <button class="layui-btn layui-btn-normal" id="save" lay-submit lay-filter="saveBtn">确认保存</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<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>
-    layui.use(['form', 'http'], function () {
-        /**变-------------------------------量-------------------------------定-------------------------------义*/
-        var form = layui.form,
-            layer = layui.layer,
-            http = layui.http
-        $ = layui.$,
-            userId = $('#id', parent.document).val(),
-            id = $('#id').val();
-        show = $('#show').val()
-
-
-        /**方-------------------------------法-------------------------------定-------------------------------义*/
-
-
-            // 加载数据
-        let initData = function () {
-                // 加载姓名身份证
-                if (userId != '') {
-                    http.get('archives/user/selectByPrimaryKey', {
-                        id: userId
-                    }, true, function (res) {
-                        res.data.id = id
-                        form.val("info", res.data);
-                        form.render();
-                    })
-                }
-
-                if (id != '') {
-                    http.get('archives/spouse/selectByPrimaryKey', {
-                        id: id
-                    }, true, function (res) {
-                        form.val("info", res.data);
-                        form.render();
-                    })
-
-                    http.get('archives/children/select', {
-                        userId: userId,
-                        spouseId: id
-                    }, true, function (res) {
-                        let childred = {}
-                        for (let i in res.data) {
-                            let index = parseInt(i) + 1
-                            console.log(index)
-                            childred['childrenRelationship' + index] = res.data[i].childrenRelationship
-                            childred['childrenName' + index] = res.data[i].childrenName
-                            childred['childrenCompany' + index] = res.data[i].childrenCompany
-                            childred['childrenUnitNature' + index] = res.data[i].childrenUnitNature
-                            childred['childrenCardName' + index] = res.data[i].childrenCardName
-                            childred['childrenIdCard' + index] = res.data[i].childrenIdCard
-                            childred['childrenSpouseName' + index] = res.data[i].childrenSpouseName
-                            childred['childrenSpouseCompany' + index] = res.data[i].childrenSpouseCompany
-                            childred['childrenSpouseUnitNature' + index] = res.data[i].childrenSpouseUnitNature
-                            childred['childrenSpouseCardName' + index] = res.data[i].childrenSpouseCardName
-                            childred['childrenSpouseIdCard' + index] = res.data[i].childrenSpouseIdCard
-                        }
-                        console.log(childred)
-                        form.val("info",childred);
-                        form.render();
-                    })
-                }
-                if (show) {
-                    $('.layui-form').find('input,textarea,select').attr('disabled', true);
-                    $('#save').hide()
-                    form.render();
-                }
-            }
-
-        let initSelected = function () {
-            http.get('system/dict/selectDictByCode', {code: 'PEIOU'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#spouseRelationship").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-
-            http.get('system/dict/selectDictByCode', {code: 'ZINVXUANZE'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#childrenRelationship1").append(html)
-                $("#childrenRelationship2").append(html)
-                $("#childrenRelationship3").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-
-
-            http.get('system/dict/selectDictByCode', {code: 'DANWEIXINGZHI'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#spouseUnitNature").append(html)
-                $("#childrenUnitNature1").append(html)
-                $("#childrenUnitNature2").append(html)
-                $("#childrenUnitNature3").append(html)
-                $("#childrenSpouseUnitNature1").append(html)
-                $("#childrenSpouseUnitNature2").append(html)
-                $("#childrenSpouseUnitNature3").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-
-
-            http.get('system/dict/selectDictByCode', {code: 'ZHENGJIANMINGCHENCONGYEJIUXUE'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#spouseCardName").append(html)
-                $("#childrenSpouseCardName1").append(html)
-                $("#childrenSpouseCardName2").append(html)
-                $("#childrenSpouseCardName3").append(html)
-                $("#childrenCardName1").append(html)
-                $("#childrenCardName2").append(html)
-                $("#childrenCardName3").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-        }
-
-        let save = function (data) {
-            let children = []
-            for (let i = 1; i < 4; i++) {
-                if (data['childrenName' + i] != '') {
-                    children.push({
-                        userId: userId,
-                        childrenRelationship: data['childrenRelationship' + i],
-                        childrenName: data['childrenName' + i],
-                        childrenCompany: data['childrenCompany' + i],
-                        childrenUnitNature: data['childrenUnitNature' + i],
-                        childrenCardName: data['childrenCardName' + i],
-                        childrenIdCard: data['childrenIdCard' + i],
-                        childrenSpouseName: data['childrenSpouseName' + i],
-                        childrenSpouseCompany: data['childrenSpouseCompany' + i],
-                        childrenSpouseUnitNature: data['childrenSpouseUnitNature' + i],
-                        childrenSpouseCardName: data['childrenSpouseCardName' + i],
-                        childrenSpouseIdCard: data['childrenSpouseIdCard' + i]
-                    })
-                }
-            }
-            data.children = children;
-            data.userId = userId
-            http.post(id == '' ? 'archives/spouse/insert' : 'archives/spouse/update', JSON.stringify(data), true, function (res) {
-                if (res.code == 200) {
-                    let index = layer.alert('保存成功!', {
-                        title: id == '' ? '添加' : '修改' + '信息'
-                    }, function () {
-                        // 关闭弹出层
-                        layer.close(index);
-                        let iframeIndex = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(iframeIndex);
-                    });
-                }
-            })
-        }
-
-
-        /**事-------------------------------件-------------------------------绑-------------------------------定*/
-        initSelected()
-        initData()
-
-        //监听提交
-        form.on('submit(saveBtn)', function (data) {
-            save(data.field)
-        });
-    });
-</script>
-</body>
-</html>

src/main/resources/static/page/object/addEnterprise.html

@@ -1,210 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../css/public.css" media="all">
-</head>
-<body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
-        <div class="layui-form layuimini-form" lay-filter="info">
-            <div class="layui-form-item">
-                <label class="layui-form-label required">姓名</label>
-                <div class="layui-input-inline">
-                    <input type="hidden" name="id" id="id" class="layui-input">
-                    <input type="hidden" name="show" id="show" class="layui-input">
-                    <input type="text" name="name" id="name" lay-verify="required" placeholder="请输入姓名"
-                           class="layui-input" readonly>
-                </div>
-                <label class="layui-form-label required">身份证号</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="idCard" id="idCard" lay-verify="required" placeholder="请输入身份证号"
-                           class="layui-input" readonly>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">企业或其他市场主体名称</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="enterpriseName" id="enterpriseName" lay-verify="required" placeholder="请输入企业或其他市场主体名称"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">统一社会信用代码/注册号</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="enterpriseId" id="enterpriseId" lay-verify="required" placeholder="请输入统一社会信用代码/注册号"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">法人</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="founder" id="founder" lay-verify="required" placeholder="请输入法人"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">成立日期</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="establishmentDate" id="establishmentDate" lay-verify="required" readonly placeholder="请选择成立日期"
-                           class="layui-input">
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label required">经营范围</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="businessScope" id="businessScope" lay-verify="required" placeholder="请输入经营范围"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">注册地</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="registerAddress" id="registerAddress" lay-verify="required" placeholder="请输入注册地"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">经营地</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="businessAddress" id="businessAddress" lay-verify="required" placeholder="请输入经营地"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">企业或其他市场主体类型</label>
-                <div class="layui-input-inline">
-                    <select name="enterpriseType" id="enterpriseType" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">注册资本（金）或资金数额（出资额）(单位万元)</label>
-                <div class="layui-input-inline">
-                    <input type="number" name="registerPrice" id="registerPrice" lay-verify="required|number" placeholder="请输入注册资本"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">个人认缴出资额或个人出资额(单位万元)</label>
-                <div class="layui-input-inline">
-                    <input type="number" name="individualContribution" id="individualContribution" lay-verify="required|number" placeholder="请输入个人出资额"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">个人认缴出资比例或个人出资比例(xx%)</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="individualContributionRate" id="individualContributionRate" lay-verify="required" placeholder="请输入出资比例"
-                           class="layui-input">
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
-                <div class="layui-input-block">
-                    <button class="layui-btn layui-btn-normal" id="save" lay-submit lay-filter="saveBtn">确认保存</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<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>
-    layui.use(['form','laydate','http'], function () {
-        /**变-------------------------------量-------------------------------定-------------------------------义*/
-        var form = layui.form,
-            layer = layui.layer,
-            laydate = layui.laydate,
-            http = layui.http
-            $ = layui.$,
-            userId = $('#id',parent.document).val(),
-            id = $('#id').val();
-            show = $('#show').val()
-
-
-        /**方-------------------------------法-------------------------------定-------------------------------义*/
-        // 初始化日期控件
-        let initDate = function () {
-            laydate.render({
-                elem: '#establishmentDate',
-                type: 'date',
-                trigger: 'click'
-            });
-        }
-
-        let initSelected = function () {
-            http.get('system/dict/selectDictByCode', {code: 'QIYEHUOQITASHICHANGZHUTILEIXING'}, true, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#enterpriseType").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-
-        }
-
-        // 加载数据
-        let initData = function () {
-            // 加载姓名身份证
-            if (userId != '') {
-                http.get('archives/user/selectByPrimaryKey', {
-                    id: userId
-                }, true, function (res) {
-                    res.data.id = id
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-
-            if (id != ''){
-                http.get('archives/enterprise/selectByPrimaryKey', {
-                    id: id
-                }, true, function (res) {
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-            if (show){
-                $('.layui-form').find('input,textarea,select').attr('disabled',true);
-                $('#save').hide()
-                form.render();
-            }
-
-        }
-
-        let save = function (data) {
-            data.userId = userId
-            http.post(id == '' ? 'archives/enterprise/insert' : 'archives/enterprise/update', JSON.stringify(data), true, function (res) {
-                if (res.code == 200) {
-                    let index = layer.alert('保存成功!', {
-                        title: id == '' ? '添加' : '修改' + '信息'
-                    }, function () {
-                        // 关闭弹出层
-                        layer.close(index);
-                        let iframeIndex = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(iframeIndex);
-                    });
-                }
-            })
-        }
-
-
-        /**事-------------------------------件-------------------------------绑-------------------------------定*/
-        initSelected()
-        initDate()
-        initData()
-
-
-
-        //监听提交
-        form.on('submit(saveBtn)', function (data) {
-            save(data.field)
-        });
-
-
-    });
-</script>
-</body>
-</html>

src/main/resources/static/page/object/addHouse.html

@@ -1,203 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../css/public.css" media="all">
-</head>
-<body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
-        <div class="layui-form layuimini-form" lay-filter="info">
-            <div class="layui-form-item">
-                <label class="layui-form-label required">姓名</label>
-                <div class="layui-input-inline">
-                    <input type="hidden" name="id" id="id" class="layui-input">
-                    <input type="hidden" name="show" id="show" class="layui-input">
-                    <input type="text" name="name" id="name" lay-verify="required" placeholder="请输入姓名"
-                           class="layui-input" readonly>
-                </div>
-                <label class="layui-form-label required">身份证号</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="idCard" id="idCard" lay-verify="required" placeholder="请输入身份证号"
-                           class="layui-input" readonly>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">产权人</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="propertyOwner" id="propertyOwner" lay-verify="required" placeholder="请输入产权人"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">住房面积</label>
-                <div class="layui-input-inline">
-                    <input type="number" name="houseArea" id="houseArea" lay-verify="required|number" placeholder="请输入住房面积"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">房产来源</label>
-                <div class="layui-input-inline">
-                    <select name="houseSource" id="houseSource" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label required">房产去向</label>
-                <div class="layui-input-inline">
-                    <select name="houseTo" id="houseTo" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label required">产权性质和功能类型</label>
-                <div class="layui-input-inline">
-                    <select name="functionType" id="functionType" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label required">交易时间</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="businessDate" id="businessDate" lay-verify="required" readonly placeholder="请选择交易时间"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">交易价格(万元)</label>
-                <div class="layui-input-inline">
-                    <input type="number" name="businessPrice" id="businessPrice" lay-verify="required|number" placeholder="请输入交易价格"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">具体地址</label>
-                <div class="layui-input-inline">
-                    <textarea name="houseAddress" id="houseAddress" class="layui-textarea"></textarea>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <div class="layui-input-block">
-                    <button class="layui-btn layui-btn-normal" id="save" lay-submit lay-filter="saveBtn">确认保存</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<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>
-    layui.use(['form','laydate','http'], function () {
-        /**变-------------------------------量-------------------------------定-------------------------------义*/
-        var form = layui.form,
-            layer = layui.layer,
-            laydate = layui.laydate,
-            http = layui.http
-            $ = layui.$,
-            userId = $('#id',parent.document).val(),
-            id = $('#id').val();
-            show = $('#show').val()
-
-
-        /**方-------------------------------法-------------------------------定-------------------------------义*/
-        // 初始化日期控件
-        let initDate = function () {
-            laydate.render({
-                elem: '#businessDate',
-                type: 'date',
-                trigger: 'click'
-            });
-        }
-
-
-        // 加载数据
-        let initData = function () {
-            // 加载姓名身份证
-            if (userId != '') {
-                http.get('archives/user/selectByPrimaryKey', {
-                    id: userId
-                }, true, function (res) {
-                    res.data.id = id
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-
-            if (id != ''){
-                http.get('archives/house/selectByPrimaryKey', {
-                    id: id
-                }, true, function (res) {
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-            if (show){
-                $('.layui-form').find('input,textarea,select').attr('disabled',true);
-                $('#save').hide()
-                form.render();
-            }
-        }
-
-        let initSelected = function () {
-            http.get('system/dict/selectDictByCode', {code: 'FANGCHANLAIYUAN'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#houseSource").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-
-            http.get('system/dict/selectDictByCode', {code: 'FANGCHANQUXIANG'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#houseTo").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-
-            http.get('system/dict/selectDictByCode', {code: 'CHANQUANXINGZHIHEGONGNENLEIXING'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#functionType").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-        }
-
-        let save = function (data) {
-            data.userId = userId
-            http.post(id == '' ? 'archives/house/insert' : 'archives/house/update', JSON.stringify(data), true, function (res) {
-                if (res.code == 200) {
-                    let index = layer.alert('保存成功!', {
-                        title: id == '' ? '添加' : '修改' + '信息'
-                    }, function () {
-                        // 关闭弹出层
-                        layer.close(index);
-                        let iframeIndex = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(iframeIndex);
-                    });
-                }
-            })
-        }
-
-
-        /**事-------------------------------件-------------------------------绑-------------------------------定*/
-        initDate()
-        initSelected()
-        initData()
-
-
-        //监听提交
-        form.on('submit(saveBtn)', function (data) {
-            save(data.field)
-        });
-    });
-</script>
-</body>
-</html>

src/main/resources/static/page/object/addHy.html

@@ -1,176 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../css/public.css" media="all">
-</head>
-<body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
-        <div class="layui-form layuimini-form" lay-filter="info">
-            <div class="layui-form-item">
-                <label class="layui-form-label required">姓名</label>
-                <div class="layui-input-inline">
-                    <input type="hidden" name="id" id="id" class="layui-input">
-                    <input type="hidden" name="show" id="show" class="layui-input">
-                    <input type="text" name="name" id="name" lay-verify="required" placeholder="请输入姓名"
-                           class="layui-input" readonly>
-                </div>
-                <label class="layui-form-label required">身份证号</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="idCard" id="idCard" lay-verify="required" placeholder="请输入身份证号"
-                           class="layui-input" readonly>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">婚姻现状</label>
-                <div class="layui-input-inline">
-                    <select name="marriageType" id="marriageType" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label required">婚姻变化情况</label>
-                <div class="layui-input-inline">
-                    <select name="marriageIsChange" id="marriageIsChange" lay-verify="required">
-                        <option value="">请选择</option>
-                        <option value="0">无变化</option>
-                        <option value="1">有变化</option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label">有何变化</label>
-                <div class="layui-input-inline">
-                    <select name="changeMarriage" id="changeMarriage">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label">变化时间</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="changeTime" id="changeTime"
-                           class="layui-input">
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-input-block">
-                    <button class="layui-btn layui-btn-normal" id="save" lay-submit lay-filter="saveBtn">确认保存</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<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>
-    layui.use(['form','laydate','http'], function () {
-        /**变-------------------------------量-------------------------------定-------------------------------义*/
-        var form = layui.form,
-            layer = layui.layer,
-            laydate = layui.laydate,
-            http = layui.http
-            $ = layui.$,
-            userId = $('#id',parent.document).val(),
-            id = $('#id').val();
-            show = $('#show').val()
-
-
-        /**方-------------------------------法-------------------------------定-------------------------------义*/
-        // 初始化日期控件
-        let initDate = function () {
-            laydate.render({
-                elem: '#changeTime',
-                type: 'date',
-                trigger: 'click'
-            });
-        }
-
-        // 加载下拉框
-        let initSelected = function () {
-            http.get('system/dict/selectDictByCode', {code: 'HUNYINZHUANGTAI'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#marriageType").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-            http.get('system/dict/selectDictByCode', {code: 'YOUHEBIANHUA'}, false, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#changeMarriage").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-        }
-
-
-        // 加载数据
-        let initData = function () {
-            // 加载姓名身份证
-            if (userId != '') {
-                http.get('archives/user/selectByPrimaryKey', {
-                    id: userId
-                }, true, function (res) {
-                    res.data.id = id
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-
-            if (id != ''){
-                http.get('archives/marital/selectByPrimaryKey', {
-                    id: id
-                }, true, function (res) {
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-            if (show){
-                $('.layui-form').find('input,textarea,select').attr('disabled',true);
-                $('#save').hide()
-                form.render();
-            }
-
-        }
-
-        let save = function (data) {
-            data.userId = userId
-            http.post(id == '' ? 'archives/marital/insert' : 'archives/marital/update', JSON.stringify(data), true, function (res) {
-                if (res.code == 200) {
-                    let index = layer.alert('保存成功!', {
-                        title: id == '' ? '添加' : '修改' + '信息'
-                    }, function () {
-                        // 关闭弹出层
-                        layer.close(index);
-                        let iframeIndex = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(iframeIndex);
-                    });
-                }
-            })
-        }
-
-
-        /**事-------------------------------件-------------------------------绑-------------------------------定*/
-        initSelected()
-        initDate()
-        initData()
-
-
-
-
-        //监听提交
-        form.on('submit(saveBtn)', function (data) {
-            save(data.field)
-        });
-
-
-    });
-</script>
-</body>
-</html>

src/main/resources/static/page/object/addPassPort.html

@@ -1,183 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <link rel="stylesheet" href="../../lib/layui-v2.5.5/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../css/public.css" media="all">
-</head>
-<body>
-<div class="layuimini-container">
-    <div class="layuimini-main">
-        <div class="layui-form layuimini-form" lay-filter="info">
-            <div class="layui-form-item">
-                <label class="layui-form-label required">姓名</label>
-                <div class="layui-input-inline">
-                    <input type="hidden" name="id" id="id" class="layui-input">
-                    <input type="hidden" name="show" id="show" class="layui-input">
-                    <input type="text" name="name" id="name" lay-verify="required" placeholder="请输入姓名"
-                           class="layui-input" readonly>
-                </div>
-                <label class="layui-form-label required">身份证号</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="idCard" id="idCard" lay-verify="required" placeholder="请输入身份证号"
-                           class="layui-input" readonly>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">证件名称</label>
-                <div class="layui-input-inline">
-                    <select name="cardName" id="cardName" lay-verify="required">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-                <label class="layui-form-label required">证件号码</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="identificationNumber" id="identificationNumber" lay-verify="required" placeholder="请输入证件号码"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <label class="layui-form-label required">发证机关</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="issuingAuthority" id="issuingAuthority" lay-verify="required" placeholder="请输入发证机关"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">发证日期</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="issueDate" id="issueDate" lay-verify="required" readonly placeholder="请选择发证日期"
-                           class="layui-input">
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label required">有效期截止</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="expirationDate" id="expirationDate" lay-verify="required" readonly placeholder="请选择有效期截止"
-                           class="layui-input">
-                </div>
-                <label class="layui-form-label required">保管机构</label>
-                <div class="layui-input-inline">
-                    <input type="text" name="custodialInstitution" id="custodialInstitution" lay-verify="required" placeholder="请输入保管机构"
-                           class="layui-input">
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <div class="layui-input-block">
-                    <button class="layui-btn layui-btn-normal" id="save" lay-submit lay-filter="saveBtn">确认保存</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<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>
-    layui.use(['form','laydate','http'], function () {
-        /**变-------------------------------量-------------------------------定-------------------------------义*/
-        var form = layui.form,
-            layer = layui.layer,
-            laydate = layui.laydate,
-            http = layui.http
-            $ = layui.$,
-            userId = $('#id',parent.document).val(),
-            id = $('#id').val();
-            show = $('#show').val()
-
-
-        /**方-------------------------------法-------------------------------定-------------------------------义*/
-        // 初始化日期控件
-        let initDate = function () {
-            laydate.render({
-                elem: '#issueDate',
-                type: 'date',
-                trigger: 'click'
-            });
-
-            laydate.render({
-                elem: '#expirationDate',
-                type: 'date',
-                trigger: 'click'
-            });
-        }
-
-        let initSelected = function () {
-            http.get('system/dict/selectDictByCode', {code: 'ZHENGJIANMINGCHEN'}, true, function (res) {
-                let html = '';
-                for (let i in res.data) {
-                    html += '<option value="' + res.data[i].dictCode + '">' + res.data[i].dictName + '</option>'
-                }
-                $("#cardName").append(html)
-                form.render();//菜单渲染 把内容加载进去
-            })
-        }
-
-
-
-        // 加载数据
-        let initData = function () {
-            // 加载姓名身份证
-            if (userId != '') {
-                http.get('archives/user/selectByPrimaryKey', {
-                    id: userId
-                }, true, function (res) {
-                    res.data.id = id
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-
-            if (id != ''){
-                http.get('archives/passport/selectByPrimaryKey', {
-                    id: id
-                }, true, function (res) {
-                    form.val("info", res.data);
-                    form.render();
-                })
-            }
-
-            if (show){
-                $('.layui-form').find('input,textarea,select').attr('disabled',true);
-                $('#save').hide()
-                form.render();
-            }
-
-        }
-
-        let save = function (data) {
-            data.userId = userId
-            http.post(id == '' ? 'archives/passport/insert' : 'archives/passport/update', JSON.stringify(data), true, function (res) {
-                if (res.code == 200) {
-                    let index = layer.alert('保存成功!', {
-                        title: id == '' ? '添加' : '修改' + '信息'
-                    }, function () {
-                        // 关闭弹出层
-                        layer.close(index);
-                        let iframeIndex = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(iframeIndex);
-                    });
-                }
-            })
-        }
-
-
-        /**事-------------------------------件-------------------------------绑-------------------------------定*/
-        initSelected()
-        initDate()
-        initData()
-
-
-
-        //监听提交
-        form.on('submit(saveBtn)', function (data) {
-            save(data.field)
-        });
-
-
-    });
-</script>
-</body>
-</html>

src/main/resources/static/page/role/edit.html

@@ -57,7 +57,7 @@
 
         //保存方法
         let save = function (data) {
-            http.post(id == '' ? 'system/role/insert': 'system/role/update',JSON.stringify(data),true,function (res) {
+            http.post(id == '' ? 'system/role/insert': 'system/role/update',data,true,function (res) {
                 if (res.code == 200){
                     let index = layer.alert('保存成功!', {
                         title: id == '' ? '添加':'修改' + '信息'
@@ -92,4 +92,4 @@
     });
 </script>
 </body>
-</html>
+</html>

src/main/resources/static/page/role/editRole.html

@@ -42,6 +42,8 @@
             $ = layui.$;
         let id = $('#id').val()
 
+        console.log(id)
+
         /**方-------------------------------法-------------------------------定-------------------------------义*/
 
         let initTree = function () {
@@ -82,7 +84,7 @@
                 roleId: id,
                     menuId: getChecked_list(tree.getChecked("demoId1"))
             }
-            http.post('system/role/setRole',JSON.stringify(data),true,function (res) {
+            http.post('system/role/setRole',data,true,function (res) {
                 if (res.code == 200){
                     let index = layer.alert('保存成功!', {
                         title: id == '' ? '添加':'修改' + '信息'