diff --git a/dangan-admin/src/main/java/com/da/RuoYiApplication.java b/dangan-admin/src/main/java/com/da/RuoYiApplication.java index 7e85cb3..13ca70e 100644 --- a/dangan-admin/src/main/java/com/da/RuoYiApplication.java +++ b/dangan-admin/src/main/java/com/da/RuoYiApplication.java @@ -16,7 +16,7 @@ public class RuoYiApplication { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + + System.out.println("(♥◠‿◠)ﾉﾞ 项目启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/dangan-admin/src/main/resources/application.yml b/dangan-admin/src/main/resources/application.yml index 31c9898..6031bd8 100644 --- a/dangan-admin/src/main/resources/application.yml +++ b/dangan-admin/src/main/resources/application.yml @@ -7,7 +7,7 @@ ruoyi: # 版权年份 copyrightYear: 2024 # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: D:/dangan/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 diff --git a/dangan-dangan/pom.xml b/dangan-dangan/pom.xml index 1c73355..3ab637e 100644 --- a/dangan-dangan/pom.xml +++ b/dangan-dangan/pom.xml @@ -17,6 +17,16 @@ dangan-common ${dangan.version} + + com.dangan + dangan-framework + + + + cn.hutool + hutool-all + 4.5.1 + \ No newline at end of file diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/AreaSortController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/AreaSortController.java index 9bba1cd..290d534 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/AreaSortController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/AreaSortController.java @@ -1,25 +1,19 @@ package com.da.dangan.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.da.common.annotation.Log; import com.da.common.core.controller.BaseController; import com.da.common.core.domain.AjaxResult; +import com.da.common.core.page.TableDataInfo; import com.da.common.enums.BusinessType; +import com.da.common.utils.poi.ExcelUtil; import com.da.dangan.domain.AreaSort; import com.da.dangan.service.IAreaSortService; -import com.da.common.utils.poi.ExcelUtil; -import com.da.common.core.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 档案行政分类Controller @@ -41,7 +35,7 @@ public class AreaSortController extends BaseController @GetMapping("/list") public TableDataInfo list(AreaSort areaSort) { - startPage(); + //startPage(); List list = areaSortService.selectAreaSortList(areaSort); return getDataTable(list); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaBookshelfController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaBookshelfController.java index 45be9b7..74d28f0 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaBookshelfController.java +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaBookshelfController.java @@ -35,7 +35,7 @@ public class DaBookshelfController extends BaseController @GetMapping("/list") public TableDataInfo list(DaBookshelf daBookshelf) { - startPage(); + // startPage(); List list = daBookshelfService.selectDaBookshelfList(daBookshelf); return getDataTable(list); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java new file mode 100644 index 0000000..b791eaa --- /dev/null +++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaPicturesRecardController.java @@ -0,0 +1,98 @@ +package com.da.dangan.controller; + +import com.da.common.annotation.Log; +import com.da.common.core.controller.BaseController; +import com.da.common.core.domain.AjaxResult; +import com.da.common.core.page.TableDataInfo; +import com.da.common.enums.BusinessType; +import com.da.common.utils.poi.ExcelUtil; +import com.da.dangan.domain.DaPicturesRecard; +import com.da.dangan.service.IDaPicturesRecardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 档案图片信息记录Controller + * + * @author hs + * @date 2024-05-13 + */ +@RestController +@RequestMapping("/dangan/pictureRecard") +public class DaPicturesRecardController extends BaseController +{ + @Autowired + private IDaPicturesRecardService daPicturesRecardService; + + /** + * 查询档案图片信息记录列表 + */ + @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:list')") + @GetMapping("/list") + public TableDataInfo list(DaPicturesRecard daPicturesRecard) + { + startPage(); + List list = daPicturesRecardService.selectDaPicturesRecardList(daPicturesRecard); + return getDataTable(list); + } + + /** + * 导出档案图片信息记录列表 + */ + @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:export')") + @Log(title = "档案图片信息记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DaPicturesRecard daPicturesRecard) + { + List list = daPicturesRecardService.selectDaPicturesRecardList(daPicturesRecard); + ExcelUtil util = new ExcelUtil(DaPicturesRecard.class); + util.exportExcel(response, list, "档案图片信息记录数据"); + } + + /** + * 获取档案图片信息记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(daPicturesRecardService.selectDaPicturesRecardById(id)); + } + + /** + * 新增档案图片信息记录 + */ + @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:add')") + @Log(title = "档案图片信息记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DaPicturesRecard daPicturesRecard) + { + return toAjax(daPicturesRecardService.insertDaPicturesRecard(daPicturesRecard)); + } + + /** + * 修改档案图片信息记录 + */ + @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:edit')") + @Log(title = "档案图片信息记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DaPicturesRecard daPicturesRecard) + { + return toAjax(daPicturesRecardService.updateDaPicturesRecard(daPicturesRecard)); + } + + /** + * 删除档案图片信息记录 + */ + @PreAuthorize("@ss.hasPermi('dangan:pictureRecard:remove')") + @Log(title = "档案图片信息记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(daPicturesRecardService.deleteDaPicturesRecardByIds(ids)); + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java b/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java new file mode 100644 index 0000000..8ac1b69 --- /dev/null +++ b/dangan-dangan/src/main/java/com/da/dangan/domain/DaPicturesRecard.java @@ -0,0 +1,140 @@ +package com.da.dangan.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.da.common.annotation.Excel; +import com.da.common.core.domain.BaseEntity; + +/** + * 档案图片信息记录对象 da_pictures_recard + * + * @author hs + * @date 2024-05-13 + */ +public class DaPicturesRecard extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 图片名称 */ + @Excel(name = "图片名称") + private String picName; + + /** 图片路径 */ + @Excel(name = "图片路径") + private String picUrl; + + /** 物理书架ID */ + @Excel(name = "物理书架ID") + private Long wlsjId; + + /** 物理书架路径 */ + @Excel(name = "物理书架路径") + private String wlsjPath; + + /** 档案目录ID */ + @Excel(name = "档案目录ID") + private Long muId; + + /** 档案目录路径 */ + @Excel(name = "档案目录路径") + private String muPath; + + /** 是否已经识别 */ + @Excel(name = "是否已经识别") + private String recognize; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setPicName(String picName) + { + this.picName = picName; + } + + public String getPicName() + { + return picName; + } + public void setPicUrl(String picUrl) + { + this.picUrl = picUrl; + } + + public String getPicUrl() + { + return picUrl; + } + public void setWlsjId(Long wlsjId) + { + this.wlsjId = wlsjId; + } + + public Long getWlsjId() + { + return wlsjId; + } + public void setWlsjPath(String wlsjPath) + { + this.wlsjPath = wlsjPath; + } + + public String getWlsjPath() + { + return wlsjPath; + } + public void setMuId(Long muId) + { + this.muId = muId; + } + + public Long getMuId() + { + return muId; + } + public void setMuPath(String muPath) + { + this.muPath = muPath; + } + + public String getMuPath() + { + return muPath; + } + public void setRecognize(String recognize) + { + this.recognize = recognize; + } + + public String getRecognize() + { + return recognize; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("picName", getPicName()) + .append("picUrl", getPicUrl()) + .append("wlsjId", getWlsjId()) + .append("wlsjPath", getWlsjPath()) + .append("muId", getMuId()) + .append("muPath", getMuPath()) + .append("recognize", getRecognize()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaPicturesRecardMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaPicturesRecardMapper.java new file mode 100644 index 0000000..6f6b7f9 --- /dev/null +++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaPicturesRecardMapper.java @@ -0,0 +1,62 @@ +package com.da.dangan.mapper; + +import com.da.dangan.domain.DaPicturesRecard; + +import java.util.List; + +/** + * 档案图片信息记录Mapper接口 + * + * @author hs + * @date 2024-05-13 + */ +public interface DaPicturesRecardMapper +{ + /** + * 查询档案图片信息记录 + * + * @param id 档案图片信息记录主键 + * @return 档案图片信息记录 + */ + public DaPicturesRecard selectDaPicturesRecardById(Long id); + + /** + * 查询档案图片信息记录列表 + * + * @param daPicturesRecard 档案图片信息记录 + * @return 档案图片信息记录集合 + */ + public List selectDaPicturesRecardList(DaPicturesRecard daPicturesRecard); + + /** + * 新增档案图片信息记录 + * + * @param daPicturesRecard 档案图片信息记录 + * @return 结果 + */ + public int insertDaPicturesRecard(DaPicturesRecard daPicturesRecard); + + /** + * 修改档案图片信息记录 + * + * @param daPicturesRecard 档案图片信息记录 + * @return 结果 + */ + public int updateDaPicturesRecard(DaPicturesRecard daPicturesRecard); + + /** + * 删除档案图片信息记录 + * + * @param id 档案图片信息记录主键 + * @return 结果 + */ + public int deleteDaPicturesRecardById(Long id); + + /** + * 批量删除档案图片信息记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDaPicturesRecardByIds(Long[] ids); +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaPicturesRecardService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaPicturesRecardService.java new file mode 100644 index 0000000..1b4861c --- /dev/null +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaPicturesRecardService.java @@ -0,0 +1,62 @@ +package com.da.dangan.service; + +import com.da.dangan.domain.DaPicturesRecard; + +import java.util.List; + +/** + * 档案图片信息记录Service接口 + * + * @author hs + * @date 2024-05-13 + */ +public interface IDaPicturesRecardService +{ + /** + * 查询档案图片信息记录 + * + * @param id 档案图片信息记录主键 + * @return 档案图片信息记录 + */ + public DaPicturesRecard selectDaPicturesRecardById(Long id); + + /** + * 查询档案图片信息记录列表 + * + * @param daPicturesRecard 档案图片信息记录 + * @return 档案图片信息记录集合 + */ + public List selectDaPicturesRecardList(DaPicturesRecard daPicturesRecard); + + /** + * 新增档案图片信息记录 + * + * @param daPicturesRecard 档案图片信息记录 + * @return 结果 + */ + public int insertDaPicturesRecard(DaPicturesRecard daPicturesRecard); + + /** + * 修改档案图片信息记录 + * + * @param daPicturesRecard 档案图片信息记录 + * @return 结果 + */ + public int updateDaPicturesRecard(DaPicturesRecard daPicturesRecard); + + /** + * 批量删除档案图片信息记录 + * + * @param ids 需要删除的档案图片信息记录主键集合 + * @return 结果 + */ + public int deleteDaPicturesRecardByIds(Long[] ids); + + /** + * 删除档案图片信息记录信息 + * + * @param id 档案图片信息记录主键 + * @return 结果 + */ + public int deleteDaPicturesRecardById(Long id); +} diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaPicturesRecardServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaPicturesRecardServiceImpl.java new file mode 100644 index 0000000..f5645a1 --- /dev/null +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaPicturesRecardServiceImpl.java @@ -0,0 +1,97 @@ +package com.da.dangan.service.impl; + +import com.da.common.utils.DateUtils; +import com.da.dangan.domain.DaPicturesRecard; +import com.da.dangan.mapper.DaPicturesRecardMapper; +import com.da.dangan.service.IDaPicturesRecardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 档案图片信息记录Service业务层处理 + * + * @author hs + * @date 2024-05-13 + */ +@Service +public class DaPicturesRecardServiceImpl implements IDaPicturesRecardService +{ + @Autowired + private DaPicturesRecardMapper daPicturesRecardMapper; + + /** + * 查询档案图片信息记录 + * + * @param id 档案图片信息记录主键 + * @return 档案图片信息记录 + */ + @Override + public DaPicturesRecard selectDaPicturesRecardById(Long id) + { + return daPicturesRecardMapper.selectDaPicturesRecardById(id); + } + + /** + * 查询档案图片信息记录列表 + * + * @param daPicturesRecard 档案图片信息记录 + * @return 档案图片信息记录 + */ + @Override + public List selectDaPicturesRecardList(DaPicturesRecard daPicturesRecard) + { + return daPicturesRecardMapper.selectDaPicturesRecardList(daPicturesRecard); + } + + /** + * 新增档案图片信息记录 + * + * @param daPicturesRecard 档案图片信息记录 + * @return 结果 + */ + @Override + public int insertDaPicturesRecard(DaPicturesRecard daPicturesRecard) + { + daPicturesRecard.setCreateTime(DateUtils.getNowDate()); + return daPicturesRecardMapper.insertDaPicturesRecard(daPicturesRecard); + } + + /** + * 修改档案图片信息记录 + * + * @param daPicturesRecard 档案图片信息记录 + * @return 结果 + */ + @Override + public int updateDaPicturesRecard(DaPicturesRecard daPicturesRecard) + { + daPicturesRecard.setUpdateTime(DateUtils.getNowDate()); + return daPicturesRecardMapper.updateDaPicturesRecard(daPicturesRecard); + } + + /** + * 批量删除档案图片信息记录 + * + * @param ids 需要删除的档案图片信息记录主键 + * @return 结果 + */ + @Override + public int deleteDaPicturesRecardByIds(Long[] ids) + { + return daPicturesRecardMapper.deleteDaPicturesRecardByIds(ids); + } + + /** + * 删除档案图片信息记录信息 + * + * @param id 档案图片信息记录主键 + * @return 结果 + */ + @Override + public int deleteDaPicturesRecardById(Long id) + { + return daPicturesRecardMapper.deleteDaPicturesRecardById(id); + } +} diff --git a/dangan-dangan/src/main/resources/mapper/dangan/AreaSortMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/AreaSortMapper.xml index 7225086..b60152b 100644 --- a/dangan-dangan/src/main/resources/mapper/dangan/AreaSortMapper.xml +++ b/dangan-dangan/src/main/resources/mapper/dangan/AreaSortMapper.xml @@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and area_type = #{areaType} and pid = #{pid} + order by pid + + + and pic_name like concat('%', #{picName}, '%') + and pic_url = #{picUrl} + and wlsj_id = #{wlsjId} + and wlsj_path = #{wlsjPath} + and mu_id = #{muId} + and mu_path = #{muPath} + and recognize = #{recognize} + + + + + + + insert into da_pictures_recard + + pic_name, + pic_url, + wlsj_id, + wlsj_path, + mu_id, + mu_path, + recognize, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{picName}, + #{picUrl}, + #{wlsjId}, + #{wlsjPath}, + #{muId}, + #{muPath}, + #{recognize}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update da_pictures_recard + + pic_name = #{picName}, + pic_url = #{picUrl}, + wlsj_id = #{wlsjId}, + wlsj_path = #{wlsjPath}, + mu_id = #{muId}, + mu_path = #{muPath}, + recognize = #{recognize}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from da_pictures_recard where id = #{id} + + + + delete from da_pictures_recard where id in + + #{id} + + + \ No newline at end of file diff --git a/dangan-system/src/main/java/com/da/system/mapper/SysRoleMapper.java b/dangan-system/src/main/java/com/da/system/mapper/SysRoleMapper.java index d6558c1..e2c220e 100644 --- a/dangan-system/src/main/java/com/da/system/mapper/SysRoleMapper.java +++ b/dangan-system/src/main/java/com/da/system/mapper/SysRoleMapper.java @@ -1,8 +1,9 @@ package com.da.system.mapper; -import java.util.List; import com.da.common.core.domain.entity.SysRole; +import java.util.List; + /** * 角色表 数据层 * @@ -104,4 +105,6 @@ public interface SysRoleMapper * @return 结果 */ public int deleteRoleByIds(Long[] roleIds); + + List selectRoleListIgnoreAdmin(SysRole role); } diff --git a/dangan-system/src/main/java/com/da/system/service/impl/SysRoleServiceImpl.java b/dangan-system/src/main/java/com/da/system/service/impl/SysRoleServiceImpl.java index e52c815..6549143 100644 --- a/dangan-system/src/main/java/com/da/system/service/impl/SysRoleServiceImpl.java +++ b/dangan-system/src/main/java/com/da/system/service/impl/SysRoleServiceImpl.java @@ -1,13 +1,5 @@ package com.da.system.service.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.da.common.annotation.DataScope; import com.da.common.constant.UserConstants; import com.da.common.core.domain.entity.SysRole; @@ -24,6 +16,11 @@ import com.da.system.mapper.SysRoleMapper; import com.da.system.mapper.SysRoleMenuMapper; import com.da.system.mapper.SysUserRoleMapper; import com.da.system.service.ISysRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; /** * 角色 业务层处理 @@ -55,7 +52,11 @@ public class SysRoleServiceImpl implements ISysRoleService @DataScope(deptAlias = "d") public List selectRoleList(SysRole role) { - return roleMapper.selectRoleList(role); + // 获取当前的用户 + if(SecurityUtils.getLoginUser().getUser().isAdmin()){ + return roleMapper.selectRoleList(role); + } + return roleMapper.selectRoleListIgnoreAdmin(role); } /** diff --git a/dangan-system/src/main/resources/mapper/system/SysRoleMapper.xml b/dangan-system/src/main/resources/mapper/system/SysRoleMapper.xml index 79ba876..91d32aa 100644 --- a/dangan-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/dangan-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -55,7 +55,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} order by r.role_sort - + + +