pasd/pasd_java
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交：3-13

Browse Source
This commit is contained in:
18154758993
2026-03-13 14:44:01 +08:00
parent ebdd783f8c
commit 95fab8f7bf
158 changed files with 13617 additions and 1931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pasd-SafetyDeclaration/src/main/java/com/ruoyi/SafetyDeclaration/controller/sidebarApp/SafetyDeclarationAppController.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.SafetyDeclaration.controller.sidebarApp;
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;
@@ -23,26 +24,24 @@ import com.ruoyi.common.core.page.TableDataInfo;
/**
* 水电校园安全不良事件
Controller
* Controller
*
* @author ruoyi
* @date 2024-08-04
*/
@RestController
@RequestMapping("/sidebarApp/safetyDeclaration")
public class SafetyDeclarationAppController extends BaseController
{
public class SafetyDeclarationAppController extends BaseController {
@Autowired
private ISafetyDeclarationTableService safetyDeclarationTableService;
/**
* 查询水电校园安全不良事件
列表
* 列表
*/
@PreAuthorize("@ss.hasPermi('sidebar:safetyDeclaration:list')")
@GetMapping("/list")
public TableDataInfo list(SafetyDeclarationTable safetyDeclarationTable)
{
public TableDataInfo list(SafetyDeclarationTable safetyDeclarationTable) {
startPage();
List<SafetyDeclarationTable> list = safetyDeclarationTableService.selectSafetyDeclarationTableList(safetyDeclarationTable);
return getDataTable(list);
@@ -50,13 +49,12 @@ public class SafetyDeclarationAppController extends BaseController
/**
* 导出水电校园安全不良事件
列表
* 列表
*/
@PreAuthorize("@ss.hasPermi('sidebar:safetyDeclaration:export')")
@Log(title = "水电校园安全不良事件 ", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SafetyDeclarationTable safetyDeclarationTable)
{
public void export(HttpServletResponse response, SafetyDeclarationTable safetyDeclarationTable) {
List<SafetyDeclarationTable> list = safetyDeclarationTableService.selectSafetyDeclarationTableList(safetyDeclarationTable);
ExcelUtil<SafetyDeclarationTable> util = new ExcelUtil<SafetyDeclarationTable>(SafetyDeclarationTable.class);
util.exportExcel(response, list, "水电校园安全不良事件 数据");
@@ -64,48 +62,41 @@ public class SafetyDeclarationAppController extends BaseController
/**
* 获取水电校园安全不良事件
详细信息
* 详细信息
*/
@PreAuthorize("@ss.hasPermi('sidebar:safetyDeclaration:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(safetyDeclarationTableService.selectSafetyDeclarationTableById(id));
}
/**
* 新增水电校园安全不良事件
*/
//@PreAuthorize("@ss.hasPermi('sidebar:safetyDeclaration:add')")
@Log(title = "水电校园安全不良事件 ", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SafetyDeclarationTable safetyDeclarationTable)
{
public AjaxResult add(@RequestBody SafetyDeclarationTable safetyDeclarationTable) {
return toAjax(safetyDeclarationTableService.insertSafetyDeclarationTable(safetyDeclarationTable));
}
/**
* 修改水电校园安全不良事件
*/
@PreAuthorize("@ss.hasPermi('sidebar:safetyDeclaration:edit')")
@Log(title = "水电校园安全不良事件 ", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SafetyDeclarationTable safetyDeclarationTable)
{
public AjaxResult edit(@RequestBody SafetyDeclarationTable safetyDeclarationTable) {
return toAjax(safetyDeclarationTableService.updateSafetyDeclarationTable(safetyDeclarationTable));
}
/**
* 删除水电校园安全不良事件
*/
@PreAuthorize("@ss.hasPermi('sidebar:safetyDeclaration:remove')")
@Log(title = "水电校园安全不良事件 ", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(safetyDeclarationTableService.deleteSafetyDeclarationTableByIds(ids));
}
}

72
pasd-SafetyDeclaration/src/main/java/com/ruoyi/SafetyDeclaration/service/impl/SafetyDeclarationTableServiceImpl.java
View File

@@ -1,111 +1,109 @@
package com.ruoyi.SafetyDeclaration.service.impl;
import java.util.List;
import com.ruoyi.common.annotation.DataScope;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.SafetyDeclaration.mapper.SafetyDeclarationTableMapper;
import com.ruoyi.SafetyDeclaration.domain.SafetyDeclarationTable;
import com.ruoyi.SafetyDeclaration.service.ISafetyDeclarationTableService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
/**
* 水电校园安全不良事件
Service业务层处理
*
* Service业务层处理
*
* @author ruoyi
* @date 2024-08-04
*/
@Service
public class SafetyDeclarationTableServiceImpl implements ISafetyDeclarationTableService
{
public class SafetyDeclarationTableServiceImpl implements ISafetyDeclarationTableService {
@Autowired
private SafetyDeclarationTableMapper safetyDeclarationTableMapper;
/**
* 查询水电校园安全不良事件
*
*
* @param id 水电校园安全不良事件主键
* @return 水电校园安全不良事件
*/
@Override
public SafetyDeclarationTable selectSafetyDeclarationTableById(Long id)
{
public SafetyDeclarationTable selectSafetyDeclarationTableById(Long id) {
return safetyDeclarationTableMapper.selectSafetyDeclarationTableById(id);
}
/**
* 查询水电校园安全不良事件
列表
*
* 列表
*
* @param safetyDeclarationTable 水电校园安全不良事件
* @return 水电校园安全不良事件
*/
@Override
public List<SafetyDeclarationTable> selectSafetyDeclarationTableList(SafetyDeclarationTable safetyDeclarationTable)
{
@DataScope(userAlias = "u")
public List<SafetyDeclarationTable> selectSafetyDeclarationTableList(SafetyDeclarationTable safetyDeclarationTable) {
return safetyDeclarationTableMapper.selectSafetyDeclarationTableList(safetyDeclarationTable);
}
/**
* 新增水电校园安全不良事件
*
*
* @param safetyDeclarationTable 水电校园安全不良事件
* @return 结果
*/
@Override
public int insertSafetyDeclarationTable(SafetyDeclarationTable safetyDeclarationTable)
{
public int insertSafetyDeclarationTable(SafetyDeclarationTable safetyDeclarationTable) {
safetyDeclarationTable.setCurrentState("0");
//获取当前系统时间
safetyDeclarationTable.setOccurTime(DateUtils.getNowDate());
// 获取创建者与创建时间
safetyDeclarationTable.setCreateBy(SecurityUtils.getUsername());
safetyDeclarationTable.setCreateTime(DateUtils.getNowDate());
// 自动设置申报人为当前用户的昵称
safetyDeclarationTable.setApplyUser(SecurityUtils.getLoginUser().getUser().getNickName());
// 若发生时间未提供，则默认当前时间
if (safetyDeclarationTable.getOccurTime() == null) {
safetyDeclarationTable.setOccurTime(DateUtils.getNowDate());
}
return safetyDeclarationTableMapper.insertSafetyDeclarationTable(safetyDeclarationTable);
}
/**
* 修改水电校园安全不良事件
*
*
* @param safetyDeclarationTable 水电校园安全不良事件
* @return 结果
*/
@Override
public int updateSafetyDeclarationTable(SafetyDeclarationTable safetyDeclarationTable)
{
public int updateSafetyDeclarationTable(SafetyDeclarationTable safetyDeclarationTable) {
// 设置更新者与更新时间
safetyDeclarationTable.setUpdateBy(SecurityUtils.getUsername());
safetyDeclarationTable.setUpdateTime(DateUtils.getNowDate());
return safetyDeclarationTableMapper.updateSafetyDeclarationTable(safetyDeclarationTable);
}
/**
* 批量删除水电校园安全不良事件
*
*
* @param ids 需要删除的水电校园安全不良事件
主键
* 主键
* @return 结果
*/
@Override
public int deleteSafetyDeclarationTableByIds(Long[] ids)
{
public int deleteSafetyDeclarationTableByIds(Long[] ids) {
return safetyDeclarationTableMapper.deleteSafetyDeclarationTableByIds(ids);
}
/**
* 删除水电校园安全不良事件
信息
*
* 信息
*
* @param id 水电校园安全不良事件
主键
* 主键
* @return 结果
*/
@Override
public int deleteSafetyDeclarationTableById(Long id)
{
public int deleteSafetyDeclarationTableById(Long id) {
return safetyDeclarationTableMapper.deleteSafetyDeclarationTableById(id);
}
}

16
pasd-SafetyDeclaration/src/main/resources/mapper/SafetyDeclaration/SafetyDeclarationTableMapper.xml
View File

@@ -13,18 +13,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="occurTime" column="occur_time" />
<result property="solveTime" column="solve_time" />
<result property="currentState" column="current_state" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectSafetyDeclarationTableVo">
select id, declaration_type, requirement_description, declaration_img, apply_user, occur_time, solve_time, current_state, remark from safety_declaration_table
select id, declaration_type, requirement_description, declaration_img, apply_user, occur_time, solve_time, current_state,
safety_declaration_table.create_by, safety_declaration_table.create_time, safety_declaration_table.update_by, safety_declaration_table.update_time, safety_declaration_table.remark from safety_declaration_table
</sql>
<select id="selectSafetyDeclarationTableList" parameterType="SafetyDeclarationTable" resultMap="SafetyDeclarationTableResult">
<include refid="selectSafetyDeclarationTableVo"/>
left join sys_user u on safety_declaration_table.create_by = u.user_name
<where>
<if test="declarationType != null and declarationType != ''"> and declaration_type = #{declarationType}</if>
<if test="applyUser != null and applyUser != ''"> and apply_user = #{applyUser}</if>
<if test="params.beginOccurTime != null and params.beginOccurTime != '' and params.endOccurTime != null and params.endOccurTime != ''"> and occur_time between #{params.beginOccurTime} and #{params.endOccurTime}</if>
${params.dataScope}
</where>
ORDER BY occur_time desc -- 添加升序排序
</select>
@@ -44,6 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="occurTime != null">occur_time,</if>
<if test="solveTime != null">solve_time,</if>
<if test="currentState != null and currentState != ''">current_state,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -55,6 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="solveUser != null">#{solveUser},</if>
<if test="solveTime != null">#{solveTime},</if>
<if test="currentState != null and currentState != ''">#{currentState},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
@@ -69,6 +81,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="occurTime != null">occur_time = #{occurTime},</if>
<if test="solveTime != null">solve_time = #{solveTime},</if>
<if test="currentState != null and currentState != ''">current_state = #{currentState},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}