emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyWorkApproveController.java
文件名从 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/WorkApproveController.java 修改 @@ -4,11 +4,11 @@ import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.utils.PageUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.emergency.model.dto.req.WorkApproveReqDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.WorkApproveDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.WorkApprovePageRespDTO; import com.gkhy.safePlatform.emergency.query.WorkApproveQuery; import com.gkhy.safePlatform.emergency.service.WorkApproveService; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyWorkApproveReqDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApproveDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApprovePageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyWorkApproveQuery; import com.gkhy.safePlatform.emergency.service.EmergencyWorkApproveService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.*; @@ -17,16 +17,16 @@ @RestController @RequestMapping("/WorkApprove") public class WorkApproveController { public class EmergencyWorkApproveController { @Autowired private WorkApproveService workApproveService; private EmergencyWorkApproveService workApproveService; /** * 应急预案列表 */ @RequestMapping(value = "/page/list" ,method = RequestMethod.POST) private ResultVO<List<WorkApprovePageRespDTO>> list (@RequestBody PageQuery<WorkApproveQuery> pageQuery){ private ResultVO<List<EmergencyWorkApprovePageRespDTO>> list (@RequestBody PageQuery<EmergencyWorkApproveQuery> pageQuery){ PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize()); return workApproveService.selectWorkApproveList(pageQuery); } @@ -35,16 +35,16 @@ * 应急预案新增 */ @RequestMapping(value = "/add",method = RequestMethod.POST) public ResultVO addWorkApprove(Authentication authentication, @RequestBody WorkApproveReqDTO WorkApproveReqDTO) { public ResultVO addWorkApprove(Authentication authentication, @RequestBody EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) { ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); return workApproveService.addWorkApprove(currentUser.getUid(), WorkApproveReqDTO); return workApproveService.addWorkApprove(currentUser.getUid(), EmergencyWorkApproveReqDTO); } /** * 应急预案详情 */ @RequestMapping(value = "//{id}",method = RequestMethod.GET) public ResultVO<WorkApproveDetailRespDTO> getWorkApproveById(@PathVariable("id")Long id){ public ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(@PathVariable("id")Long id){ return workApproveService.getWorkApproveById(id); } @@ -52,9 +52,9 @@ * 应急预案修改 */ @RequestMapping(value = "/update",method = RequestMethod.POST) public ResultVO updateWorkApprove(Authentication authentication, @RequestBody WorkApproveReqDTO WorkApproveReqDTO) { public ResultVO updateWorkApprove(Authentication authentication, @RequestBody EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) { ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal(); return workApproveService.updateWorkApprove(currentUser.getUid(), WorkApproveReqDTO); return workApproveService.updateWorkApprove(currentUser.getUid(), EmergencyWorkApproveReqDTO); } /** emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfo.java
文件名从 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfo.java 修改 @@ -7,7 +7,7 @@ import java.util.Date; @TableName("work_approve") public class WorkApproveInfo { public class EmergencyWorkApproveInfo { @TableId(type = IdType.AUTO) private Long id; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoDetailDO.java
文件名从 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfoDetailDO.java 修改 @@ -7,7 +7,7 @@ import java.util.Date; @TableName("work_approve") public class WorkApproveInfoDetailDO { public class EmergencyWorkApproveInfoDetailDO { @TableId(type = IdType.AUTO) private Long id; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyWorkApproveInfoPageDO.java
文件名从 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/WorkApproveInfoPageDO.java 修改 @@ -7,7 +7,7 @@ import java.util.Date; @TableName("work_approve") public class WorkApproveInfoPageDO { public class EmergencyWorkApproveInfoPageDO { @TableId(type = IdType.AUTO) private Long id; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
文件名从 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/WorkApproveReqDTO.java 修改 @@ -1,6 +1,6 @@ package com.gkhy.safePlatform.emergency.model.dto.req; public class WorkApproveReqDTO { public class EmergencyWorkApproveReqDTO { private Long id; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.javacopy from emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApprovePageRespDTO.java copy to emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
文件从 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApprovePageRespDTO.java 复制 @@ -1,6 +1,6 @@ package com.gkhy.safePlatform.emergency.model.dto.resp; public class WorkApprovePageRespDTO { public class EmergencyWorkApproveDetailRespDTO { private Long id; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
文件名从 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApprovePageRespDTO.java 修改 @@ -1,6 +1,6 @@ package com.gkhy.safePlatform.emergency.model.dto.resp; public class WorkApprovePageRespDTO { public class EmergencyWorkApprovePageRespDTO { private Long id; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/WorkApproveDetailRespDTO.java
文件已删除 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
文件名从 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/WorkApproveQuery.java 修改 @@ -4,7 +4,7 @@ import java.util.Date; public class WorkApproveQuery { public class EmergencyWorkApproveQuery { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date gmtCreate; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyWorkApproveDBQuery.java
文件名从 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/WorkApproveDBQuery.java 修改 @@ -4,7 +4,7 @@ import java.util.Date; public class WorkApproveDBQuery { public class EmergencyWorkApproveDBQuery { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date gmtCreate; emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyWorkApproveInfoRepository.java
对比新文件 @@ -0,0 +1,27 @@ package com.gkhy.safePlatform.emergency.repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @Repository public interface EmergencyWorkApproveInfoRepository extends BaseMapper<EmergencyWorkApproveInfo> { List<EmergencyWorkApproveInfoPageDO> selectWorkApproveList(Page<EmergencyWorkApproveInfoPageDO> page, @Param("query") EmergencyWorkApproveDBQuery emergencyWorkApproveDBQuery); void addWorkApprove(EmergencyWorkApproveInfo emergencyWorkApproveInfo); EmergencyWorkApproveInfoDetailDO selectWorkApproveById(@Param("id") Long id); void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo); void deleteWorkApproveById(@Param("id") Long id); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/WorkApproveInfoRepository.java
文件已删除 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyWorkApproveService.java
对比新文件 @@ -0,0 +1,25 @@ package com.gkhy.safePlatform.emergency.service; import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.commons.vo.SearchResultVO; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyWorkApproveReqDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApproveDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApprovePageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyWorkApproveQuery; import java.util.List; public interface EmergencyWorkApproveService { SearchResultVO<List<EmergencyWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<EmergencyWorkApproveQuery> query); ResultVO addWorkApprove(Long valueOf, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO); ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(Long id); ResultVO updateWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO); ResultVO batchDeleteWorkApprove(String ids); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/WorkApproveService.java
文件已删除 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
对比新文件 @@ -0,0 +1,24 @@ package com.gkhy.safePlatform.emergency.service.baseService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery; import java.util.List; public interface EmergencyWorkApproveInfoService extends IService<EmergencyWorkApproveInfo> { List<EmergencyWorkApproveInfoPageDO> selectWorkApproveList(Page<EmergencyWorkApproveInfoPageDO> page, EmergencyWorkApproveDBQuery emergencyWorkApproveDBQuery); void addWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo); EmergencyWorkApproveInfoDetailDO selectWorkApproveById(Long id); void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo); void deleteWorkApproveById(Long teamId); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/WorkApproveInfoService.java
文件已删除 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyEmergencyWorkApproveServiceImpl.java
对比新文件 @@ -0,0 +1,48 @@ package com.gkhy.safePlatform.emergency.service.baseService.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO; import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO; import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery; import com.gkhy.safePlatform.emergency.repository.EmergencyWorkApproveInfoRepository; import com.gkhy.safePlatform.emergency.service.baseService.EmergencyWorkApproveInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @Service("workApproveInfoService") public class EmergencyEmergencyWorkApproveServiceImpl extends ServiceImpl<EmergencyWorkApproveInfoRepository, EmergencyWorkApproveInfo> implements EmergencyWorkApproveInfoService { @Autowired private EmergencyWorkApproveInfoRepository EmergencyWorkApproveInfoRepository; @Override public List<EmergencyWorkApproveInfoPageDO> selectWorkApproveList(Page<EmergencyWorkApproveInfoPageDO> page, EmergencyWorkApproveDBQuery EmergencyWorkApproveDBQuery) { return EmergencyWorkApproveInfoRepository.selectWorkApproveList(page, EmergencyWorkApproveDBQuery); } @Override public void addWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo) { EmergencyWorkApproveInfoRepository.addWorkApprove(EmergencyWorkApproveInfo); } @Override public EmergencyWorkApproveInfoDetailDO selectWorkApproveById(Long id) { return EmergencyWorkApproveInfoRepository.selectWorkApproveById(id); } @Override public void updateWorkApprove(EmergencyWorkApproveInfo EmergencyWorkApproveInfo) { EmergencyWorkApproveInfoRepository.updateWorkApprove(EmergencyWorkApproveInfo); } @Override public void deleteWorkApproveById(Long teamId) { EmergencyWorkApproveInfoRepository.deleteWorkApproveById(teamId); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/WorkApproveServiceImpl.java
文件已删除 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyEmergencyWorkApproveServiceImpl.java
对比新文件 @@ -0,0 +1,117 @@ package com.gkhy.safePlatform.emergency.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gkhy.safePlatform.commons.enums.ResultCodes; import com.gkhy.safePlatform.commons.query.PageQuery; import com.gkhy.safePlatform.commons.utils.BeanCopyUtils; import com.gkhy.safePlatform.commons.utils.StringUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.commons.vo.SearchResultVO; import com.gkhy.safePlatform.emergency.entity.*; import com.gkhy.safePlatform.emergency.enums.ApproveStatus; import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes; import com.gkhy.safePlatform.emergency.excepiton.EmergencyException; import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyWorkApproveReqDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApproveDetailRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyWorkApprovePageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyWorkApproveQuery; import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery; import com.gkhy.safePlatform.emergency.service.EmergencyWorkApproveService; import com.gkhy.safePlatform.emergency.service.baseService.EmergencyWorkApproveInfoService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; @Service("workApproveService") public class EmergencyEmergencyWorkApproveServiceImpl implements EmergencyWorkApproveService { @Autowired private EmergencyWorkApproveInfoService workApproveInfoService; @Override public SearchResultVO<List<EmergencyWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<EmergencyWorkApproveQuery> query) { Long pageIndex = query.getPageIndex(); Long pageSize = query.getPageSize(); Page<EmergencyWorkApproveInfoPageDO> page = new Page<>(pageIndex, pageSize); EmergencyWorkApproveDBQuery EmergencyWorkApproveDBQuery = new EmergencyWorkApproveDBQuery(); if (query.getSearchParams() != null) { BeanUtils.copyProperties(query.getSearchParams(), EmergencyWorkApproveDBQuery); } List<EmergencyWorkApproveInfoPageDO> emergencyWorkApproveInfoPageDOList = workApproveInfoService.selectWorkApproveList(page, EmergencyWorkApproveDBQuery); List<EmergencyWorkApprovePageRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyWorkApproveInfoPageDOList, EmergencyWorkApprovePageRespDTO.class); return new SearchResultVO<>( true, pageIndex, pageSize, page.getTotal(), respList, ResultCodes.OK ); } @Override public ResultVO addWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) { Date nowDate = new Date(); //1.新增应急队伍 EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo(); BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo); EmergencyWorkApproveInfo.setDelFlag(false); EmergencyWorkApproveInfo.setCreateUid(uid); EmergencyWorkApproveInfo.setGmtCreate(nowDate); EmergencyWorkApproveInfo.setApproveStatus(ApproveStatus.NOT_APPROVE.getStatus()); workApproveInfoService.addWorkApprove(EmergencyWorkApproveInfo); return new ResultVO(ResultCodes.OK); } @Override public ResultVO<EmergencyWorkApproveDetailRespDTO> getWorkApproveById(Long id) { EmergencyWorkApproveInfoDetailDO EmergencyWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(id); EmergencyWorkApproveDetailRespDTO emergencyWorkApproveDetailRespDTO = new EmergencyWorkApproveDetailRespDTO(); BeanUtils.copyProperties(EmergencyWorkApproveInfoDetailDO, emergencyWorkApproveDetailRespDTO); return new ResultVO<>(ResultCodes.OK, emergencyWorkApproveDetailRespDTO); } @Override public ResultVO updateWorkApprove(Long uid, EmergencyWorkApproveReqDTO EmergencyWorkApproveReqDTO) { Date nowDate = new Date(); //查询是否存在 EmergencyWorkApproveInfoDetailDO EmergencyWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(EmergencyWorkApproveReqDTO.getId()); if (EmergencyWorkApproveInfoDetailDO == null) { throw new EmergencyException(EmergencyResultCodes.TEAM_NOT_EXIST); } else { EmergencyWorkApproveInfo EmergencyWorkApproveInfo = new EmergencyWorkApproveInfo(); BeanUtils.copyProperties(EmergencyWorkApproveReqDTO, EmergencyWorkApproveInfo); EmergencyWorkApproveInfo.setUpdateUid(uid); EmergencyWorkApproveInfo.setGmtModitify(nowDate); workApproveInfoService.updateWorkApprove(EmergencyWorkApproveInfo); return new ResultVO(ResultCodes.OK); } } @Override public ResultVO batchDeleteWorkApprove(String ids) { if (!StringUtils.isBlank(ids)) { String[] idArr = ids.split(","); for (String id : idArr) { deleteWorkApprove(Long.valueOf(id)); } } return new ResultVO(ResultCodes.OK); } private void deleteWorkApprove(Long id) { workApproveInfoService.deleteWorkApproveById(id); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/WorkApproveServiceImpl.java
文件已删除 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyWorkApproveInfoRepository.xml
文件名从 emergency/emergency-service/src/main/resource/config/mapper/emergency/WorkApproveInfoMapper.xml 修改 @@ -2,9 +2,9 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.gkhy.safePlatform.emergency.repository.WorkApproveInfoRepository"> <mapper namespace="com.gkhy.safePlatform.emergency.repository.EmergencyWorkApproveInfoRepository"> <resultMap type="com.gkhy.safePlatform.emergency.entity.WorkApproveInfoPageDO" id="WorkApproveInfoPageDOResult"> <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO" id="WorkApproveInfoPageDOResult"> <id column="id" property="id" jdbcType="BIGINT"/> <result column="team_level" property="teamLevel"/> <result column="team_name" property="teamName"/> @@ -18,7 +18,7 @@ <if test="query.teamLevel != null and query.teamLevel != ''">and `team_level` = #{query.teamLevel}</if> </select> <insert id="addWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.WorkApproveInfo" <insert id="addWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo" keyProperty="id" useGeneratedKeys="true"> insert into emergency_team <trim prefix="(" suffix=")" suffixOverrides=","> @@ -53,7 +53,7 @@ </trim> </insert> <resultMap type="com.gkhy.safePlatform.emergency.entity.WorkApproveInfoDetailDO" <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO" id="WorkApproveInfoDetailDOResult"> <id column="id" property="id" jdbcType="BIGINT"/> <result column="principal_uid" property="principalUid"/> @@ -70,7 +70,7 @@ from emergency_team where del_flag = 0 and id = #{id} </select> <update id="updateWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.WorkApproveInfo"> <update id="updateWorkApprove" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo"> update emergency_team <trim prefix="SET" suffixOverrides=","> <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>